pybricks.common: Pass parent object to keypad and light.

laurensvalk · laurensvalk · commit 5f45ddaa6769 · 2025-09-29T10:14:53.000+02:00
There may be more than one in general, so pass relevant reference.
diff --git a/pybricks/common.h b/pybricks/common.h
@@ -68,7 +68,7 @@ void pb_type_LightMatrix_display_char(pbio_light_matrix_t *light_matrix, mp_obj_
 
 #if PYBRICKS_PY_COMMON_KEYPAD
 // pybricks._common.KeyPad()
-mp_obj_t pb_type_Keypad_obj_new(pb_type_button_get_pressed_t get_pressed);
+mp_obj_t pb_type_Keypad_obj_new(mp_obj_t parent_obj, pb_type_button_get_pressed_t get_pressed);
 #endif
 
 // pybricks._common.Battery()
diff --git a/pybricks/common/pb_type_colorlight_external.c b/pybricks/common/pb_type_colorlight_external.c
@@ -20,7 +20,7 @@
 // pybricks._common.ColorLight class object
 typedef struct {
     mp_obj_base_t base;
-    void *context;
+    mp_obj_t parent_obj;
     pb_type_ColorLight_on_t on;
 
 } common_ColorLight_external_obj_t;
@@ -32,14 +32,14 @@ static mp_obj_t common_ColorLight_external_on(size_t n_args, const mp_obj_t *pos
         common_ColorLight_external_obj_t, self,
         PB_ARG_REQUIRED(color));
 
-    return self->on(self->context, pb_type_Color_get_hsv(color_in));
+    return self->on(self->parent_obj, pb_type_Color_get_hsv(color_in));
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(common_ColorLight_external_on_obj, 1, common_ColorLight_external_on);
 
 // pybricks._common.ColorLight.off
 static mp_obj_t common_ColorLight_external_off(mp_obj_t self_in) {
     common_ColorLight_external_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return self->on(self->context, &pb_Color_NONE_obj.hsv);
+    return self->on(self->parent_obj, &pb_Color_NONE_obj.hsv);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(common_ColorLight_external_off_obj, common_ColorLight_external_off);
 
@@ -57,9 +57,9 @@ static MP_DEFINE_CONST_OBJ_TYPE(pb_type_ColorLight_external,
     locals_dict, &common_ColorLight_external_locals_dict);
 
 // pybricks._common.ColorLight.__init__
-mp_obj_t pb_type_ColorLight_external_obj_new(void *context, pb_type_ColorLight_on_t on) {
+mp_obj_t pb_type_ColorLight_external_obj_new(mp_obj_t parent_obj, pb_type_ColorLight_on_t on) {
     common_ColorLight_external_obj_t *light = mp_obj_malloc(common_ColorLight_external_obj_t, &pb_type_ColorLight_external);
-    light->context = context;
+    light->parent_obj = parent_obj;
     light->on = on;
     return MP_OBJ_FROM_PTR(light);
 }
diff --git a/pybricks/common/pb_type_keypad.c b/pybricks/common/pb_type_keypad.c
@@ -17,13 +17,14 @@
 // pybricks._common.Keypad class object
 typedef struct _common_Keypad_obj_t {
     mp_obj_base_t base;
+    mp_obj_t parent_obj;
     pb_type_button_get_pressed_t get_pressed;
 } common_Keypad_obj_t;
 
 // pybricks._common.Keypad.pressed
 static mp_obj_t common_Keypad_pressed(mp_obj_t self_in) {
     common_Keypad_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return self->get_pressed();
+    return self->get_pressed(self->parent_obj);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(common_Keypad_pressed_obj, common_Keypad_pressed);
 
@@ -40,9 +41,10 @@ static MP_DEFINE_CONST_OBJ_TYPE(pb_type_Keypad,
     locals_dict, &common_Keypad_locals_dict);
 
 // pybricks._common.Keypad.__init__
-mp_obj_t pb_type_Keypad_obj_new(pb_type_button_get_pressed_t get_pressed) {
+mp_obj_t pb_type_Keypad_obj_new(mp_obj_t parent_obj, pb_type_button_get_pressed_t get_pressed) {
     common_Keypad_obj_t *self = mp_obj_malloc(common_Keypad_obj_t, &pb_type_Keypad);
     self->get_pressed = get_pressed;
+    self->parent_obj = parent_obj;
     return MP_OBJ_FROM_PTR(self);
 }
 
diff --git a/pybricks/hubs/pb_type_cityhub.c b/pybricks/hubs/pb_type_cityhub.c
@@ -37,7 +37,7 @@ static mp_obj_t hubs_CityHub_make_new(const mp_obj_type_t *type, size_t n_args,
     #if PYBRICKS_PY_COMMON_BLE
     self->ble = pb_type_BLE_new(broadcast_channel_in, observe_channels_in);
     #endif
-    self->button = pb_type_Keypad_obj_new(pb_type_button_pressed_hub_single_button);
+    self->button = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_button_pressed_hub_single_button);
     self->light = common_ColorLight_internal_obj_new(pbsys_status_light_main);
     self->system = MP_OBJ_FROM_PTR(&pb_type_System);
     return MP_OBJ_FROM_PTR(self);
diff --git a/pybricks/hubs/pb_type_essentialhub.c b/pybricks/hubs/pb_type_essentialhub.c
@@ -52,7 +52,7 @@ static mp_obj_t hubs_EssentialHub_make_new(const mp_obj_type_t *type, size_t n_a
     #if PYBRICKS_PY_COMMON_BLE
     self->ble = pb_type_BLE_new(broadcast_channel_in, observe_channels_in);
     #endif
-    self->buttons = pb_type_Keypad_obj_new(pb_type_button_pressed_hub_single_button);
+    self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_button_pressed_hub_single_button);
     self->charger = pb_type_Charger_obj_new();
     self->imu = pb_type_IMU_obj_new(MP_OBJ_FROM_PTR(self), top_side_in, front_side_in);
     self->light = common_ColorLight_internal_obj_new(pbsys_status_light_main);
diff --git a/pybricks/hubs/pb_type_ev3brick.c b/pybricks/hubs/pb_type_ev3brick.c
@@ -24,7 +24,7 @@ typedef struct _hubs_EV3Brick_obj_t {
     mp_obj_t system;
 } hubs_EV3Brick_obj_t;
 
-static mp_obj_t pb_type_ev3brick_button_pressed(void) {
+static mp_obj_t pb_type_ev3brick_button_pressed(mp_obj_t parent_obj) {
     pbio_button_flags_t flags = pbdrv_button_get_pressed();
     mp_obj_t pressed[5];
     size_t num = 0;
@@ -50,7 +50,7 @@ static mp_obj_t hubs_EV3Brick_make_new(const mp_obj_type_t *type, size_t n_args,
     hubs_EV3Brick_obj_t *self = mp_obj_malloc(hubs_EV3Brick_obj_t, type);
 
     self->battery = MP_OBJ_FROM_PTR(&pb_module_battery);
-    self->buttons = pb_type_Keypad_obj_new(pb_type_ev3brick_button_pressed);
+    self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_ev3brick_button_pressed);
     self->light = common_ColorLight_internal_obj_new(pbsys_status_light_main);
     self->screen = pb_type_Image_display_obj_new();
     self->speaker = mp_call_function_0(MP_OBJ_FROM_PTR(&pb_type_Speaker));
diff --git a/pybricks/hubs/pb_type_movehub.c b/pybricks/hubs/pb_type_movehub.c
@@ -329,7 +329,7 @@ static mp_obj_t hubs_MoveHub_make_new(const mp_obj_type_t *type, size_t n_args,
     #if PYBRICKS_PY_COMMON_BLE
     self->ble = pb_type_BLE_new(broadcast_channel_in, observe_channels_in);
     #endif
-    self->button = pb_type_Keypad_obj_new(pb_type_button_pressed_hub_single_button);
+    self->button = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_button_pressed_hub_single_button);
     self->imu = hubs_MoveHub_IMU_make_new(top_side_in, front_side_in);
     self->light = common_ColorLight_internal_obj_new(pbsys_status_light_main);
     self->system = MP_OBJ_FROM_PTR(&pb_type_System);
diff --git a/pybricks/hubs/pb_type_nxtbrick.c b/pybricks/hubs/pb_type_nxtbrick.c
@@ -25,7 +25,7 @@ typedef struct _hubs_NXTBrick_obj_t {
     mp_obj_t system;
 } hubs_NXTBrick_obj_t;
 
-static mp_obj_t pb_type_nxtbrick_button_pressed(void) {
+static mp_obj_t pb_type_nxtbrick_button_pressed(mp_obj_t parent_obj) {
     pbio_button_flags_t flags = pbdrv_button_get_pressed();
     mp_obj_t pressed[4];
     size_t num = 0;
@@ -47,7 +47,7 @@ static mp_obj_t pb_type_nxtbrick_button_pressed(void) {
 static mp_obj_t hubs_NXTBrick_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     hubs_NXTBrick_obj_t *self = mp_obj_malloc(hubs_NXTBrick_obj_t, type);
     self->battery = MP_OBJ_FROM_PTR(&pb_module_battery);
-    self->buttons = pb_type_Keypad_obj_new(pb_type_nxtbrick_button_pressed);
+    self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_nxtbrick_button_pressed);
     self->speaker = mp_call_function_0(MP_OBJ_FROM_PTR(&pb_type_Speaker));
     self->system = MP_OBJ_FROM_PTR(&pb_type_System);
     return MP_OBJ_FROM_PTR(self);
diff --git a/pybricks/hubs/pb_type_primehub.c b/pybricks/hubs/pb_type_primehub.c
@@ -41,7 +41,7 @@ typedef struct _hubs_PrimeHub_obj_t {
     mp_obj_t system;
 } hubs_PrimeHub_obj_t;
 
-static mp_obj_t pb_type_primehub_button_pressed(void) {
+static mp_obj_t pb_type_primehub_button_pressed(mp_obj_t parent_obj) {
     pbio_button_flags_t flags = pbdrv_button_get_pressed();
     mp_obj_t pressed[4];
     size_t num = 0;
@@ -75,7 +75,7 @@ static mp_obj_t hubs_PrimeHub_make_new(const mp_obj_type_t *type, size_t n_args,
     #if PYBRICKS_PY_COMMON_BLE
     self->ble = pb_type_BLE_new(broadcast_channel_in, observe_channels_in);
     #endif
-    self->buttons = pb_type_Keypad_obj_new(pb_type_primehub_button_pressed);
+    self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_primehub_button_pressed);
     self->charger = pb_type_Charger_obj_new();
     self->display = pb_type_LightMatrix_obj_new(pbsys_hub_light_matrix);
     self->imu = pb_type_IMU_obj_new(MP_OBJ_FROM_PTR(self), top_side_in, front_side_in);
diff --git a/pybricks/hubs/pb_type_technichub.c b/pybricks/hubs/pb_type_technichub.c
@@ -42,7 +42,7 @@ static mp_obj_t hubs_TechnicHub_make_new(const mp_obj_type_t *type, size_t n_arg
     #if PYBRICKS_PY_COMMON_BLE
     self->ble = pb_type_BLE_new(broadcast_channel_in, observe_channels_in);
     #endif
-    self->button = pb_type_Keypad_obj_new(pb_type_button_pressed_hub_single_button);
+    self->button = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_button_pressed_hub_single_button);
     self->imu = pb_type_IMU_obj_new(MP_OBJ_FROM_PTR(self), top_side_in, front_side_in);
     self->light = common_ColorLight_internal_obj_new(pbsys_status_light_main);
     self->system = MP_OBJ_FROM_PTR(&pb_type_System);
diff --git a/pybricks/hubs/pb_type_virtualhub.c b/pybricks/hubs/pb_type_virtualhub.c
@@ -29,7 +29,7 @@ typedef struct _hubs_VirtualHub_obj_t {
 static mp_obj_t hubs_VirtualHub_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     hubs_VirtualHub_obj_t *self = mp_obj_malloc(hubs_VirtualHub_obj_t, type);
     self->battery = MP_OBJ_FROM_PTR(&pb_module_battery);
-    self->buttons = pb_type_Keypad_obj_new(pb_type_button_pressed_hub_single_button);
+    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->system = MP_OBJ_FROM_PTR(&pb_type_System);
diff --git a/pybricks/iodevices/pb_type_iodevices_lwp3device.c b/pybricks/iodevices/pb_type_iodevices_lwp3device.c
@@ -234,7 +234,7 @@ static mp_obj_t wait_or_await_operation(void) {
     return pb_type_async_wait_or_await(&config, &lwp3device->iter, true);
 }
 
-static mp_obj_t pb_type_pupdevices_Remote_light_on(void *context, const pbio_color_hsv_t *hsv) {
+static mp_obj_t pb_type_pupdevices_Remote_light_on(mp_obj_t self_in, const pbio_color_hsv_t *hsv) {
     pb_assert(pb_type_pupdevices_Remote_write_light_msg(hsv));
     return wait_or_await_operation();
 }
@@ -397,7 +397,7 @@ static mp_obj_t pb_lwp3device_connect(mp_obj_t self_in, mp_obj_t name_in, mp_obj
 }
 
 
-mp_obj_t pb_type_remote_button_pressed(void) {
+mp_obj_t pb_type_remote_button_pressed(mp_obj_t self_in) {
     pb_lwp3device_t *remote = &pb_lwp3device_singleton;
 
     pb_lwp3device_assert_connected();
@@ -448,8 +448,8 @@ static mp_obj_t pb_type_pupdevices_Remote_make_new(const mp_obj_type_t *type, si
     pb_module_tools_assert_blocking();
 
     pb_type_pupdevices_Remote_obj_t *self = mp_obj_malloc(pb_type_pupdevices_Remote_obj_t, type);
-    self->buttons = pb_type_Keypad_obj_new(pb_type_remote_button_pressed);
-    self->light = pb_type_ColorLight_external_obj_new(NULL, pb_type_pupdevices_Remote_light_on);
+    self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_remote_button_pressed);
+    self->light = pb_type_ColorLight_external_obj_new(MP_OBJ_FROM_PTR(self), pb_type_pupdevices_Remote_light_on);
 
     pb_lwp3device_connect(MP_OBJ_FROM_PTR(self), name_in, timeout_in, LWP3_HUB_KIND_HANDSET, handle_remote_notification, false);
 
diff --git a/pybricks/iodevices/pb_type_iodevices_xbox_controller.c b/pybricks/iodevices/pb_type_iodevices_xbox_controller.c
@@ -179,7 +179,7 @@ static xbox_input_map_t *pb_xbox_get_buttons(void) {
     return buttons;
 }
 
-static mp_obj_t pb_xbox_button_pressed(void) {
+static mp_obj_t pb_xbox_button_pressed(mp_obj_t self_in) {
     xbox_input_map_t *buttons = pb_xbox_get_buttons();
 
     // At most 16 simultaneous button presses, plus up to two dpad directions.
@@ -385,7 +385,7 @@ static mp_obj_t pb_type_xbox_make_new(const mp_obj_type_t *type, size_t n_args,
     self->iter = NULL;
 
     pb_xbox_t *xbox = &pb_xbox_singleton;
-    self->buttons = pb_type_Keypad_obj_new(pb_xbox_button_pressed);
+    self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_xbox_button_pressed);
 
     // needed to ensure that no buttons are "pressed" after reconnecting since
     // we are using static memory
diff --git a/pybricks/parameters/pb_type_button.c b/pybricks/parameters/pb_type_button.c
@@ -153,7 +153,7 @@ pbio_button_flags_t pb_type_button_get_button_flag(mp_obj_t obj) {
 /**
  * Common button pressed function for single button hubs.
  */
-mp_obj_t pb_type_button_pressed_hub_single_button(void) {
+mp_obj_t pb_type_button_pressed_hub_single_button(mp_obj_t parent_obj) {
     pbio_button_flags_t flags = pbdrv_button_get_pressed();
     mp_obj_t buttons[] = { pb_type_button_new(MP_QSTR_CENTER) };
 
diff --git a/pybricks/parameters/pb_type_button.h b/pybricks/parameters/pb_type_button.h
@@ -22,8 +22,8 @@ extern const pb_obj_button_t pb_type_button;
 mp_obj_t pb_type_button_new(qstr name);
 pbio_button_flags_t pb_type_button_get_button_flag(mp_obj_t obj);
 
-typedef mp_obj_t (*pb_type_button_get_pressed_t)(void);
-mp_obj_t pb_type_button_pressed_hub_single_button(void);
+typedef mp_obj_t (*pb_type_button_get_pressed_t)(mp_obj_t parent_obj);
+mp_obj_t pb_type_button_pressed_hub_single_button(mp_obj_t parent_obj);
 
 #endif // PYBRICKS_PY_PARAMETERS_BUTTON
 
diff --git a/pybricks/pupdevices/pb_type_pupdevices_colordistancesensor.c b/pybricks/pupdevices/pb_type_pupdevices_colordistancesensor.c
@@ -42,8 +42,9 @@ pb_type_device_obj_base_t *pupdevices_ColorDistanceSensor__get_device(mp_obj_t o
  * @param [in] context    Sensor base object.
  * @param [in] hsv        Requested color, will be rounded to nearest color.
  */
-static mp_obj_t pupdevices_ColorDistanceSensor_light_on(void *context, const pbio_color_hsv_t *hsv) {
-    pb_type_device_obj_base_t *sensor = context;
+static mp_obj_t pupdevices_ColorDistanceSensor_light_on(mp_obj_t parent_obj, const pbio_color_hsv_t *hsv) {
+
+    pupdevices_ColorDistanceSensor_obj_t *self = MP_OBJ_TO_PTR(parent_obj);
 
     // Even though the mode takes a 0-10 value for color, only red, green and blue
     // actually turn on the light. So we just pick the closest of these 3 to the
@@ -59,7 +60,7 @@ static mp_obj_t pupdevices_ColorDistanceSensor_light_on(void *context, const pbi
         color = 9; // red
     }
 
-    return pb_type_device_set_data(sensor, LEGO_DEVICE_MODE_PUP_COLOR_DISTANCE_SENSOR__COL_O, &color, sizeof(color));
+    return pb_type_device_set_data(&self->device_base, LEGO_DEVICE_MODE_PUP_COLOR_DISTANCE_SENSOR__COL_O, &color, sizeof(color));
 }
 
 // pybricks.pupdevices.ColorDistanceSensor.__init__
@@ -71,7 +72,7 @@ static mp_obj_t pupdevices_ColorDistanceSensor_make_new(const mp_obj_type_t *typ
     pb_type_device_init_class(&self->device_base, port_in, LEGO_DEVICE_TYPE_ID_COLOR_DIST_SENSOR);
 
     // Create an instance of the Light class
-    self->light = pb_type_ColorLight_external_obj_new(&self->device_base, pupdevices_ColorDistanceSensor_light_on);
+    self->light = pb_type_ColorLight_external_obj_new(MP_OBJ_FROM_PTR(self), pupdevices_ColorDistanceSensor_light_on);
 
     // Save default color settings
     pb_color_map_save_default(&self->color_map);
