pybricks/experimental: deleteLWP3 class from parameters

pybricks · Aug 21, 2021 · fdf98ea · fdf98ea
1 parent 22b51bb
commit fdf98ea
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 82 deletions.
diff --git a/bricks/stm32/stm32.mk b/bricks/stm32/stm32.mk
@@ -228,7 +228,6 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
 	parameters/pb_type_port.c \
 	parameters/pb_type_side.c \
 	parameters/pb_type_stop.c \
-	parameters/pb_type_lwp3.c \
 	pupdevices/pb_module_pupdevices.c \
 	pupdevices/pb_type_pupdevices_colordistancesensor.c \
 	pupdevices/pb_type_pupdevices_colorsensor.c \

diff --git a/lib/pbio/include/pbdrv/bluetooth.h b/lib/pbio/include/pbdrv/bluetooth.h
@@ -150,7 +150,7 @@ void pbdrv_bluetooth_set_receive_handler(pbdrv_bluetooth_receive_handler_t handl
 void pbdrv_bluetooth_set_notification_handler(pbdrv_bluetooth_receive_handler_t handler);
 
 typedef struct {
-    lwp3_hub_kind_t hub_kind;
+    uint8_t hub_kind;
     uint8_t status;
     uint8_t bdaddr[6];
     char name[20];

diff --git a/pybricks/experimental/pb_type_experimental_lwp3device.c b/pybricks/experimental/pb_type_experimental_lwp3device.c
@@ -45,7 +45,7 @@ STATIC void handle_notification(pbdrv_bluetooth_connection_t connection, const u
     }
 }
 
-STATIC void lwp3device_connect(const lwp3_hub_kind_t hub_kind, const char *name, mp_int_t timeout) {
+STATIC void lwp3device_connect(const uint8_t hub_kind, const char *name, mp_int_t timeout) {
     pb_lwp3device_t *lwp3device = &pb_lwp3device_singleton;
 
     // REVISIT: for now, we only allow a single connection to a LWP3 device.
@@ -92,7 +92,7 @@ STATIC mp_obj_t pb_type_experimental_LWP3Device_make_new(const mp_obj_type_t *ty
     pb_type_experimental_LWP3Device_obj_t *self = m_new_obj(pb_type_experimental_LWP3Device_obj_t);
     self->base.type = (mp_obj_type_t *)type;
 
-    pbio_port_id_t hub_kind = pb_type_enum_get_value(hub_kind_in, &pb_enum_type_LWP3);
+    uint8_t hub_kind = pb_obj_get_positive_int(hub_kind_in);
 
     const char *name = name_in == mp_const_none ? NULL : mp_obj_str_get_str(name_in);
     mp_int_t timeout = timeout_in == mp_const_none ? -1 : pb_obj_get_positive_int(timeout_in);

diff --git a/pybricks/parameters.h b/pybricks/parameters.h
@@ -88,15 +88,6 @@ extern const pb_obj_enum_member_t pb_Side_LEFT_obj;
 extern const pb_obj_enum_member_t pb_Side_RIGHT_obj;
 extern const pb_obj_enum_member_t pb_Side_TOP_obj;
 
-extern const mp_obj_type_t pb_enum_type_LWP3;
-
-extern const pb_obj_enum_member_t pb_LWP3_DUPLO_TRAIN_obj;
-extern const pb_obj_enum_member_t pb_LWP3_MOVE_HUB_obj;
-extern const pb_obj_enum_member_t pb_LWP3_CITY_HUB_obj;
-extern const pb_obj_enum_member_t pb_LWP3_REMOTE_obj;
-extern const pb_obj_enum_member_t pb_LWP3_MARIO_obj;
-extern const pb_obj_enum_member_t pb_LWP3_TECHNIC_HUB_obj;
-
 extern const mp_obj_module_t pb_module_parameters;
 
 #endif // PYBRICKS_PY_PARAMETERS

diff --git a/pybricks/parameters/pb_module_parameters.c b/pybricks/parameters/pb_module_parameters.c
@@ -19,7 +19,6 @@ STATIC const mp_rom_map_elem_t parameters_globals_table[] = {
     #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_LWP3),        MP_ROM_PTR(&pb_enum_type_LWP3)      },
     { MP_ROM_QSTR(MP_QSTR_Stop),        MP_ROM_PTR(&pb_enum_type_Stop)      },
 };
 STATIC MP_DEFINE_CONST_DICT(pb_module_parameters_globals, parameters_globals_table);

diff --git a/pybricks/parameters/pb_type_lwp3.c b/pybricks/parameters/pb_type_lwp3.c