microbitv2: Replace MAIN_USER_EVENT state with a on-demand function.

So rather than go through a specific main_shutdown_state state to set
the "user event" (raising an interrupt and sending I2C data),
it just does that action directly when the button is long-pressed
or when the wake_from_usb flag is checked.

Also sets the interface_power_mode default state to 'Running'.
Not MB_POWER_DOWN, as until a power mode is requested the device
is awake.

Author: microbit-carlos

source/board/microbitv2/i2c_commands.c

@@ -382,3 +382,20 @@ void i2c_cmds_init() {
     i2c_registerWriteCallback(i2c_write_flash_callback, I2C_SLAVE_FLASH);
     i2c_registerReadCallback(i2c_read_flash_callback, I2C_SLAVE_FLASH);
 }
+
+void i2c_cmds_user_event(userEventType_t user_event) {
+    // Release COMBINED_SENSOR_INT in case it was previously asserted
+    gpio_disable_combined_int();
+
+    // Prepare I2C response
+    i2cCommand_t i2cResponse = {0};
+    i2cResponse.cmdId = gReadResponse_c;
+    i2cResponse.cmdData.readRspCmd.propertyId = (uint8_t) gUserEvent_c;
+    i2cResponse.cmdData.readRspCmd.dataSize = 1;
+    i2cResponse.cmdData.readRspCmd.data[0] = user_event;
+
+    i2c_fillBuffer((uint8_t*) &i2cResponse, 0, sizeof(i2cResponse));
+
+    // Response ready, assert COMBINED_SENSOR_INT
+    gpio_assert_combined_int();
+}

source/board/microbitv2/i2c_commands.h

@@ -167,6 +167,7 @@ typedef __PACKED_STRUCT i2cFlashCmd_tag {
 } i2cFlashCmd_t;
 
 void i2c_cmds_init(void);
+void i2c_cmds_user_event(userEventType_t user_event);
 
 #ifdef __cplusplus
 }

source/board/microbitv2/microbitv2.c

@@ -58,7 +58,7 @@ volatile uint8_t wake_from_reset = 0;
 volatile uint8_t wake_from_usb = 0;
 volatile bool usb_pc_connected = false;
 power_source_t power_source;
-microbit_if_power_mode_t interface_power_mode = MB_POWER_DOWN;
+microbit_if_power_mode_t interface_power_mode = MB_POWER_RUNNING;
 bool power_led_sleep_state_on = PWR_LED_SLEEP_STATE_DEFAULT;
 bool automatic_sleep_on = AUTOMATIC_SLEEP_DEFAULT;
 main_shutdown_state_t main_shutdown_state = MAIN_SHUTDOWN_WAITING;
@@ -182,7 +182,8 @@ void handle_reset_button()
             }
             else if (gpio_reset_count >= RESET_SHORT_PRESS) {
                 // Indicate the button has been released when shutdown is requested
-                main_shutdown_state = MAIN_USER_EVENT;
+                i2c_cmds_user_event(gResetButtonLongPress_c);
+                main_shutdown_state = MAIN_SHUTDOWN_WAITING;
             }
         } else if (reset_pressed && gpio_get_reset_btn_fwrd()) {
             // Reset button is still pressed
@@ -223,11 +224,12 @@ void board_30ms_hook()
     }
 
     if (wake_from_usb) {
-        main_shutdown_state = MAIN_USER_EVENT;
-
+        wake_from_usb = 0;
         if (usb_state == USB_DISCONNECTED) {
             usb_state = USB_CONNECTING;
         }
+        power_led_sleep_state_on = PWR_LED_SLEEP_STATE_DEFAULT;
+        i2c_cmds_user_event(gWakeFromWakeOnEdge_c);
     }
 
     i2c_30ms_tick();
@@ -259,34 +261,6 @@ void board_30ms_hook()
               final_fade_led_dc--;
           }
           break;
-      case MAIN_USER_EVENT:
-          {
-          // Release COMBINED_SENSOR_INT in case it was previously asserted
-          gpio_disable_combined_int();
-
-          // Prepare I2C response
-          i2cCommand_t i2cResponse = {0};
-          i2cResponse.cmdId = gReadResponse_c;
-          i2cResponse.cmdData.readRspCmd.propertyId = (uint8_t) gUserEvent_c;
-          i2cResponse.cmdData.readRspCmd.dataSize = 1;
-
-          if (wake_from_usb) {
-              i2cResponse.cmdData.readRspCmd.data[0] = gWakeFromWakeOnEdge_c;
-              wake_from_usb = 0;
-              power_led_sleep_state_on = PWR_LED_SLEEP_STATE_DEFAULT;
-          } else {
-              i2cResponse.cmdData.readRspCmd.data[0] = gResetButtonLongPress_c;
-          }
-
-          i2c_fillBuffer((uint8_t*) &i2cResponse, 0, sizeof(i2cResponse));
-
-          // Response ready, assert COMBINED_SENSOR_INT
-          gpio_assert_combined_int();
-
-          // Return LED to ON after release of long press
-          main_shutdown_state = MAIN_SHUTDOWN_WAITING;
-          }
-          break;
       case MAIN_SHUTDOWN_REQUESTED:
           if (power_source == PWR_BATT_ONLY || (usb_state == USB_DISCONNECTED && !usb_pc_connected)) {
               main_powerdown_event();
@@ -369,6 +343,7 @@ void board_handle_powerdown()
     switch(interface_power_mode){
         case MB_POWER_SLEEP:
             power_sleep();
+            interface_power_mode = MB_POWER_RUNNING;
             break;
         case MB_POWER_DOWN:
             power_down();

source/board/microbitv2/microbitv2.h

@@ -43,7 +43,6 @@ typedef enum main_shutdown_state {
     MAIN_SHUTDOWN_REACHED,
     MAIN_SHUTDOWN_REACHED_FADE,
     MAIN_SHUTDOWN_REQUESTED,
-    MAIN_USER_EVENT,
     MAIN_LED_BLINK_ONCE,
     MAIN_LED_BLINKING,
     MAIN_LED_FULL_BRIGHTNESS,