pybricks.pupdevices.Remote: Use dedicated guard.

The virtualhub has pupdevices but no Bluetooth.

Author: laurensvalk

bricks/cityhub/mpconfigport.h

@@ -39,6 +39,7 @@
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
+#define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
 #define PYBRICKS_PY_ROBOTICS                    (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_GYRO     (0)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_SPIKE    (0)

bricks/essentialhub/mpconfigport.h

@@ -40,6 +40,7 @@
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
+#define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
 #define PYBRICKS_PY_ROBOTICS                    (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_GYRO     (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_SPIKE    (1)

bricks/movehub/mpconfigport.h

@@ -35,6 +35,7 @@
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
+#define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
 #define PYBRICKS_PY_ROBOTICS                    (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_GYRO     (0)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_SPIKE    (0)

bricks/primehub/mpconfigport.h

@@ -41,6 +41,7 @@
 #define PYBRICKS_PY_PARAMETERS_ICON             (1)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
+#define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
 #define PYBRICKS_PY_ROBOTICS                    (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_GYRO     (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_SPIKE    (1)

bricks/technichub/mpconfigport.h

@@ -39,6 +39,7 @@
 #define PYBRICKS_PY_PARAMETERS_ICON             (0)
 #define PYBRICKS_PY_DEVICES                     (1)
 #define PYBRICKS_PY_PUPDEVICES                  (1)
+#define PYBRICKS_PY_PUPDEVICES_REMOTE           (1)
 #define PYBRICKS_PY_ROBOTICS                    (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_GYRO     (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_SPIKE    (0)

bricks/virtualhub/mpconfigvariant.h

@@ -33,6 +33,7 @@
 #define PYBRICKS_PY_PARAMETERS_BUTTON   (1)
 #define PYBRICKS_PY_PARAMETERS_ICON     (1)
 #define PYBRICKS_PY_PUPDEVICES          (1)
+#define PYBRICKS_PY_PUPDEVICES_REMOTE   (0)
 #define PYBRICKS_PY_DEVICES             (1)
 #define PYBRICKS_PY_ROBOTICS            (1)
 #define PYBRICKS_PY_ROBOTICS_DRIVEBASE_SPIKE (0)

pybricks/iodevices/pb_module_iodevices.c

@@ -12,8 +12,10 @@ STATIC const mp_rom_map_elem_t iodevices_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),         MP_ROM_QSTR(MP_QSTR_iodevices)                },
     #if PYBRICKS_PY_PUPDEVICES
     { MP_ROM_QSTR(MP_QSTR_PUPDevice),        MP_ROM_PTR(&pb_type_iodevices_PUPDevice)      },
+    #if PYBRICKS_PY_PUPDEVICES_REMOTE
     { MP_ROM_QSTR(MP_QSTR_LWP3Device),       MP_ROM_PTR(&pb_type_iodevices_LWP3Device)     },
     #endif
+    #endif
     #if PYBRICKS_PY_IODEVICES_XBOX_CONTROLLER
     { MP_ROM_QSTR(MP_QSTR_XboxController),   MP_ROM_PTR(&pb_type_iodevices_XboxController) },
     #endif

pybricks/iodevices/pb_type_iodevices_lwp3device.c

@@ -3,7 +3,7 @@
 
 #include "py/mpconfig.h"
 
-#if PYBRICKS_PY_PUPDEVICES
+#if PYBRICKS_PY_PUPDEVICES_REMOTE
 
 #include <stdint.h>
 #include <string.h>
@@ -549,4 +549,4 @@ MP_DEFINE_CONST_OBJ_TYPE(pb_type_iodevices_LWP3Device,
 
 #endif // PYBRICKS_PY_IODEVICES
 
-#endif // PYBRICKS_PY_PUPDEVICES
+#endif // PYBRICKS_PY_PUPDEVICES_REMOTE

pybricks/pupdevices/pb_module_pupdevices.c

@@ -24,7 +24,9 @@ STATIC const mp_rom_map_elem_t pupdevices_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_InfraredSensor),      MP_ROM_PTR(&pb_type_pupdevices_InfraredSensor)     },
     { MP_ROM_QSTR(MP_QSTR_Light),               MP_ROM_PTR(&pb_type_pupdevices_Light)              },
     { MP_ROM_QSTR(MP_QSTR_PFMotor),             MP_ROM_PTR(&pb_type_pupdevices_PFMotor)            },
+    #if PYBRICKS_PY_PUPDEVICES_REMOTE
     { MP_ROM_QSTR(MP_QSTR_Remote),              MP_ROM_PTR(&pb_type_pupdevices_Remote)             },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_TiltSensor),          MP_ROM_PTR(&pb_type_pupdevices_TiltSensor)         },
     { MP_ROM_QSTR(MP_QSTR_UltrasonicSensor),    MP_ROM_PTR(&pb_type_pupdevices_UltrasonicSensor)   },
 };

pybricks/pybricks.c

@@ -138,14 +138,15 @@ void pb_package_pybricks_deinit(void) {
     #if PYBRICKS_PY_COMMON_BLE
     pb_type_ble_start_cleanup();
     #endif
-    // Disconnect from remote.
-    #if PYBRICKS_PY_PUPDEVICES
+
+    #if PYBRICKS_PY_PUPDEVICES_REMOTE
+    // Disconnect from remote or LWP3 device.
     pb_type_lwp3device_start_cleanup();
-    #endif // PYBRICKS_PY_PUPDEVICES
+    #endif // PYBRICKS_PY_PUPDEVICES_REMOTE
 
-    #if PYBRICKS_PY_COMMON_BLE && PYBRICKS_PY_PUPDEVICES
+    #if PYBRICKS_PY_COMMON_BLE || PYBRICKS_PY_PUPDEVICES_REMOTE
     // By queueing and awaiting a task that does nothing, we know that all user
-    // tasks and deinit tasks have completed.
+    // tasks and deinit tasks queued before it have completed.
     static pbio_task_t noop_task;
     pbdrv_bluetooth_queue_noop(&noop_task);
     while (noop_task.status == PBIO_ERROR_AGAIN || !pbsys_bluetooth_tx_is_idle()) {
@@ -156,5 +157,5 @@ void pb_package_pybricks_deinit(void) {
             break;
         }
     }
-    #endif
+    #endif // PYBRICKS_PY_COMMON_BLE || PYBRICKS_PY_PUPDEVICES_REMOTE
 }