bricks/ev3: Add alias to pupdevices for easy testing.

The block coding editor has not yet been updated. By adding some aliases we can use the EV3 brick light, sound, motors, and some sensors. This is suitable for most demos.

Author: laurensvalk

bricks/_common/qstrdefs.h

@@ -39,7 +39,7 @@ Q(pybricks.nxtdevices)
 Q(pybricks.parameters)
 #endif
 
-#if PYBRICKS_PY_PUPDEVICES
+#if PYBRICKS_PY_PUPDEVICES || PYBRICKS_PY_EV3_PUP_ALIAS
 Q(pybricks.pupdevices)
 #endif
 

bricks/ev3/mpconfigport.h

@@ -9,6 +9,10 @@
 #define PYBRICKS_HUB_CLASS_NAME                 (MP_QSTR_EV3Brick)
 #define PYBRICKS_HUB_EV3BRICK                   (1)
 
+// On EV3, allow PUP imports for easy beta testing
+#define PYBRICKS_PY_EV3_PUP_ALIAS               (1)
+#define PYBRICKS_HUB_CLASS_NAME_ALIAS           (MP_QSTR_PrimeHub)
+
 // Pybricks modules
 #define PYBRICKS_PY_COMMON                      (1)
 #define PYBRICKS_PY_COMMON_BLE                  (0)

pybricks/ev3devices/pb_module_ev3devices.c

@@ -18,6 +18,9 @@ static const mp_rom_map_elem_t ev3devices_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_InfraredSensor),   MP_ROM_PTR(&pb_type_ev3devices_InfraredSensor)  },
     { MP_ROM_QSTR(MP_QSTR_TouchSensor),      MP_ROM_PTR(&pb_type_ev3devices_TouchSensor)     },
     { MP_ROM_QSTR(MP_QSTR_UltrasonicSensor), MP_ROM_PTR(&pb_type_ev3devices_UltrasonicSensor)},
+    #if PYBRICKS_PY_EV3_PUP_ALIAS
+    { MP_ROM_QSTR(MP_QSTR_ForceSensor),      MP_ROM_PTR(&pb_type_ev3devices_TouchSensor)     },
+    #endif
 };
 static MP_DEFINE_CONST_DICT(pb_module_ev3devices_globals, ev3devices_globals_table);
 
@@ -28,6 +31,9 @@ const mp_obj_module_t pb_module_ev3devices = {
 
 #if !MICROPY_MODULE_BUILTIN_SUBPACKAGES
 MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_ev3devices, pb_module_ev3devices);
+#if PYBRICKS_PY_EV3_PUP_ALIAS
+MP_REGISTER_MODULE(MP_QSTR_pybricks_dot_pupdevices, pb_module_ev3devices);
+#endif
 #endif
 
 #endif // PYBRICKS_PY_EV3DEVICES

pybricks/parameters/pb_type_port.c

@@ -124,6 +124,10 @@ static const mp_rom_map_elem_t pb_enum_Port_table[] = {
     #if PBDRV_CONFIG_HAS_PORT_4
     { MP_ROM_QSTR(MP_QSTR_S4),  MP_ROM_PTR(&pb_Port_4_obj)},
     #endif
+    #if PYBRICKS_PY_EV3_PUP_ALIAS
+    { MP_ROM_QSTR(MP_QSTR_E),  MP_ROM_PTR(&pb_Port_1_obj)},
+    { MP_ROM_QSTR(MP_QSTR_F),  MP_ROM_PTR(&pb_Port_2_obj)},
+    #endif
 };
 static MP_DEFINE_CONST_DICT(pb_enum_type_Port_locals_dict, pb_enum_Port_table);