add picowota bootloader

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "st7789"]
 	path = st7789
 	url = https://github.com/hepingood/st7789
+[submodule "picowota"]
+	path = picowota
+	url = https://github.com/usedbytes/picowota

CMakeLists.txt

@@ -159,6 +159,7 @@ target_link_libraries(gadget
     pico_cyw43_arch_threadsafe_background
     hardware_flash
     pico_flash
+    picowota_reboot
 )
 
 target_compile_definitions(gadget PUBLIC
@@ -171,5 +172,9 @@ pico_set_linker_script(gadget ${CMAKE_CURRENT_SOURCE_DIR}/src/memmap_custom.ld)
 # fix for Errata RP2040-E5 (the fix requires use of GPIO 15)
 target_compile_definitions(gadget PUBLIC PICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1)
 
-# create map/bin/hex/uf2 file etc.
-pico_add_extra_outputs(gadget)
+set(PICOWOTA_WIFI_SSID "WIFI_SSID_HERE")
+set(PICOWOTA_WIFI_PASS "WIFI_PASS_HERE")
+set(PICOWOTA_WIFI_AP 0)
+
+add_subdirectory(picowota)
+picowota_build_combined(gadget)

README.md

@@ -123,6 +123,7 @@ Some code is adapted from the TinyUSB examples.
 And the project uses the [FatFS library](https://github.com/abbrev/fatfs), licensed as BSD 1-clause.
 Also included are the [MCUFont library](https://github.com/mcufont/mcufont) and the [st7789 library](https://github.com/hepingood/st7789), both licensed under the MIT license.
 It also uses the [BTstack](https://github.com/bluekitchen/btstack/blob/master/LICENSE) included with the Pico SDK, following their [license terms](https://github.com/raspberrypi/pico-sdk/blob/master/src/rp2_common/pico_btstack/LICENSE.RP).
+The included bootloader is [picowota](https://github.com/usedbytes/picowota), licensed as BSD 3-clause.
 
 The case design is also licensed as GPLv3.
 It uses a [Pi Pico case model](https://www.printables.com/model/210898-raspberry-pi-pico-case) licensed as CC-BY-NC-SA.

flash_ota.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# ----------------------------------------------------------------------------
+# Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# See <http://www.gnu.org/licenses/>.
+# ----------------------------------------------------------------------------
+
+set -euo pipefail
+
+# TODO wait for device to be ready
+
+echo Copying binary
+~/go/bin/serial-flash tcp:$1:4242 $2
+
+echo Done

src/console.c

@@ -23,6 +23,7 @@
 
 #include "pico/stdlib.h"
 #include "hardware/watchdog.h"
+#include "picowota/reboot.h"
 
 #include "config.h"
 #include "log.h"
@@ -96,6 +97,7 @@ static void cnsl_interpret(const char *line) {
         println("");
         println("  reset - reset back into this firmware");
         println("   \\x18 - reset to bootloader");
+        println("    ota - reset to ota bootloader");
         println(" repeat - repeat last command every %d milliseconds", CNSL_REPEAT_MS);
         println("   help - print this message");
         println("  mount - make mass storage medium (un)available");
@@ -135,6 +137,8 @@ static void cnsl_interpret(const char *line) {
         println("Stop this by calling repeat again.");
     } else if (strcmp(line, "reset") == 0) {
         reset_to_main();
+    } else if (strcmp(line, "ota") == 0) {
+        picowota_reboot(true);
     } else if (strcmp(line, "mount") == 0) {
         bool state = msc_is_medium_available();
         println("Currently %s. %s now.",

src/state_scan.c

@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include "pico/stdlib.h"
+#include "picowota/reboot.h"
 
 #include "config.h"
 #include "ble.h"
@@ -100,8 +101,13 @@ static void edit_cb(int selection) {
     }
 }
 
+static void ota_cb(int selection) {
+    UNUSED(selection);
+    picowota_reboot(true);
+}
+
 void state_scan_enter(void) {
-    menu_init(enter_cb, edit_cb, NULL, NULL);
+    menu_init(enter_cb, edit_cb, ota_cb, NULL);
     ble_scan(BLE_SCAN_ON);
 }
 

src/state_settings.c

@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "picowota/reboot.h"
+
 #include "config.h"
 #include "log.h"
 #include "menu.h"
@@ -51,15 +53,20 @@ static void enter_cb(int selection) {
         break;
 
     case 2:
-        // Workflows
+        // Edit Workflows
         state_wf_edit(true);
         state_switch(STATE_WORKFLOW);
         break;
 
     case 3:
-        // Reset
+        // Factory Reset
         mem_load_defaults();
         break;
+
+    case 4:
+        // OTA Update
+        picowota_reboot(true);
+        break;
     }
 }
 
@@ -84,6 +91,7 @@ static void draw(struct menu_state *menu) {
     ADD_STATIC_ELEMENT("Brightness (%d)", __builtin_ffs(mem_data()->backlight));
     ADD_STATIC_ELEMENT("Edit Workflows");
     ADD_STATIC_ELEMENT("Factory Reset");
+    ADD_STATIC_ELEMENT("OTA Update");
 
     if (menu->selection < 0) {
         menu->selection = 0;