Python update

Author: 203Null

Applications/Python/PikaPython/MatrixOS_Color.py

@@ -1,8 +1,8 @@
 import _MatrixOS_Color
 
 class Color(_MatrixOS_Color.Color):
-    def Dim(self, factor: float = 0.2168) -> 'Color':
+    def Dim(self, factor: float = 0.2168) -> Color:
         return super().Dim(factor)
 
-    def DimIfNot(self, not_dim: bool, factor: float = 0.2168) -> 'Color':
+    def DimIfNot(self, not_dim: bool, factor: float = 0.2168) -> Color:
         return super().DimIfNot(not_dim, factor)

Applications/Python/PikaPython/MatrixOS_KeyPad.py

@@ -3,7 +3,7 @@
 from MatrixOS_KeyInfo import KeyInfo
 from MatrixOS_Point import Point
 
-FunctionKey:int = 0
+FunctionKeyID:int = 0
 
 def Get(timeout_ms: int = 0) -> KeyEvent:
     return _MatrixOS_KeyPad.Get(timeout_ms)

Applications/Python/PikaPython/MatrixOS_KeyState.py

@@ -1,11 +1,12 @@
 # KeyState enumeration for MatrixOS
-# Binding of OS/Framework/KeyEvent/KeyEvent.h
+# Binding of OS/Framework/KeyEvent/KeyInfo.h
 
 class KeyState:
     """Key state enumeration values"""
-    IDLE: int = 0
-    ACTIVATED: int = 1
-    PRESSED: int = 2
-    RELEASED: int = 3
-    HOLD: int = 4
-    AFTERTOUCH: int = 5
+    INVALID: int = 0
+    IDLE: int = 1
+    ACTIVATED: int = 2
+    PRESSED: int = 3
+    RELEASED: int = 4
+    HOLD: int = 5
+    AFTERTOUCH: int = 6

Applications/Python/PikaPython/MatrixOS_Point.py

@@ -1,5 +1,5 @@
 import _MatrixOS_Point
 
 class Point(_MatrixOS_Point.Point):
-    def Rotate(self, rotation: int, dimension: 'Point', reverse: bool = False) -> 'Point':
+    def Rotate(self, rotation: int, dimension: Point, reverse: bool = False) -> Point:
         return super().Rotate(rotation, dimension, reverse)

Applications/Python/PikaPython/_MatrixOS_Dimension.pyi

@@ -25,9 +25,6 @@ class Dimension:
     def Area(self) -> int: ...
 
     # Operators
-    def __add__(self, other: 'Dimension') -> 'Dimension': ...
-    def __eq__(self, other: 'Dimension') -> bool: ...
-    def __ne__(self, other: 'Dimension') -> bool: ...
-    def __lt__(self, other: 'Dimension') -> bool: ...
-    def __bool__(self) -> bool: ...
-    def __int__(self) -> int: ...
+    def __add__(self, other: Dimension) -> Dimension: ...
+    def __eq__(self, other: Dimension) -> bool: ...
+    def __bool__(self) -> bool: ...

Applications/Python/PikaPython/_MatrixOS_KeyEvent.pyi

@@ -11,4 +11,15 @@ class KeyEvent:
 
     # Getters
     def ID(self) -> int: ...
-    def KeyInfo(self) -> any: ...
+    def KeyInfo(self) -> any: ...
+
+    # Pass-through methods to KeyInfo
+    def State(self) -> int: ...
+    def Hold(self) -> bool: ...
+    def HoldTime(self) -> int: ...
+    def Active(self) -> bool: ...
+    def Force(self) -> float: ...
+    def Value(self, index: int = 0) -> float: ...
+
+    # Boolean conversion operator
+    def __bool__(self) -> bool: ...

Applications/Python/PikaPython/_MatrixOS_KeyInfo.pyi

@@ -9,9 +9,10 @@ class KeyInfo:
     # Constructor
     def __init__(self, *val): ...
 
-    # Getter
+    # Getters
     def State(self) -> int: ... # Should return KeyState
-    def Velocity(self) -> float: ...
+    def Force(self) -> float: ...
+    def Value(self, index: int = 0) -> float: ...
     def LastEventTime(self) -> int: ...
     def Hold(self) -> bool: ...
 

Applications/Python/PikaPython/_MatrixOS_MidiPacket.pyi

@@ -35,12 +35,12 @@ class MidiPacket:
     def Value(self) -> int: ...
 
     # Setters
-    def SetStatus(self, status: MidiStatus) -> None: ...
-    def SetChannel(self, channel: int) -> None: ...
-    def SetNote(self, note: int) -> None: ...
-    def SetController(self, controller: int) -> None: ...
-    def SetVelocity(self, velocity: int) -> None: ...
-    def SetValue(self, value: int) -> None: ...
+    def SetStatus(self, status: MidiStatus) -> bool: ...
+    def SetChannel(self, channel: int) -> bool: ...
+    def SetNote(self, note: int) -> bool: ...
+    def SetController(self, controller: int) -> bool: ...
+    def SetVelocity(self, velocity: int) -> bool: ...
+    def SetValue(self, value: int) -> bool: ...
 
     # Helper
     def Length(self) -> int: ...

Applications/Python/PikaPython/_MatrixOS_Point.pyi

@@ -15,7 +15,6 @@ class Point:
     def __add__(self, other: Point) -> Point: ...
     def __sub__(self, other: Point) -> Point: ...
     def __mul__(self, val: int) -> Point: ...
-    def __div__(self, val: int) -> Point: ...
     def __eq__(self, other: Point) -> bool: ...
     def __ne__(self, other: Point) -> bool: ...
     def Rotate(self, rotation: Direction, dimension: Point, reverse: bool) -> Point: ...

Applications/Python/PikaPython/pikascript-api/_MatrixOS_Dimension_Dimension.h

@@ -27,8 +27,5 @@ PikaObj* _MatrixOS_Dimension_Dimension___add__(PikaObj *self, PikaObj* other);
 pika_bool _MatrixOS_Dimension_Dimension___bool__(PikaObj *self);
 pika_bool _MatrixOS_Dimension_Dimension___eq__(PikaObj *self, PikaObj* other);
 void _MatrixOS_Dimension_Dimension___init__(PikaObj *self, PikaTuple* val);
-int _MatrixOS_Dimension_Dimension___int__(PikaObj *self);
-pika_bool _MatrixOS_Dimension_Dimension___lt__(PikaObj *self, PikaObj* other);
-pika_bool _MatrixOS_Dimension_Dimension___ne__(PikaObj *self, PikaObj* other);
 
 #endif