more bootloader stuff

CMakeLists.txt

@@ -25,6 +25,8 @@ execute_process(COMMAND make
 )
 
 # build lwip httpd fs
+# TODO should use C version instead of Perl script, for
+# TODO added file compression. but how to compile it?
 set(MAKE_FS_DATA_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/pico-sdk/lib/lwip/src/apps/http/makefsdata/makefsdata)
 execute_process(
     COMMAND perl ${MAKE_FS_DATA_SCRIPT}
@@ -209,6 +211,8 @@ set(PICOWOTA_ADDITIONAL_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/text.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/ota_shim.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/workflow_default.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/buttons.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/util.c
 
     ${CMAKE_CURRENT_SOURCE_DIR}/st7789/src/driver_st7789.c
 

include/config.h

@@ -20,7 +20,7 @@
 #define __CONFIG_H__
 
 #define APP_VERSION_MAJOR 0
-#define APP_VERSION_MINOR 1
+#define APP_VERSION_MINOR 2
 
 #define MENU_PREFER_VOLCANO
 //#define MENU_PREFER_CRAFTY

include/log.h

@@ -48,8 +48,10 @@ void debug_log_va(bool log, const char *format, va_list args);
 void log_dump_to_usb(void);
 void log_dump_to_uart(void);
 void log_dump_to_disk(void);
-void log_dump_to_lcd(void);
 
 void debug_handle_input(const void *buff, size_t len);
 
+#include "ring.h"
+struct ring_buffer *log_get(void);
+
 #endif // __LOG_H__

picowota

@@ -1 +1 @@
-Subproject commit 4abdeee20f2dd8f813f322b61ce1afee7b502d12
+Subproject commit dd98bf620976a2df113cf03eeb2483a9e68c1d7d

src/log.c

@@ -24,8 +24,6 @@
 
 #include "config.h"
 #include "main.h"
-#include "lcd.h"
-#include "textbox.h"
 #include "usb_cdc.h"
 #include "serial.h"
 #include "ring.h"
@@ -36,7 +34,6 @@ static struct ring_buffer log = RB_INIT(log_buff, sizeof(log_buff), 1);
 
 static uint8_t line_buff[256] = {0};
 static volatile bool got_input = false;
-static int16_t lcd_off = 0;
 
 #ifndef PICOWOTA
 static FIL log_file_fat;
@@ -46,34 +43,8 @@ static void add_to_log(const void *buff, size_t len) {
     rb_add(&log, buff, len);
 }
 
-static void lcd_write(const void *buf, size_t len) {
-    char tmp[len + 1];
-    memcpy(tmp, buf, len);
-    tmp[len] = '\0';
-    lcd_off = text_box(tmp, false,
-                       "fixed_10x20",
-                       0, LCD_WIDTH,
-                       lcd_off, LCD_HEIGHT - lcd_off,
-                       0);
-}
-
-void log_dump_to_lcd(void) {
-    static size_t prev_len = 0;
-    size_t len = rb_len(&log);
-    if (len == prev_len) {
-        return;
-    }
-    prev_len = len;
-
-    lcd_off = 0;
-
-    const size_t todo = 120;
-    size_t text_off = 0;
-    if (len > todo) {
-        text_off = len - todo;
-    }
-
-    rb_dump(&log, lcd_write, text_off);
+struct ring_buffer *log_get(void) {
+    return &log;
 }
 
 #ifndef PICOWOTA

src/ota_shim.c

@@ -19,18 +19,90 @@
 #include "pico/cyw43_arch.h"
 
 #include "config.h"
+#include "buttons.h"
 #include "lcd.h"
 #include "log.h"
+#include "lcd.h"
+#include "textbox.h"
 #include "mem.h"
+#include "util.h"
 #include "wifi.h"
 
+static int16_t lcd_off = 0;
+static size_t text_window = 120;
+static size_t text_off = 0;
+static size_t prev_len = 0;
+static bool redraw = false;
+
+static void lcd_write(const void *buf, size_t len) {
+    char tmp[len + 1];
+    memcpy(tmp, buf, len);
+    tmp[len] = '\0';
+    lcd_off = text_box(tmp, false,
+                       "fixed_10x20",
+                       0, LCD_WIDTH,
+                       lcd_off, LCD_HEIGHT - lcd_off,
+                       0);
+}
+
+static void log_dump_to_lcd(void) {
+    // TODO length is not good as indicator.
+    // TODO will stop working when log buffer is filled.
+    size_t len = rb_len(log_get());
+    if (redraw || (len == prev_len)) {
+        return;
+    }
+    prev_len = len;
+    redraw = false;
+
+    lcd_off = 0;
+
+    text_off = 0;
+    if (len > text_window) {
+        text_off = len - text_window;
+    }
+
+    rb_dump(log_get(), lcd_write, text_off);
+}
+
+static void ota_buttons(enum buttons btn, bool state) {
+    if (state && (btn == BTN_Y)) {
+        reset_to_main();
+    } else if (state && (btn == BTN_LEFT)) {
+        if (text_window > 10) {
+            text_window -= 10;
+            redraw = true;
+        }
+    } else if (state && (btn == BTN_RIGHT)) {
+        if (text_window < 1000) {
+            text_window += 10;
+            redraw = true;
+        }
+    } else if (state && (btn == BTN_UP)) {
+        if (text_off > 10) {
+            text_off -= 10;
+            redraw = true;
+        }
+    } else if (state && (btn == BTN_DOWN)) {
+        if (text_off < (prev_len - 10)) {
+            text_off += 10;
+            redraw = true;
+        }
+    }
+}
+
+void picowota_poll(void) {
+    buttons_run();
+    cyw43_arch_poll();
+    wifi_run();
+    log_dump_to_lcd();
+}
+
 int picowota_network_init(void) {
-    debug("mem_load");
+    buttons_init();
+    buttons_callback(ota_buttons);
     mem_load();
-
-    debug("lcd_init");
     lcd_init();
-
     lcd_set_backlight(mem_data()->backlight);
     log_dump_to_lcd();
 
@@ -51,27 +123,26 @@ int picowota_network_init(void) {
 
     const char *prev = NULL;
     while (!wifi_ready()) {
-        cyw43_arch_poll();
-        wifi_run();
-
         const char *state = wifi_state();
         if (state != prev) {
             prev = state;
             debug("new state: %s", state);
         }
 
-        log_dump_to_lcd();
+        picowota_poll();
 
         // TODO open AP when timed out?
     }
 
     debug("wifi ready");
-    log_dump_to_lcd();
+    picowota_poll();
 
     return 0;
 }
 
 void picowota_network_deinit(void) {
     debug("wifi_deinit");
+    log_dump_to_lcd();
+
     wifi_deinit();
 }