bricks/virtualhub: Enable screen attribute.

Author: laurensvalk

.vscode/c_cpp_properties.json

@@ -367,6 +367,7 @@
             "includePath": [
                 "${workspaceFolder}/bricks/virtualhub",
                 "${workspaceFolder}/bricks/virtualhub/build",
+                "${workspaceFolder}/bricks/virtualhub/build-debug",
                 "${workspaceFolder}/lib/contiki-core",
                 "${workspaceFolder}/lib/lego",
                 "${workspaceFolder}/lib/lwrb/src/include",
@@ -375,6 +376,7 @@
                 "${workspaceFolder}/lib/pbio/platform/virtual_hub",
                 "${workspaceFolder}/micropython",
                 "${workspaceFolder}",
+                "${workspaceFolder}/lib/umm_malloc/src",
                 "/usr/include/python3.10"
             ],
             "defines": [

bricks/virtualhub/Makefile

@@ -5,6 +5,6 @@ PBIO_PLATFORM = virtual_hub
 PB_MCU_FAMILY = native
 PB_FROZEN_MODULES = 1
 MICROPY_ROM_TEXT_COMPRESSION = 1
-
+PB_LIB_UMM_MALLOC = 1
 
 include ../_common/common.mk

bricks/virtualhub/dbglog/dbglog.h

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2025 The Pybricks Authors
+//
+// Hack to allow umm_info() to print in MicroPython.
+
+#include "py/mpprint.h"
+
+#undef DBGLOG_FORCE
+#define DBGLOG_FORCE(force, fmt, ...) mp_printf(&mp_plat_print, fmt,##__VA_ARGS__)
+
+#define DBGLOG_32_BIT_PTR(p) (p)

bricks/virtualhub/mpconfigport.h

@@ -25,6 +25,7 @@
 #define PYBRICKS_PY_COMMON_MOTORS               (1)
 #define PYBRICKS_PY_COMMON_SPEAKER              (0)
 #define PYBRICKS_PY_COMMON_SYSTEM               (1)
+#define PYBRICKS_PY_COMMON_SYSTEM_UMM_INFO      (1)
 #define PYBRICKS_PY_EV3DEVICES                  (0)
 #define PYBRICKS_PY_EXPERIMENTAL                (1)
 #define PYBRICKS_PY_HUBS                        (1)
@@ -33,7 +34,7 @@
 #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_PARAMETERS_IMAGE            (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
 #define PYBRICKS_PY_PUPDEVICES_REMOTE           (0)
 #define PYBRICKS_PY_DEVICES                     (1)

lib/pbio/platform/virtual_hub/platform.c

@@ -17,6 +17,8 @@
 #include <pbdrv/config.h>
 #include <pbdrv/ioport.h>
 
+#include <umm_malloc.h>
+
 const pbdrv_gpio_t pbdrv_ioport_platform_data_vcc_pin = {
     .bank = NULL,
     .pin = 0,
@@ -144,6 +146,10 @@ extern void _main(void);
 
 int main(int argc, char **argv) {
 
+    // Separate heap for large allocations - defined in linker script.
+    static uint8_t umm_heap[1024 * 1024 * 2];
+    umm_init_heap(umm_heap, sizeof(umm_heap));
+
     // Parse given program, else otherwise default to REPL.
     if (argc > 1) {
 

lib/pbio/platform/virtual_hub/umm_malloc_cfgport.h

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2025 The Pybricks Authors
+//
+// Configuration for umm_malloc memory allocator for Virtual platform.
+// See lib/umm_malloc/src/umm_malloc_cfg.h for details.
+
+// We only use this for large allocations, like images and we have a lot of RAM
+// on the host, so we can use a larger block size to reduce overhead.
+#define UMM_BLOCK_BODY_SIZE 256
+
+#define UMM_INFO
+#define DBGLOG_ENABLE

pybricks/hubs/pb_type_virtualhub.c

@@ -17,12 +17,14 @@
 
 #include <pybricks/common.h>
 #include <pybricks/hubs.h>
+#include <pybricks/parameters.h>
 
 typedef struct _hubs_VirtualHub_obj_t {
     mp_obj_base_t base;
     mp_obj_t battery;
     mp_obj_t buttons;
     mp_obj_t light;
+    mp_obj_t screen;
     mp_obj_t system;
 } hubs_VirtualHub_obj_t;
 
@@ -32,6 +34,7 @@ static mp_obj_t hubs_VirtualHub_make_new(const mp_obj_type_t *type, size_t n_arg
     self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_button_pressed_hub_single_button);
     // FIXME: Implement lights.
     // self->light = common_ColorLight_internal_obj_new(pbsys_status_light_main);
+    self->screen = pb_type_Image_display_obj_new();
     self->system = MP_OBJ_FROM_PTR(&pb_type_System);
     return MP_OBJ_FROM_PTR(self);
 }
@@ -40,6 +43,7 @@ static const pb_attr_dict_entry_t hubs_VirtualHub_attr_dict[] = {
     PB_DEFINE_CONST_ATTR_RO(MP_QSTR_battery, hubs_VirtualHub_obj_t, battery),
     PB_DEFINE_CONST_ATTR_RO(MP_QSTR_buttons, hubs_VirtualHub_obj_t, buttons),
     // PB_DEFINE_CONST_ATTR_RO(MP_QSTR_light, hubs_VirtualHub_obj_t, light),
+    PB_DEFINE_CONST_ATTR_RO(MP_QSTR_screen, hubs_VirtualHub_obj_t, screen),
     PB_DEFINE_CONST_ATTR_RO(MP_QSTR_system, hubs_VirtualHub_obj_t, system),
     PB_ATTR_DICT_SENTINEL
 };