Reset working on both hardware versions

Author: siliconwitch

.vscode/launch.json

@@ -71,8 +71,8 @@
                 "BMPGDBSerialPort": "/dev/ttyACM0",
             },
             "osx": {
-                // "BMPGDBSerialPort": "/dev/cu.usbmodem72ADB7F21",
-                "BMPGDBSerialPort": "/dev/cu.usbmodem72AE45F31",
+                // "BMPGDBSerialPort": "/dev/cu.usbmodem72AE45F31",
+                "BMPGDBSerialPort": "/dev/cu.usbmodem72AE30F31",
             }
         },
         {

source/application/bluetooth.c

@@ -356,7 +356,7 @@ void SD_EVT_IRQHandler(void)
     }
 }
 
-void bluetooth_setup(bool factory_reset, bool *is_paired)
+void bluetooth_setup()
 {
     // Enable the softdevice using internal RC oscillator
     check_error(sd_softdevice_enable(NULL, softdevice_assert_handler));
@@ -433,21 +433,6 @@ void bluetooth_setup(bool factory_reset, bool *is_paired)
     bond.sec_param.kdist_peer.enc = 1;
     bond.sec_param.kdist_peer.id = 1;
 
-    if (factory_reset)
-    {
-        flash_erase_page(bond_storage);
-        flash_wait_until_complete();
-    }
-
-    // Check if already paired
-    ble_gap_enc_info_t zero_struct;
-    memset(&zero_struct, 0xFF, sizeof(ble_gap_enc_info_t));
-    if (memcmp((void *)bond_storage, &zero_struct, sizeof(ble_gap_enc_info_t)))
-    {
-        LOG("Device is paired");
-        *is_paired = true;
-    }
-
     // Read stored encryption key from memory
     memcpy(&bond.own_key.enc_info,
            (void *)bond_storage,
@@ -578,6 +563,26 @@ void bluetooth_setup(bool factory_reset, bool *is_paired)
     check_error(sd_ble_gap_adv_start(ble_handles.advertising, 1));
 }
 
+bool bluetooth_is_paired(void)
+{
+    bool is_paired = false;
+
+    ble_gap_enc_info_t zero_struct;
+    memset(&zero_struct, 0xFF, sizeof(ble_gap_enc_info_t));
+    if (memcmp((void *)bond_storage, &zero_struct, sizeof(ble_gap_enc_info_t)))
+    {
+        is_paired = true;
+    }
+
+    return is_paired;
+}
+
+void bluetooth_unpair(void)
+{
+    flash_erase_page(bond_storage);
+    flash_wait_until_complete();
+}
+
 bool bluetooth_is_connected(void)
 {
     return ble_handles.connection == BLE_CONN_HANDLE_INVALID ? false : true;

source/application/bluetooth.h

@@ -31,7 +31,11 @@
 #define BLE_PREFERRED_MAX_MTU 247
 extern uint16_t ble_negotiated_mtu;
 
-void bluetooth_setup(bool factory_reset, bool *is_paired);
+void bluetooth_setup(void);
+
+bool bluetooth_is_paired(void);
+
+void bluetooth_unpair(void);
 
 bool bluetooth_is_connected(void);
 

source/application/flash.c

@@ -27,6 +27,7 @@
 #include "error_logging.h"
 #include "lfs.h"
 #include "main.h"
+#include "nrf_sdm.h"
 #include "nrf_soc.h"
 #include "nrfx_log.h"
 
@@ -62,9 +63,14 @@ void flash_write(uint32_t address, const uint32_t *data, size_t length)
 
 void flash_wait_until_complete(void)
 {
-    // TODO add a timeout
-    while (flash_is_busy)
+    uint8_t sd_is_enabled = false;
+    sd_softdevice_is_enabled(&sd_is_enabled);
+
+    if (sd_is_enabled == 1)
     {
+        while (flash_is_busy)
+        {
+        }
     }
 }
 

source/application/luaport.c

@@ -63,7 +63,7 @@ void lua_break_signal_interrupt(void)
                 1);
 }
 
-void run_lua(bool factory_reset, bool is_paired)
+void run_lua(bool is_paired)
 {
     lua_State *L = luaL_newstate();
     L_global = L; // Only used for interrupts
@@ -99,7 +99,7 @@ void run_lua(bool factory_reset, bool is_paired)
     lua_open_imu_library(L);
     lua_open_time_library(L);
 
-    lua_open_file_library(L, factory_reset);
+    lua_open_file_library(L, !is_paired);
 
     // Make sure the above functions cleared up the stack correctly
     if (lua_gettop(L) != 0)

source/application/luaport.h

@@ -38,4 +38,4 @@ void lua_write_to_repl(uint8_t *buffer, uint8_t length);
 
 void lua_break_signal_interrupt(void);
 
-void run_lua(bool factory_reset, bool is_paired);
+void run_lua(bool is_paired);

source/application/main.c

@@ -164,14 +164,23 @@ void case_detect_pin_interrupt_handler(nrfx_gpiote_pin_t unused_gptiote_pin,
     shutdown(false);
 }
 
+void frame_lite_button_interrupt_handler(nrfx_gpiote_pin_t unused_gptiote_pin,
+                                         nrfx_gpiote_trigger_t unused_gptiote_trigger,
+                                         void *unused_gptiote_context_pointer)
+{
+    nrfx_gpiote_trigger_disable(FRAME_LITE_BUTTON_PIN);
+    bluetooth_unpair();
+    NVIC_SystemReset();
+}
+
 static void fpga_send_bitstream_bytes(void *context,
                                       void *data,
                                       size_t data_size)
 {
     spi_write_raw(FPGA, data, data_size);
 }
 
-static void hardware_setup(bool *factory_reset)
+static void hardware_setup()
 {
     // Configure watchdog
     {
@@ -183,6 +192,20 @@ static void hardware_setup(bool *factory_reset)
         nrfx_systick_init();
     }
 
+    // Check if Frame or Frame lite
+    {
+        nrf_gpio_cfg_input(FRAME_LITE_HW_DETECT_PIN, NRF_GPIO_PIN_PULLUP);
+
+        if (nrf_gpio_pin_read(FRAME_LITE_HW_DETECT_PIN))
+        {
+            LOG("Running on Frame");
+        }
+        else
+        {
+            LOG("Running on Frame Lite");
+        }
+    }
+
     // Configure the I2C and SPI drivers
     {
         i2c_configure();
@@ -299,7 +322,7 @@ static void hardware_setup(bool *factory_reset)
             else
             {
                 LOG("Factory reset");
-                *factory_reset = true;
+                bluetooth_unpair();
                 stay_awake = true;
             }
         }
@@ -308,6 +331,30 @@ static void hardware_setup(bool *factory_reset)
         nrfx_gpiote_trigger_enable(CASE_DETECT_PIN, true);
     }
 
+    // Configure the Frame lite button
+    {
+        nrfx_gpiote_input_config_t input_config = {
+            .pull = NRF_GPIO_PIN_PULLUP,
+        };
+
+        nrfx_gpiote_trigger_config_t trigger_config = {
+            .trigger = NRFX_GPIOTE_TRIGGER_HITOLO,
+            .p_in_channel = NULL,
+        };
+
+        nrfx_gpiote_handler_config_t handler_config = {
+            .handler = frame_lite_button_interrupt_handler,
+            .p_context = NULL,
+        };
+
+        check_error(nrfx_gpiote_input_configure(FRAME_LITE_BUTTON_PIN,
+                                                &input_config,
+                                                &trigger_config,
+                                                &handler_config));
+
+        nrfx_gpiote_trigger_enable(FRAME_LITE_BUTTON_PIN, true);
+    }
+
     // Load and start the FPGA image
     {
         nrf_gpio_cfg_output(FPGA_PROGRAM_PIN);
@@ -412,19 +459,14 @@ int main(void)
 {
     LOG("Frame firmware " BUILD_VERSION " (" GIT_COMMIT ")");
 
-    bool factory_reset = false;
-    bool is_paired = false;
+    hardware_setup();
 
-    hardware_setup(&factory_reset);
-
-    bluetooth_setup(factory_reset, &is_paired);
+    bluetooth_setup();
 
     while (1)
     {
         reload_watchdog(NULL, NULL);
 
-        run_lua(factory_reset, is_paired);
-
-        factory_reset = false;
+        run_lua(bluetooth_is_paired());
     }
 }

source/pinout.h

@@ -48,4 +48,10 @@
 #define IMU_INTERRUPT_PIN NRF_GPIO_PIN_MAP(1, 5)
 
 #define MICROPHONE_CLOCK_PIN NRF_GPIO_PIN_MAP(0, 4)
-#define MICROPHONE_DATA_PIN NRF_GPIO_PIN_MAP(0, 1)
+#define MICROPHONE_DATA_PIN NRF_GPIO_PIN_MAP(0, 1)
+
+#define FRAME_LITE_HW_DETECT_PIN NRF_GPIO_PIN_MAP(0, 9) // Inverted pin
+#define FRAME_LITE_BUTTON_PIN NRF_GPIO_PIN_MAP(1, 0)    // Inverted pin
+#define FRAME_LITE_LED_RED_PIN NRF_GPIO_PIN_MAP(1, 7)
+#define FRAME_LITE_LED_GREEN_PIN NRF_GPIO_PIN_MAP(1, 4)
+#define FRAME_LITE_LED_BLUE_PIN NRF_GPIO_PIN_MAP(1, 1)