pbio/sys/hmi: Make default stop button configurable.

It's always been the center button, but we use the top left back button on EV3. It will be the dark gray button on NXT.

Author: laurensvalk

lib/pbio/platform/city_hub/pbsysconfig.h

@@ -11,6 +11,7 @@
 #define PBSYS_CONFIG_BATTERY_CHARGER                (0)
 #define PBSYS_CONFIG_BLUETOOTH                      (1)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 5) // center
 #define PBSYS_CONFIG_HMI_PUP                        (1)
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (0)
 #define PBSYS_CONFIG_HUB_LIGHT_MATRIX               (0)

lib/pbio/platform/essential_hub/pbsysconfig.h

@@ -9,6 +9,7 @@
 #define PBSYS_CONFIG_BATTERY_CHARGER                (1)
 #define PBSYS_CONFIG_BLUETOOTH                      (1)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 5) // center
 #define PBSYS_CONFIG_HMI_PUP                        (1)
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (0)
 #define PBSYS_CONFIG_HUB_LIGHT_MATRIX               (0)

lib/pbio/platform/ev3/pbsysconfig.h

@@ -8,6 +8,7 @@
 #define PBSYS_CONFIG_FEATURE_PROGRAM_FORMAT_MULTI_MPY_V6_3_NATIVE  (0)
 #define PBSYS_CONFIG_BATTERY_TEMP_ESTIMATION        (1)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 7) // top left, back button
 #define PBSYS_CONFIG_HMI_LCD                        (1)
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (5)
 #define PBSYS_CONFIG_HOST                           (1)

lib/pbio/platform/move_hub/pbsysconfig.h

@@ -11,6 +11,7 @@
 #define PBSYS_CONFIG_BATTERY_CHARGER                (0)
 #define PBSYS_CONFIG_BLUETOOTH                      (1)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 5) // center
 #define PBSYS_CONFIG_HMI_PUP                        (1)
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (0)
 #define PBSYS_CONFIG_HUB_LIGHT_MATRIX               (0)

lib/pbio/platform/nxt/pbsysconfig.h

@@ -7,6 +7,7 @@
 #define PBSYS_CONFIG_FEATURE_PROGRAM_FORMAT_MULTI_MPY_V6           (1)
 #define PBSYS_CONFIG_FEATURE_PROGRAM_FORMAT_MULTI_MPY_V6_3_NATIVE  (0)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 2) // down
 #define PBSYS_CONFIG_HMI_NONE                       (1)
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (0)
 #define PBSYS_CONFIG_HOST                           (1)

lib/pbio/platform/prime_hub/pbsysconfig.h

@@ -10,10 +10,11 @@
 #define PBSYS_CONFIG_BLUETOOTH                      (1)
 #define PBSYS_CONFIG_BLUETOOTH_TOGGLE               (1)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 5) // center
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (5)
 #define PBSYS_CONFIG_HMI_PUP                        (1)
-#define PBSYS_CONFIG_HMI_PUP_LEFT_RIGHT_BUTTONS     (1)
-#define PBSYS_CONFIG_HMI_PUP_BLUETOOTH_BUTTON       (512) // PBIO_BUTTON_RIGHT_UP, but enum value cannot be used here.
+#define PBSYS_CONFIG_HMI_PUP_BLUETOOTH_BUTTON       (1 << 9) // right up
+#define PBSYS_CONFIG_HMI_PUP_LEFT_RIGHT_ENABLE      (1)
 #define PBSYS_CONFIG_HUB_LIGHT_MATRIX               (1)
 #define PBSYS_CONFIG_HUB_LIGHT_MATRIX_LED_ARRAY     (1)
 #define PBSYS_CONFIG_HOST                           (1)

lib/pbio/platform/technic_hub/pbsysconfig.h

@@ -11,6 +11,7 @@
 #define PBSYS_CONFIG_BATTERY_CHARGER                (0)
 #define PBSYS_CONFIG_BLUETOOTH                      (1)
 #define PBSYS_CONFIG_HMI                            (1)
+#define PBSYS_CONFIG_HMI_STOP_BUTTON                (1 << 5) // center
 #define PBSYS_CONFIG_HMI_PUP                        (1)
 #define PBSYS_CONFIG_HMI_NUM_SLOTS                  (0)
 #define PBSYS_CONFIG_HUB_LIGHT_MATRIX               (0)

lib/pbio/sys/hmi_pup.c

@@ -164,7 +164,7 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
         }
         #endif // PBSYS_CONFIG_HMI_PUP_BLUETOOTH_BUTTON
 
-        #if PBSYS_CONFIG_HMI_PUP_LEFT_RIGHT_BUTTONS
+        #if PBSYS_CONFIG_HMI_PUP_LEFT_RIGHT_ENABLE
         // On right, increment slot when possible, then start waiting on new inputs.
         if (pbdrv_button_get_pressed() & PBIO_BUTTON_RIGHT) {
             pbsys_status_increment_selected_slot(true);
@@ -175,7 +175,7 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
             pbsys_status_increment_selected_slot(false);
             continue;
         }
-        #endif // PBSYS_CONFIG_HMI_PUP_LEFT_RIGHT_BUTTONS
+        #endif // PBSYS_CONFIG_HMI_PUP_LEFT_RIGHT_ENABLE
 
         // On center, attempt to start program.
         if (pbdrv_button_get_pressed() & PBIO_BUTTON_CENTER) {

lib/pbio/sys/main.c

@@ -120,7 +120,7 @@ int main(int argc, char **argv) {
         // Get system back in idle state.
         pbsys_status_clear(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING);
         pbsys_host_stdin_set_callback(NULL);
-        pbsys_program_stop_set_buttons(PBIO_BUTTON_CENTER);
+        pbsys_program_stop_set_buttons(PBSYS_CONFIG_HMI_STOP_BUTTON);
         program.start_request_type = PBSYS_MAIN_PROGRAM_START_REQUEST_TYPE_NONE;
 
         // Handle pending events triggered by the status change, such as

lib/pbio/sys/program_stop.c

@@ -16,7 +16,7 @@
 #include <pbsys/program_stop.h>
 
 // Button combination that will trigger user program stop callback
-static pbio_button_flags_t stop_buttons = PBIO_BUTTON_CENTER;
+static pbio_button_flags_t stop_buttons = PBSYS_CONFIG_HMI_STOP_BUTTON;
 // State for button press one-shot
 static bool stop_button_pressed;
 
@@ -59,7 +59,7 @@ void pbsys_program_stop_poll(void) {
 
     pbio_button_flags_t btn = pbdrv_button_get_pressed();
 
-    if (btn & PBIO_BUTTON_CENTER) {
+    if (btn & PBSYS_CONFIG_HMI_STOP_BUTTON) {
         pbsys_status_set(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED);
 
         // power off when button is held down for 2 seconds