pbio/sys/core: Consolidate power button logic.

This keeps the power button logic in one place.

This used to be separate because the hmi logic was implicit in pbio/sys/bluetooth, but we don't have that anymore.

By splitting this out of the sys/hmi module, we can make a platform specific HMI.

Author: laurensvalk

lib/pbio/sys/core.c

@@ -35,8 +35,8 @@ PROCESS_THREAD(pbsys_system_process, ev, data) {
         if (ev == PROCESS_EVENT_TIMER && etimer_expired(&timer)) {
             etimer_reset(&timer);
             pbsys_battery_poll();
-            pbsys_hmi_poll();
             pbsys_program_stop_poll();
+            pbsys_status_light_poll();
 
             // keep the hub from resetting itself
             pbdrv_watchdog_update();
@@ -53,7 +53,8 @@ void pbsys_init(void) {
 
     pbsys_battery_init();
     pbsys_host_init();
-    pbsys_hmi_init();
+    pbsys_status_light_init();
+    pbsys_hub_light_matrix_init();
 
     process_start(&pbsys_system_process);
 

lib/pbio/sys/hmi.c

@@ -37,33 +37,6 @@
 #define DEBUG_PRINT(...)
 #endif
 
-void pbsys_hmi_init(void) {
-    pbsys_status_light_init();
-    pbsys_hub_light_matrix_init();
-}
-
-/**
- * Polls the HMI.
- *
- * This is called periodically to update the current HMI state.
- */
-void pbsys_hmi_poll(void) {
-    pbio_button_flags_t btn = pbdrv_button_get_pressed();
-
-    if (btn & PBIO_BUTTON_CENTER) {
-        pbsys_status_set(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED);
-
-        // power off when button is held down for 2 seconds
-        if (pbsys_status_test_debounce(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED, true, 2000)) {
-            pbsys_status_set(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST);
-        }
-    } else {
-        pbsys_status_clear(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED);
-    }
-
-    pbsys_status_light_poll();
-}
-
 /**
  * Registers button presses to update the visual UI state and request the
  * launch of a program.

lib/pbio/sys/hmi.h

@@ -7,8 +7,6 @@
 #include <pbsys/config.h>
 #include <pbsys/status.h>
 
-void pbsys_hmi_init(void);
-void pbsys_hmi_poll(void);
 pbio_error_t pbsys_hmi_await_program_selection(void);
 
 #endif // _PBSYS_SYS_HMI_H_

lib/pbio/sys/program_stop.c

@@ -53,18 +53,29 @@ void pbsys_program_stop_set_buttons(pbio_button_flags_t buttons) {
 }
 
 /**
- * This is called periodically to monitor the user program.
+ * This is called periodically to monitor the power button and shutdown requests.
  */
 void pbsys_program_stop_poll(void) {
 
+    pbio_button_flags_t btn = pbdrv_button_get_pressed();
+
+    if (btn & PBIO_BUTTON_CENTER) {
+        pbsys_status_set(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED);
+
+        // power off when button is held down for 2 seconds
+        if (pbsys_status_test_debounce(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED, true, 2000)) {
+            pbsys_status_set(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST);
+        }
+    } else {
+        pbsys_status_clear(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED);
+    }
+
     // Cancel user application program if shutdown was requested.
     if (pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST)) {
         pbsys_program_stop(true);
         return;
     }
 
-    pbio_button_flags_t btn = pbdrv_button_get_pressed();
-
     if (!stop_buttons) {
         return;
     }