Tweak blink and treat SWD reset like reset button

Author: tannewt

supervisor/shared/bluetooth/bluetooth.c

@@ -176,8 +176,8 @@ void supervisor_bluetooth_init(void) {
     }
     while (diff < 1000) {
         #ifdef CIRCUITPY_STATUS_LED
-        // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
-        bool led_on = ble_mode != 0 || (diff % 150) <= 75;
+        // Blink on for 50 and off for 100
+        bool led_on = ble_mode != 0 || (diff % 150) <= 50;
         if (led_on) {
             new_status_color(0x0000ff);
         } else {

supervisor/shared/safe_mode.c

@@ -55,12 +55,15 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         port_set_saved_word(SAFE_MODE_DATA_GUARD);
         current_safe_mode = safe_mode;
         return safe_mode;
+    } else {
+        current_safe_mode = 0;
     }
 
     const mcu_reset_reason_t reset_reason = common_hal_mcu_processor_get_reset_reason();
     if (reset_reason != RESET_REASON_POWER_ON &&
         reset_reason != RESET_REASON_RESET_PIN &&
-        reset_reason != RESET_REASON_UNKNOWN) {
+        reset_reason != RESET_REASON_UNKNOWN &&
+        reset_reason != RESET_REASON_SOFTWARE) {
         return NO_SAFE_MODE;
     }
     port_set_saved_word(SAFE_MODE_DATA_GUARD | (MANUAL_SAFE_MODE << 8));