bricks: move pb_type_image to parameters

dlech · dlech · commit 7b2c08d05a6f · 2025-07-18T17:36:03.000-05:00
Move pb_type_image from media to parameters to be consistent with
Pybricks v3.x (media module was a 2.x thing for ev3dev).
diff --git a/bricks/_common/sources.mk b/bricks/_common/sources.mk
@@ -63,7 +63,6 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
 	iodevices/pb_type_iodevices_xbox_controller.c \
 	iodevices/pb_type_uart_device.c \
 	media/pb_module_media.c \
-	media/pb_type_image.c \
 	nxtdevices/pb_module_nxtdevices.c \
 	nxtdevices/pb_type_nxtdevices_colorsensor.c \
 	nxtdevices/pb_type_nxtdevices_energymeter.c \
@@ -78,6 +77,7 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
 	parameters/pb_type_color.c \
 	parameters/pb_type_direction.c \
 	parameters/pb_type_icon.c \
+	parameters/pb_type_image.c \
 	parameters/pb_type_port.c \
 	parameters/pb_type_side.c \
 	parameters/pb_type_stop.c \
diff --git a/bricks/cityhub/mpconfigport.h b/bricks/cityhub/mpconfigport.h
@@ -32,11 +32,11 @@
 #define PYBRICKS_PY_IODEVICES                   (1)
 #define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER   (0)
 #define PYBRICKS_PY_MEDIA                       (0)
-#define PYBRICKS_PY_MEDIA_IMAGE                 (0)
 #define PYBRICKS_PY_NXTDEVICES                  (0)
 #define PYBRICKS_PY_PARAMETERS                  (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON           (1)
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
+#define PYBRICKS_PY_PARAMETERS_IMAGE            (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
diff --git a/bricks/essentialhub/mpconfigport.h b/bricks/essentialhub/mpconfigport.h
@@ -33,11 +33,11 @@
 #define PYBRICKS_PY_IODEVICES                   (1)
 #define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER   (1)
 #define PYBRICKS_PY_MEDIA                       (0)
-#define PYBRICKS_PY_MEDIA_IMAGE                 (0)
 #define PYBRICKS_PY_NXTDEVICES                  (0)
 #define PYBRICKS_PY_PARAMETERS                  (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON           (1)
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
+#define PYBRICKS_PY_PARAMETERS_IMAGE            (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
diff --git a/bricks/ev3/mpconfigport.h b/bricks/ev3/mpconfigport.h
@@ -32,11 +32,11 @@
 #define PYBRICKS_PY_IODEVICES                   (1)
 #define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER   (0)
 #define PYBRICKS_PY_MEDIA                       (1)
-#define PYBRICKS_PY_MEDIA_IMAGE                 (1)
 #define PYBRICKS_PY_NXTDEVICES                  (1)
 #define PYBRICKS_PY_PARAMETERS                  (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON           (1)
 #define PYBRICKS_PY_PARAMETERS_ICON             (1)
+#define PYBRICKS_PY_PARAMETERS_IMAGE            (1)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (0)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE           (0)
diff --git a/bricks/movehub/mpconfigport.h b/bricks/movehub/mpconfigport.h
@@ -29,11 +29,11 @@
 #define PYBRICKS_PY_HUBS                        (1)
 #define PYBRICKS_PY_IODEVICES                   (0)
 #define PYBRICKS_PY_MEDIA                       (0)
-#define PYBRICKS_PY_MEDIA_IMAGE                 (0)
 #define PYBRICKS_PY_PARAMETERS                  (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON           (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON_REMOTE_ONLY (1)
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
+#define PYBRICKS_PY_PARAMETERS_IMAGE            (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
diff --git a/bricks/nxt/mpconfigport.h b/bricks/nxt/mpconfigport.h
@@ -33,11 +33,11 @@
 #define PYBRICKS_PY_HUBS                        (1)
 #define PYBRICKS_PY_IODEVICES                   (0)
 #define PYBRICKS_PY_MEDIA                       (0)
-#define PYBRICKS_PY_MEDIA_IMAGE                 (0)
 #define PYBRICKS_PY_NXTDEVICES                  (0)
 #define PYBRICKS_PY_PARAMETERS                  (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON           (1)
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
+#define PYBRICKS_PY_PARAMETERS_IMAGE            (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_ROBOTICS                    (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_GYRO     (0)
diff --git a/bricks/technichub/mpconfigport.h b/bricks/technichub/mpconfigport.h
@@ -32,11 +32,11 @@
 #define PYBRICKS_PY_IODEVICES                   (1)
 #define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER   (1)
 #define PYBRICKS_PY_MEDIA                       (0)
-#define PYBRICKS_PY_MEDIA_IMAGE                 (0)
 #define PYBRICKS_PY_NXTDEVICES                  (0)
 #define PYBRICKS_PY_PARAMETERS                  (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON           (1)
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
+#define PYBRICKS_PY_PARAMETERS_IMAGE            (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
diff --git a/bricks/virtualhub/mpconfigvariant.h b/bricks/virtualhub/mpconfigvariant.h
@@ -27,11 +27,11 @@
 #define PYBRICKS_PY_HUBS                (1)
 #define PYBRICKS_PY_IODEVICES           (0)
 #define PYBRICKS_PY_MEDIA               (1)
-#define PYBRICKS_PY_MEDIA_IMAGE         (0)
 #define PYBRICKS_PY_NXTDEVICES          (0)
 #define PYBRICKS_PY_PARAMETERS          (1)
 #define PYBRICKS_PY_PARAMETERS_BUTTON   (1)
 #define PYBRICKS_PY_PARAMETERS_ICON     (1)
+#define PYBRICKS_PY_PARAMETERS_IMAGE    (0)
 #define PYBRICKS_PY_PUPDEVICES          (1)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE   (0)
 #define PYBRICKS_PY_DEVICES             (1)
diff --git a/pybricks/hubs/pb_type_ev3brick.c b/pybricks/hubs/pb_type_ev3brick.c
@@ -10,7 +10,7 @@
 
 #include <pybricks/common.h>
 #include <pybricks/hubs.h>
-#include <pybricks/media.h>
+#include <pybricks/parameters.h>
 #include <pybricks/util_mp/pb_obj_helper.h>
 #include <pybricks/util_pb/pb_error.h>
 
diff --git a/pybricks/media.h b/pybricks/media.h
@@ -8,15 +8,6 @@
 
 #if PYBRICKS_PY_MEDIA
 
-#include "py/obj.h"
-
-#if PYBRICKS_PY_MEDIA_IMAGE
-
-extern const mp_obj_type_t pb_type_Image;
-
-mp_obj_t pb_type_Image_display_obj_new(void);
-
-#endif // PYBRICKS_PY_MEDIA_IMAGE
 
 #endif // PYBRICKS_PY_MEDIA
 
diff --git a/pybricks/media/pb_module_media.c b/pybricks/media/pb_module_media.c
@@ -13,9 +13,6 @@
 
 static const mp_rom_map_elem_t media_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),    MP_ROM_QSTR(MP_QSTR_media)      },
-    #if PYBRICKS_PY_MEDIA_IMAGE
-    { MP_ROM_QSTR(MP_QSTR_Image),       MP_ROM_PTR(&pb_type_Image)      },
-    #endif
 };
 static MP_DEFINE_CONST_DICT(pb_module_media_globals, media_globals_table);
 
diff --git a/pybricks/parameters.h b/pybricks/parameters.h
@@ -65,6 +65,11 @@ extern const pb_obj_enum_member_t pb_Direction_COUNTERCLOCKWISE_obj;
 extern const mp_obj_base_t pb_Icon_obj;
 #endif
 
+#if PYBRICKS_PY_PARAMETERS_IMAGE
+extern const mp_obj_type_t pb_type_Image;
+mp_obj_t pb_type_Image_display_obj_new(void);
+#endif
+
 extern const mp_obj_type_t pb_enum_type_Port;
 
 extern const mp_obj_type_t pb_enum_type_Stop;
diff --git a/pybricks/parameters/pb_module_parameters.c b/pybricks/parameters/pb_module_parameters.c
@@ -19,6 +19,9 @@ static const mp_rom_map_elem_t parameters_globals_table[] = {
     #if PYBRICKS_PY_PARAMETERS_ICON
     { MP_ROM_QSTR(MP_QSTR_Icon),        MP_ROM_PTR(&pb_Icon_obj)            },
     #endif
+    #if PYBRICKS_PY_PARAMETERS_IMAGE
+    { MP_ROM_QSTR(MP_QSTR_Image),       MP_ROM_PTR(&pb_type_Image)          },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_Port),        MP_ROM_PTR(&pb_enum_type_Port)      },
     { MP_ROM_QSTR(MP_QSTR_Side),        MP_ROM_PTR(&pb_enum_type_Side)      },
     { MP_ROM_QSTR(MP_QSTR_Stop),        MP_ROM_PTR(&pb_enum_type_Stop)      },
diff --git a/pybricks/parameters/pb_type_image.c b/pybricks/parameters/pb_type_image.c
@@ -3,7 +3,7 @@
 
 #include "py/mpconfig.h"
 
-#if PYBRICKS_PY_MEDIA && PYBRICKS_PY_MEDIA_IMAGE
+#if PYBRICKS_PY_PARAMETERS_IMAGE
 
 #if !MICROPY_ENABLE_FINALISER
 #error "MICROPY_ENABLE_FINALISER must be enabled."
@@ -14,7 +14,6 @@
 #include "py/mphal.h"
 #include "py/obj.h"
 
-#include <pybricks/media.h>
 #include <pybricks/parameters.h>
 #include <pybricks/util_mp/pb_kwarg_helper.h>
 #include <pybricks/util_mp/pb_obj_helper.h>
@@ -378,4 +377,4 @@ MP_DEFINE_CONST_OBJ_TYPE(pb_type_Image,
     attr, pb_type_Image_attr,
     locals_dict, &pb_type_Image_locals_dict);
 
-#endif // PYBRICKS_PY_MEDIA && PYBRICKS_PY_MEDIA_IMAGE
+#endif // PYBRICKS_PY_PARAMETERS_IMAGE
