pybricks/common: Guard colorlight and tools.

Some platforms may not have these.
pybricks · Feb 5, 2024 · 2cb2ffb · 2cb2ffb
1 parent 68828ac
commit 2cb2ffb
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 4 deletions.
diff --git a/bricks/cityhub/mpconfigport.h b/bricks/cityhub/mpconfigport.h
@@ -14,6 +14,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (1)
 #define PYBRICKS_PY_COMMON_CHARGER              (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/debug/mpconfigport.h b/bricks/debug/mpconfigport.h
@@ -13,6 +13,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (0)
 #define PYBRICKS_PY_COMMON_CHARGER              (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (0)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/essentialhub/mpconfigport.h b/bricks/essentialhub/mpconfigport.h
@@ -15,6 +15,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (1)
 #define PYBRICKS_PY_COMMON_CHARGER              (1)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (1)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/ev3dev/brickconfig.h b/bricks/ev3dev/brickconfig.h
@@ -18,6 +18,7 @@
 #define PYBRICKS_PY_COMMON              (1)
 #define PYBRICKS_PY_COMMON_BLE          (0)
 #define PYBRICKS_PY_COMMON_CHARGER      (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT  (1)
 #define PYBRICKS_PY_COMMON_CONTROL      (1)
 #define PYBRICKS_PY_COMMON_IMU          (0)
 #define PYBRICKS_PY_COMMON_KEYPAD       (1)

diff --git a/bricks/ev3rt/mpconfigport.h b/bricks/ev3rt/mpconfigport.h
@@ -18,6 +18,7 @@
 #define PYBRICKS_PY_COMMON              (1)
 #define PYBRICKS_PY_COMMON_BLE          (0)
 #define PYBRICKS_PY_COMMON_CHARGER      (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT  (0)
 #define PYBRICKS_PY_COMMON_CONTROL      (0)
 #define PYBRICKS_PY_COMMON_IMU          (0)
 #define PYBRICKS_PY_COMMON_KEYPAD       (0)

diff --git a/bricks/movehub/mpconfigport.h b/bricks/movehub/mpconfigport.h
@@ -14,6 +14,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (1)
 #define PYBRICKS_PY_COMMON_CHARGER              (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (0)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/nxt/mpconfigport.h b/bricks/nxt/mpconfigport.h
@@ -16,6 +16,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (0)
 #define PYBRICKS_PY_COMMON_CHARGER              (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/primehub/mpconfigport.h b/bricks/primehub/mpconfigport.h
@@ -16,6 +16,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (1)
 #define PYBRICKS_PY_COMMON_CHARGER              (1)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (1)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/technichub/mpconfigport.h b/bricks/technichub/mpconfigport.h
@@ -14,6 +14,7 @@
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (1)
 #define PYBRICKS_PY_COMMON_CHARGER              (0)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT          (1)
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (1)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)

diff --git a/bricks/virtualhub/mpconfigvariant.h b/bricks/virtualhub/mpconfigvariant.h
@@ -10,6 +10,7 @@
 #define PYBRICKS_PY_COMMON              (1)
 #define PYBRICKS_PY_COMMON_BLE          (0)
 #define PYBRICKS_PY_COMMON_CHARGER      (1)
+#define PYBRICKS_PY_COMMON_COLOR_LIGHT  (1)
 #define PYBRICKS_PY_COMMON_CONTROL      (1)
 #define PYBRICKS_PY_COMMON_IMU          (0)
 #define PYBRICKS_PY_COMMON_KEYPAD       (1)

diff --git a/pybricks/common/pb_type_colorlight_external.c b/pybricks/common/pb_type_colorlight_external.c
@@ -3,7 +3,7 @@
 
 #include "py/mpconfig.h"
 
-#if PYBRICKS_PY_COMMON
+#if PYBRICKS_PY_COMMON && PYBRICKS_PY_COMMON_COLOR_LIGHT
 
 #include <pbio/light.h>
 #include <pbio/color.h>
@@ -64,4 +64,4 @@ mp_obj_t pb_type_ColorLight_external_obj_new(void *context, pb_type_ColorLight_o
     return MP_OBJ_FROM_PTR(light);
 }
 
-#endif // PYBRICKS_PY_COMMON
+#endif // PYBRICKS_PY_COMMON && PYBRICKS_PY_COMMON_COLOR_LIGHT
diff --git a/pybricks/common/pb_type_colorlight_internal.c b/pybricks/common/pb_type_colorlight_internal.c
@@ -3,7 +3,7 @@
 
 #include "py/mpconfig.h"
 
-#if PYBRICKS_PY_COMMON
+#if PYBRICKS_PY_COMMON && PYBRICKS_PY_COMMON_COLOR_LIGHT
 
 #include <stdbool.h>
 
@@ -153,4 +153,4 @@ mp_obj_t common_ColorLight_internal_obj_new(pbio_color_light_t *light) {
     return MP_OBJ_FROM_PTR(self);
 }
 
-#endif // PYBRICKS_PY_COMMON
+#endif // PYBRICKS_PY_COMMON && PYBRICKS_PY_COMMON_COLOR_LIGHT
diff --git a/pybricks/pybricks.c b/pybricks/pybricks.c
@@ -104,8 +104,12 @@ void pb_package_pybricks_init(bool import_all) {
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         // Initialize the package.
+        #if PYBRICKS_PY_PARAMETERS
         pb_type_Color_reset();
+        #endif
+        #if PYBRICKS_PY_TOOLS
         pb_module_tools_init();
+        #endif
         // Import all if requested.
         if (import_all) {
             pb_package_import_all();