pybricks.media.Image: Add Image type.

schodet · schodet · commit c70d02e1988c · 2025-07-08T23:25:46.000+02:00
Add an Image type to manipulate image and display. Refs pybricks/support#2154
diff --git a/bricks/_common/sources.mk b/bricks/_common/sources.mk
@@ -63,6 +63,7 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
 	iodevices/pb_type_uart_device.c \
 	iodevices/pb_type_iodevices_xbox_controller.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 \
diff --git a/bricks/cityhub/mpconfigport.h b/bricks/cityhub/mpconfigport.h
@@ -32,6 +32,7 @@
 #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)
diff --git a/bricks/essentialhub/mpconfigport.h b/bricks/essentialhub/mpconfigport.h
@@ -33,6 +33,7 @@
 #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)
diff --git a/bricks/ev3/mpconfigport.h b/bricks/ev3/mpconfigport.h
@@ -30,7 +30,8 @@
 #define PYBRICKS_PY_HUBS                        (1)
 #define PYBRICKS_PY_IODEVICES                   (1)
 #define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER   (0)
-#define PYBRICKS_PY_MEDIA                       (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)
diff --git a/bricks/movehub/mpconfigport.h b/bricks/movehub/mpconfigport.h
@@ -29,6 +29,7 @@
 #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)
diff --git a/bricks/nxt/mpconfigport.h b/bricks/nxt/mpconfigport.h
@@ -33,6 +33,7 @@
 #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)
diff --git a/bricks/primehub/mpconfigport.h b/bricks/primehub/mpconfigport.h
@@ -34,6 +34,7 @@
 #define PYBRICKS_PY_IODEVICES                   (1)
 #define PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER   (1)
 #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)
diff --git a/bricks/technichub/mpconfigport.h b/bricks/technichub/mpconfigport.h
@@ -32,6 +32,7 @@
 #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)
diff --git a/bricks/virtualhub/mpconfigvariant.h b/bricks/virtualhub/mpconfigvariant.h
@@ -27,6 +27,7 @@
 #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)
diff --git a/pybricks/media.h b/pybricks/media.h
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2025 The Pybricks Authors
+
+#ifndef PYBRICKS_INCLUDED_PYBRICKS_MEDIA_H
+#define PYBRICKS_INCLUDED_PYBRICKS_MEDIA_H
+
+#include "py/mpconfig.h"
+
+#if PYBRICKS_PY_MEDIA
+
+#include "py/obj.h"
+
+#if PYBRICKS_PY_MEDIA_IMAGE
+
+extern const mp_obj_type_t pb_type_Image;
+
+#endif // PYBRICKS_PY_MEDIA_IMAGE
+
+#endif // PYBRICKS_PY_MEDIA
+
+#endif // PYBRICKS_INCLUDED_PYBRICKS_MEDIA_H
diff --git a/pybricks/media/pb_module_media.c b/pybricks/media/pb_module_media.c
@@ -8,10 +8,14 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 
+#include <pybricks/media.h>
 #include <pybricks/util_pb/pb_error.h>
 
 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/media/pb_type_image.c b/pybricks/media/pb_type_image.c
