pybricks.common.System: Fix hub button guard.

laurensvalk · laurensvalk · commit b5f40d880596 · 2023-06-28T19:58:49.000+02:00
The button parameter is enabled everywhere since the remote
has more than one button. Instead, we can use a define for the
number of buttons on the hub to check this.

This saves code size on hubs with one button, like the Move Hub.
diff --git a/bricks/cityhub/mpconfigport.h b/bricks/cityhub/mpconfigport.h
@@ -17,6 +17,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (1)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (1)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (0)
 #define PYBRICKS_PY_COMMON_LOGGER               (1)
diff --git a/bricks/debug/mpconfigport.h b/bricks/debug/mpconfigport.h
@@ -16,6 +16,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (0)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (1)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (0)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (0)
 #define PYBRICKS_PY_COMMON_MOTORS               (0)
diff --git a/bricks/essentialhub/mpconfigport.h b/bricks/essentialhub/mpconfigport.h
@@ -18,6 +18,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (1)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (1)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (1)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (0)
 #define PYBRICKS_PY_COMMON_LOGGER               (1)
diff --git a/bricks/ev3dev/brickconfig.h b/bricks/ev3dev/brickconfig.h
@@ -21,6 +21,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL      (1)
 #define PYBRICKS_PY_COMMON_IMU          (0)
 #define PYBRICKS_PY_COMMON_KEYPAD       (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS (6)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY  (0)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX (0)
 #define PYBRICKS_PY_COMMON_LOGGER       (1)
diff --git a/bricks/ev3rt/mpconfigport.h b/bricks/ev3rt/mpconfigport.h
@@ -21,6 +21,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL      (0)
 #define PYBRICKS_PY_COMMON_IMU          (0)
 #define PYBRICKS_PY_COMMON_KEYPAD       (0)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS (6)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY  (0)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX (0)
 #define PYBRICKS_PY_COMMON_LOGGER       (0)
diff --git a/bricks/movehub/mpconfigport.h b/bricks/movehub/mpconfigport.h
@@ -17,6 +17,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (0)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (1)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (1)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (0)
 #define PYBRICKS_PY_COMMON_LOGGER               (0)
diff --git a/bricks/nxt/mpconfigport.h b/bricks/nxt/mpconfigport.h
@@ -19,6 +19,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (0)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (4)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (0)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (0)
 #define PYBRICKS_PY_COMMON_LOGGER               (1)
diff --git a/bricks/primehub/mpconfigport.h b/bricks/primehub/mpconfigport.h
@@ -19,6 +19,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (1)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (4)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (1)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (1)
 #define PYBRICKS_PY_COMMON_LOGGER               (1)
diff --git a/bricks/technichub/mpconfigport.h b/bricks/technichub/mpconfigport.h
@@ -17,6 +17,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL              (1)
 #define PYBRICKS_PY_COMMON_IMU                  (1)
 #define PYBRICKS_PY_COMMON_KEYPAD               (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS   (1)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY          (1)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX         (0)
 #define PYBRICKS_PY_COMMON_LOGGER               (1)
diff --git a/bricks/virtualhub/mpconfigvariant.h b/bricks/virtualhub/mpconfigvariant.h
@@ -13,6 +13,7 @@
 #define PYBRICKS_PY_COMMON_CONTROL      (1)
 #define PYBRICKS_PY_COMMON_IMU          (0)
 #define PYBRICKS_PY_COMMON_KEYPAD       (1)
+#define PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS (1)
 #define PYBRICKS_PY_COMMON_LIGHT_ARRAY  (1)
 #define PYBRICKS_PY_COMMON_LIGHT_MATRIX (0)
 #define PYBRICKS_PY_COMMON_LOGGER       (1)
diff --git a/pybricks/common/pb_type_system.c b/pybricks/common/pb_type_system.c
@@ -48,7 +48,7 @@ STATIC mp_obj_t pb_type_System_set_stop_button(mp_obj_t buttons_in) {
     pbio_button_flags_t buttons = 0;
 
     if (mp_obj_is_true(buttons_in)) {
-        #if PYBRICKS_PY_PARAMETERS_BUTTON
+        #if PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS > 1
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
             // try an iterator first in case there are multiple buttons
@@ -66,10 +66,9 @@ STATIC mp_obj_t pb_type_System_set_stop_button(mp_obj_t buttons_in) {
             // which is the same error that will be raised here.
             buttons = pb_type_enum_get_value(buttons_in, &pb_enum_type_Button);
         }
-        #else // PYBRICKS_PY_PARAMETERS_BUTTON
-        // if the buttons enum is not enabled, then there is only one button
+        #else // PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS > 1
         buttons = PBIO_BUTTON_CENTER;
-        #endif // PYBRICKS_PY_PARAMETERS_BUTTON
+        #endif // PYBRICKS_PY_COMMON_KEYPAD_HUB_BUTTONS > 1
     }
 
     pbsys_program_stop_set_buttons(buttons);
