reset to ota function

include/util.h

@@ -26,6 +26,7 @@ int32_t convert_two_complement(int32_t b);
 
 bool str_startswith(const char *str, const char *start);
 
+void reset_to_ota(void);
 void reset_to_bootloader(void);
 void reset_to_main(void);
 

src/console.c

@@ -23,7 +23,6 @@
 
 #include "pico/stdlib.h"
 #include "hardware/watchdog.h"
-#include "picowota/reboot.h"
 
 #include "config.h"
 #include "log.h"
@@ -139,7 +138,7 @@ static void cnsl_interpret(const char *line) {
     } else if (strcmp(line, "reset") == 0) {
         reset_to_main();
     } else if (strcmp(line, "ota") == 0) {
-        picowota_reboot(true);
+        reset_to_ota();
     } else if (strcmp(line, "mount") == 0) {
         bool state = msc_is_medium_available();
         println("Currently %s. %s now.",

src/mem.c

@@ -114,7 +114,6 @@ void mem_load(void) {
         } else {
             debug("loading from flash (0x%08lX)", checksum);
             data_ram = *flash_ptr;
-            debug("%s", data_ram.data.net[0].pass);
         }
     } else {
         debug("invalid config (0x%02X != 0x%02X)", flash_ptr->version, MEM_VERSION);

src/state_about.c

@@ -53,6 +53,8 @@ static const char *about_text =
     "bluekitchen/btstack\n"
     "mcufont/mcufont\n"
     "hepingood/st7789\n"
+    "usedbytes/picowota\n"
+    "lwip-tcpip/lwip\n"
     "\n"
 
     "This program is free software: you can redistribute it and/or modify "

src/state_scan.c

@@ -20,13 +20,13 @@
 #include <string.h>
 
 #include "pico/stdlib.h"
-#include "picowota/reboot.h"
 
 #include "config.h"
 #include "ble.h"
 #include "models.h"
 #include "mem.h"
 #include "menu.h"
+#include "util.h"
 #include "state.h"
 #include "state_workflow.h"
 #include "state_volcano_run.h"
@@ -103,7 +103,7 @@ static void edit_cb(int selection) {
 
 static void ota_cb(int selection) {
     UNUSED(selection);
-    picowota_reboot(true);
+    reset_to_ota();
 }
 
 void state_scan_enter(void) {

src/state_settings.c

@@ -19,13 +19,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "picowota/reboot.h"
-
 #include "config.h"
 #include "log.h"
 #include "main.h"
 #include "menu.h"
 #include "mem.h"
+#include "util.h"
 #include "state.h"
 #include "state_value.h"
 #include "state_workflow.h"
@@ -85,7 +84,7 @@ static void enter_cb(int selection) {
 
     case 6:
         // OTA Update
-        picowota_reboot(true);
+        reset_to_ota();
         break;
 
     default:

src/util.c

@@ -19,7 +19,7 @@
 #include <string.h>
 #include "pico/stdlib.h"
 #include "pico/bootrom.h"
-#include "hardware/watchdog.h"
+#include "picowota/reboot.h"
 
 #ifdef CYW43_WL_GPIO_LED_PIN
 #include "pico/cyw43_arch.h"
@@ -81,12 +81,12 @@ void reset_to_bootloader(void) {
 #endif // PICO_DEFAULT_LED_PIN
 }
 
+void reset_to_ota(void) {
+    picowota_reboot(true);
+}
+
 void reset_to_main(void) {
-    watchdog_enable(1, 1);
-    while (1) {
-        // wait 1ms until watchdog kills us
-        asm volatile("nop");
-    }
+    picowota_reboot(false);
 }
 
 void hexdump(const uint8_t *buff, size_t len) {