pybricks: modules: add conditional around MP_REGISTER_MODULE()

Add a conditional compilation check around MP_REGISTER_MODULE() that
checks MICROPY_MODULE_BUILTIN_SUBPACKAGES. If this option is enabled,
we don't need to register subpackages as they are already handled by
the parent package.

Author: dlech

pybricks/ev3devices/pb_module_ev3devices.c

@@ -28,6 +28,8 @@ const mp_obj_module_t pb_module_ev3devices = {
     .globals = (mp_obj_dict_t *)&pb_module_ev3devices_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_ev3devices, pb_module_ev3devices);
+#endif
 
 #endif // PYBRICKS_PY_EV3DEVICES

pybricks/experimental/pb_module_experimental.c

@@ -69,6 +69,8 @@ const mp_obj_module_t pb_module_experimental = {
     .globals = (mp_obj_dict_t *)&pb_module_experimental_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_experimental, pb_module_experimental);
+#endif
 
 #endif // PYBRICKS_PY_EXPERIMENTAL

pybricks/hubs/pb_module_hubs.c

@@ -26,6 +26,8 @@ const mp_obj_module_t pb_module_hubs = {
     .globals = (mp_obj_dict_t *)&pb_module_hubs_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_hubs, pb_module_hubs);
+#endif
 
 #endif // PYBRICKS_PY_HUBS

pybricks/iodevices/pb_module_iodevices.c

@@ -35,6 +35,8 @@ const mp_obj_module_t pb_module_iodevices = {
     .globals = (mp_obj_dict_t *)&pb_module_iodevices_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_iodevices, pb_module_iodevices);
+#endif
 
 #endif // PYBRICKS_PY_IODEVICES

pybricks/media/pb_module_media.c

@@ -20,6 +20,8 @@ const mp_obj_module_t pb_module_media = {
     .globals = (mp_obj_dict_t *)&pb_module_media_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_media, pb_module_media);
+#endif
 
 #endif // PYBRICKS_PY_MEDIA

pybricks/nxtdevices/pb_module_nxtdevices.c

@@ -30,6 +30,8 @@ const mp_obj_module_t pb_module_nxtdevices = {
     .globals = (mp_obj_dict_t *)&pb_module_nxtdevices_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_nxtdevices, pb_module_nxtdevices);
+#endif
 
 #endif // PYBRICKS_PY_NXTDEVICES

pybricks/parameters/pb_module_parameters.c

@@ -30,6 +30,8 @@ const mp_obj_module_t pb_module_parameters = {
     .globals = (mp_obj_dict_t *)&pb_module_parameters_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_parameters, pb_module_parameters);
+#endif
 
 #endif // PYBRICKS_PY_PARAMETERS

pybricks/pupdevices/pb_module_pupdevices.c

@@ -35,6 +35,8 @@ const mp_obj_module_t pb_module_pupdevices = {
     .globals = (mp_obj_dict_t *)&pb_module_pupdevices_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_pupdevices, pb_module_pupdevices);
+#endif
 
 #endif // PYBRICKS_PY_PUPDEVICES

pybricks/pybricks.c

@@ -52,33 +52,43 @@ static const mp_rom_map_elem_t pybricks_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_version),             MP_ROM_PTR(&pybricks_info_obj)},
     #if MICROPY_MODULE_BUILTIN_SUBPACKAGES
     #if PYBRICKS_PY_EXPERIMENTAL
+    extern const mp_obj_module_t pb_module_experimental;
     { MP_ROM_QSTR(MP_QSTR_experimental), MP_ROM_PTR(&pb_module_experimental) },
     #endif
     #if PYBRICKS_PY_HUBS
+    extern const mp_obj_module_t pb_module_hubs;
     { MP_ROM_QSTR(MP_QSTR_hubs), MP_ROM_PTR(&pb_module_hubs) },
     #endif
     #if PYBRICKS_PY_NXTDEVICES
+    extern const mp_obj_module_t pb_module_nxtdevices;
     { MP_ROM_QSTR(MP_QSTR_nxtdevices), MP_ROM_PTR(&pb_module_nxtdevices) },
     #endif
     #if PYBRICKS_PY_EV3DEVICES
+    extern const mp_obj_module_t pb_module_ev3devices;
     { MP_ROM_QSTR(MP_QSTR_ev3devices), MP_ROM_PTR(&pb_module_ev3devices) },
     #endif
     #if PYBRICKS_PY_PUPDEVICES
+    extern const mp_obj_module_t pb_module_pupdevices;
     { MP_ROM_QSTR(MP_QSTR_pupdevices), MP_ROM_PTR(&pb_module_pupdevices) },
     #endif
     #if PYBRICKS_PY_IODEVICES
+    extern const mp_obj_module_t pb_module_iodevices;
     { MP_ROM_QSTR(MP_QSTR_iodevices), MP_ROM_PTR(&pb_module_iodevices) },
     #endif
     #if PYBRICKS_PY_MEDIA
+    extern const mp_obj_module_t pb_module_media;
     { MP_ROM_QSTR(MP_QSTR_media), MP_ROM_PTR(&pb_module_media) },
     #endif
     #if PYBRICKS_PY_PARAMETERS
+    extern const mp_obj_module_t pb_module_parameters;
     { MP_ROM_QSTR(MP_QSTR_parameters), MP_ROM_PTR(&pb_module_parameters) },
     #endif
     #if PYBRICKS_PY_TOOLS
+    extern const mp_obj_module_t pb_module_tools;
     { MP_ROM_QSTR(MP_QSTR_tools), MP_ROM_PTR(&pb_module_tools) },
     #endif
     #if PYBRICKS_PY_ROBOTICS
+    extern const mp_obj_module_t pb_module_robotics;
     { MP_ROM_QSTR(MP_QSTR_robotics), MP_ROM_PTR(&pb_module_robotics) },
     #endif
     #endif

pybricks/robotics/pb_module_robotics.c

@@ -28,6 +28,8 @@ const mp_obj_module_t pb_module_robotics = {
     .globals = (mp_obj_dict_t *)&pb_module_robotics_globals,
 };
 
+#if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_robotics, pb_module_robotics);
+#endif
 
 #endif // PYBRICKS_PY_ROBOTICS