added python side

Author: vandyliu

src/base_circuitpython/base_cp_constants.py

@@ -9,4 +9,4 @@
 
 EXPECTED_INPUT_BUTTONS = set(["button_a", "button_b"])
 
-ALL_EXPECTED_INPUT_EVENTS = set([])
+ALL_EXPECTED_INPUT_EVENTS = set(["temperature", "light_r", "light_g", "light_b", "light_c", "motion_x", "motion_y", "motion_z", "humidity", "pressure", "proximity"])

src/clue/adafruit_clue.py

@@ -203,10 +203,6 @@ def __init__(self):
             "button_a": False,
             "button_b": False,
             "pressed_buttons": set(),
-            "acceleration": {"x": 0, "y": 0, "z": 0},
-            "color_sensor": {"r": 0, "g": 0, "b": 0, "c": 0},
-            "magnetometer": {"x": 0, "y": 0, "z": 0},
-            "gyro": {"x": 0, "y": 0, "z": 0},
             "sea_level_pressure": 1013.25,
             "temperature": 0,
             "proximity": 0,
@@ -216,6 +212,23 @@ def __init__(self):
             "pixel": neopixel.NeoPixel(
                 pin=CONSTANTS.CLUE_PIN, n=1, pixel_order=neopixel.RGB
             ),
+            # Accelerometer
+            "motion_x": 0,
+            "motion_y": 0,
+            "motion_z": 0,
+            # Light/color sensor
+            "light_r": 0,
+            "light_g": 0,
+            "light_b": 0,
+            "light_c": 0,
+            # Magnetometer
+            "magnet_x": 0,
+            "magnet_y": 0,
+            "magnet_z": 0,
+            # Gyroscope
+            "gyro_x": 0,
+            "gyro_y": 0,
+            "gyro_z": 0,
         }
 
     @property
@@ -268,9 +281,9 @@ def acceleration(self):
             print("Accel: {:.2f} {:.2f} {:.2f}".format(*clue.acceleration))
         """
         return (
-            self.__state["acceleration"]["x"],
-            self.__state["acceleration"]["y"],
-            self.__state["acceleration"]["z"],
+            self.__state["motion_x"],
+            self.__state["motion_y"],
+            self.__state["motion_z"],
         )
 
     @property
@@ -285,10 +298,10 @@ def color(self):
               print("Color: R: {} G: {} B: {} C: {}".format(*clue.color))
         """
         return (
-            self.__state["color_sensor"]["r"],
-            self.__state["color_sensor"]["g"],
-            self.__state["color_sensor"]["b"],
-            self.__state["color_sensor"]["c"],
+            self.__state["light_r"],
+            self.__state["light_g"],
+            self.__state["light_b"],
+            self.__state["light_c"],
         )
 
     @property
@@ -313,9 +326,9 @@ def magnetic(self):
               print("Magnetic: {:.3f} {:.3f} {:.3f}".format(*clue.magnetic))
         """
         return (
-            self.__state["magnetometer"]["x"],
-            self.__state["magnetometer"]["y"],
-            self.__state["magnetometer"]["z"],
+            self.__state["magnet_x"],
+            self.__state["magnet_y"],
+            self.__state["magnet_z"],
         )
 
     @property
@@ -338,9 +351,9 @@ def gyro(self):
               print("Gyro: {:.2f} {:.2f} {:.2f}".format(*clue.gyro))
         """
         return (
-            self.__state["gyro"]["x"],
-            self.__state["gyro"]["y"],
-            self.__state["gyro"]["z"],
+            self.__state["gyro_x"],
+            self.__state["gyro_y"],
+            self.__state["gyro_z"],
         )
 
     @property

src/clue/test/test_adafruit_clue.py

@@ -77,9 +77,9 @@ def test_acceleration(self):
         MOCK_MOTION_Z = 3
         MOCK_MOTION_X_B = 4
 
-        clue._Clue__state["acceleration"].update(
-            {"x": MOCK_MOTION_X_A, "y": MOCK_MOTION_Y, "z": MOCK_MOTION_Z,}
-        )
+        clue._Clue__state["motion_x"] = MOCK_MOTION_X_A
+        clue._Clue__state["motion_y"] = MOCK_MOTION_Y
+        clue._Clue__state["motion_z"] = MOCK_MOTION_Z
         assert clue.acceleration == (MOCK_MOTION_X_A, MOCK_MOTION_Y, MOCK_MOTION_Z)
         clue._Clue__state["acceleration"]["x"] = MOCK_MOTION_X_B
         assert clue.acceleration == (MOCK_MOTION_X_B, MOCK_MOTION_Y, MOCK_MOTION_Z)
@@ -91,14 +91,10 @@ def test_color(self):
         MOCK_COLOR_C = 4
         MOCK_COLOR_R_B = 5
 
-        clue._Clue__state["color_sensor"].update(
-            {
-                "r": MOCK_COLOR_R_A,
-                "g": MOCK_COLOR_G,
-                "b": MOCK_COLOR_B,
-                "c": MOCK_COLOR_C,
-            }
-        )
+        clue._Clue__state["light_r"] = MOCK_COLOR_R_A
+        clue._Clue__state["light_g"] = MOCK_COLOR_G
+        clue._Clue__state["light_b"] = MOCK_COLOR_B
+        clue._Clue__state["light_c"] = MOCK_COLOR_C
         assert clue.color == (MOCK_COLOR_R_A, MOCK_COLOR_G, MOCK_COLOR_B, MOCK_COLOR_C)
         clue._Clue__state["color_sensor"]["r"] = MOCK_COLOR_R_B
         assert clue.color == (MOCK_COLOR_R_B, MOCK_COLOR_G, MOCK_COLOR_B, MOCK_COLOR_C)
@@ -117,9 +113,9 @@ def test_magnetic(self):
         MOCK_MAGNETIC_Z = 3
         MOCK_MAGNETIC_X_B = 4
 
-        clue._Clue__state["magnetometer"].update(
-            {"x": MOCK_MAGNETIC_X_A, "y": MOCK_MAGNETIC_Y, "z": MOCK_MAGNETIC_Z,}
-        )
+        clue._Clue__state["magnet_x"] = MOCK_MAGNETIC_X_A
+        clue._Clue__state["magnet_y"] = MOCK_MAGNETIC_Y
+        clue._Clue__state["magnet_z"] = MOCK_MAGNETIC_Z
         assert clue.magnetic == (MOCK_MAGNETIC_X_A, MOCK_MAGNETIC_Y, MOCK_MAGNETIC_Z,)
         clue._Clue__state["magnetometer"]["x"] = MOCK_MAGNETIC_X_B
         assert clue.magnetic == (MOCK_MAGNETIC_X_B, MOCK_MAGNETIC_Y, MOCK_MAGNETIC_Z,)
@@ -138,9 +134,9 @@ def test_gyro(self):
         MOCK_GYRO_Z = 3
         MOCK_GYRO_X_B = 4
 
-        clue._Clue__state["gyro"].update(
-            {"x": MOCK_GYRO_X_A, "y": MOCK_GYRO_Y, "z": MOCK_GYRO_Z,}
-        )
+        clue._Clue__state["gyro_x"] = MOCK_GYRO_X_A
+        clue._Clue__state["gyro_y"] = MOCK_GYRO_Y
+        clue._Clue__state["gyro_z"] = MOCK_GYRO_Z
         assert clue.gyro == (MOCK_GYRO_X_A, MOCK_GYRO_Y, MOCK_GYRO_Z)
         clue._Clue__state["gyro"]["x"] = MOCK_GYRO_X_B
         assert clue.gyro == (MOCK_GYRO_X_B, MOCK_GYRO_Y, MOCK_GYRO_Z)

src/view/components/toolbar/motion/Accelerometer.spec.tsx

@@ -7,9 +7,9 @@ import { Accelerometer } from "./Accelerometer";
 describe("Accelerometer component ", () => {
     const mockProps = {
         axisValues: {
-            X_AXIS: 1,
-            Y_AXIS: 0,
-            Z_AXIS: 1,
+            X: 1,
+            Y: 0,
+            Z: 1,
         },
         onUpdateValue: () => {},
     };