device selection menu

include/buttons.h

@@ -20,7 +20,7 @@
 #define __BUTTONS_H__
 
 enum buttons {
-    BTN_A,
+    BTN_A = 0,
     BTN_B,
     BTN_X,
     BTN_Y,
@@ -33,6 +33,7 @@ enum buttons {
 };
 
 void buttons_init(void);
+void buttons_callback(void (*fp)(enum buttons, bool));
 void buttons_run(void);
 
 #endif // __BUTTONS_H__

include/config.h

@@ -19,6 +19,9 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#define MENU_PREFER_VOLCANO
+//#define MENU_PREFER_CRAFTY
+
 #define WATCHDOG_PERIOD_MS 1000
 
 // ASCII 0x18 = CAN (cancel)

include/image.h

@@ -21,7 +21,7 @@
 
 #include "pico/stdlib.h"
 
-void image_draw(char *data, uint width, uint height);
+void image_draw(const char *data, uint width, uint height);
 
 void draw_splash(void);
 void draw_battery_indicator(void);

include/logo.h

@@ -1,7 +1,7 @@
 /*  GIMP header image file format (RGB)  */
 
-static unsigned int logo_width = 240;
-static unsigned int logo_height = 240;
+static const unsigned int logo_width = 240;
+static const unsigned int logo_height = 240;
 
 /*  Call this macro repeatedly.  After each use, the pixel data can be extracted  */
 
@@ -11,7 +11,7 @@ pixel[1] = ((((data[1] - 33) & 0xF) << 4) | ((data[2] - 33) >> 2)); \
 pixel[2] = ((((data[2] - 33) & 0x3) << 6) | ((data[3] - 33))); \
 data += 4; \
 }
-static char *logo_rgb_data =
+static const char *logo_rgb_data =
 	"````````````````````````````````````````````````````````````````"
 	"````````````````````````````````````````````````````````````````"
 	"````````````````````````````````````````````````````````````````"

src/buttons.c

@@ -39,6 +39,7 @@ struct button_state {
 };
 
 static struct button_state buttons[NUM_BTNS];
+static void (*callback)(enum buttons, bool) = NULL;
 
 void buttons_init(void) {
     for (uint i = 0; i < NUM_BTNS; i++) {
@@ -52,6 +53,10 @@ void buttons_init(void) {
     }
 }
 
+void buttons_callback(void (*fp)(enum buttons, bool)) {
+    callback = fp;
+}
+
 void buttons_run(void) {
     for (uint i = 0; i < NUM_BTNS; i++) {
         bool state = !gpio_get(gpio_num[i]);
@@ -64,6 +69,9 @@ void buttons_run(void) {
         if ((now - buttons[i].last_time) > DEBOUNCE_DELAY_MS) {
             if (state != buttons[i].current_state) {
                 buttons[i].current_state = state;
+                if (callback) {
+                    callback(i, state);
+                }
             }
         }
 

src/image.c

@@ -33,7 +33,7 @@
 
 #define BATT_INTERVAL_MS 777
 
-void image_draw(char *data, uint width, uint height) {
+void image_draw(const char *data, uint width, uint height) {
     for (uint x = 0; x < width; x++) {
         for (uint y = 0; y < height; y++) {
             uint32_t pixel[3];
@@ -145,7 +145,7 @@ void draw_battery_indicator(void) {
 void battery_run(void) {
     static uint32_t last_run = 0;
     uint32_t now = to_ms_since_boot(get_absolute_time());
-    if (now >= (last_run + BATT_INTERVAL_MS)) {
+    if ((now >= (last_run + BATT_INTERVAL_MS)) || (last_run == 0)) {
         last_run = now;
         draw_battery_indicator();
     }

src/main.c

@@ -52,7 +52,7 @@ int main(void) {
     debug("lcd_init");
     lcd_init();
     draw_splash();
-    lcd_set_backlight(0x1000);
+    lcd_set_backlight(0x8000);
 
     if (watchdog_caused_reboot()) {
         debug("reset by watchdog");
@@ -86,9 +86,11 @@ int main(void) {
     watchdog_enable(WATCHDOG_PERIOD_MS, 1);
 
     debug("init done");
-    lcd_set_backlight(0x8000);
+    battery_run();
+    lcd_set_backlight(0x8000); // TODO dynamic
 
     // wait for BLE stack to be ready before using it
+    debug("wait for bt stack");
     while (!ble_is_ready()) {
         sleep_ms(1);
     }

src/state.c

@@ -54,14 +54,6 @@ void state_switch(enum system_state next) {
 }
 
 void state_run(void) {
-    // TODO only for testing
-    static uint32_t last_heartbeat = 0;
-    uint32_t now = to_ms_since_boot(get_absolute_time());
-    if (now < (last_heartbeat + 1000)) {
-        return;
-    }
-    last_heartbeat = now;
-
     switch (state) {
     case STATE_INIT:
         break;

src/state_scan.c

@@ -27,11 +27,92 @@
 #include "models.h"
 #include "state.h"
 
+static const int max_lines = 5;
+
+static int menu_off = 0;
+static int menu_selection = -1;
+static int menu_length = 0;
+
+static void text_box(const char *s) {
+    static struct text_font font = {
+        .fontname = "fixed_10x20",
+        .font = NULL,
+    };
+    if (font.font == NULL) {
+        text_prepare_font(&font);
+    }
+
+    struct text_conf text = {
+        .text = "",
+        .x = 0,
+        .y = 50,
+        .justify = false,
+        .alignment = MF_ALIGN_CENTER,
+        .width = 240,
+        .height = 240 - 80,
+        .margin = 2,
+        .fg = RGB_565(0xFF, 0xFF, 0xFF),
+        .bg = RGB_565(0x00, 0x00, 0x00),
+        .font = &font,
+    };
+
+    // TODO clear background?!
+
+    text.text = s;
+    text_draw(&text);
+}
+
+static void state_scan_buttons(enum buttons btn, bool state) {
+    if (state && (btn == BTN_LEFT)) {
+        // TODO brightness down
+        return;
+    } else if (state && (btn == BTN_RIGHT)) {
+        // TODO brightness up
+        return;
+    } else if (state && ((btn == BTN_ENTER) || (btn == BTN_A))) {
+        // TODO menu_selection
+        return;
+    } else if ((!state) || ((btn != BTN_UP) && (btn != BTN_DOWN))) {
+        return;
+    }
+
+    if (state && (btn == BTN_UP)) {
+        if (menu_selection < 0) {
+            menu_selection = menu_length - 1;
+        } else {
+            menu_selection -= 1;
+        }
+    } else if (state && (btn == BTN_DOWN)) {
+        if (menu_selection < 0) {
+            menu_selection = 0;
+        } else {
+            menu_selection += 1;
+        }
+    }
+
+    if (menu_selection < 0) {
+        menu_selection += menu_length;
+    }
+    if (menu_selection >= menu_length) {
+        menu_selection -= menu_length;
+    }
+    if (menu_selection >= 0) {
+        while (menu_selection < menu_off) {
+            menu_off -= 1;
+        }
+        while (menu_selection >= (menu_off + max_lines)) {
+            menu_off += 1;
+        }
+    }
+}
+
 void state_scan_enter(void) {
+    buttons_callback(state_scan_buttons);
     ble_scan(BLE_SCAN_ON);
 }
 
 void state_scan_exit(void) {
+    buttons_callback(NULL);
     ble_scan(BLE_SCAN_OFF);
 }
 
@@ -42,13 +123,41 @@ void state_scan_run(void) {
     struct ble_scan_result results[BLE_MAX_SCAN_RESULTS] = {0};
     int n = ble_get_scan_results(results, BLE_MAX_SCAN_RESULTS);
 
-    uint pos = 0;
+    int pos = 0, devs = 0;
     for (int i = 0; i < n; i++) {
         enum known_devices dev = models_filter_name(results[i].name);
         if (dev == DEV_UNKNOWN) {
             continue;
         }
 
+        devs++;
+
+        if (((devs - 1) < menu_off)
+            || ((devs - 1 - menu_off) >= max_lines)) {
+            continue;
+        }
+
+#if defined(MENU_PREFER_VOLCANO) || defined(MENU_PREFER_CRAFTY)
+        if (menu_selection < 0) {
+#ifdef MENU_PREFER_VOLCANO
+            if (dev == DEV_VOLCANO) {
+                menu_selection = devs - 1;
+            }
+#endif // MENU_PREFER_VOLCANO
+#ifdef MENU_PREFER_CRAFTY
+            if (dev == DEV_CRAFTY) {
+                menu_selection = devs - 1;
+            }
+#endif // MENU_PREFER_CRAFTY
+        }
+#endif // defined(MENU_PREFER_VOLCANO) || defined(MENU_PREFER_CRAFTY)
+
+        if ((devs - 1) == menu_selection) {
+            pos += snprintf(buff + pos, sizeof(buff) - pos, "> ");
+        } else {
+            pos += snprintf(buff + pos, sizeof(buff) - pos, "  ");
+        }
+
         if (dev == DEV_VOLCANO) {
             pos += snprintf(buff + pos, sizeof(buff) - pos, "Volcano ");
         } else if (dev == DEV_CRAFTY) {
@@ -56,42 +165,27 @@ void state_scan_run(void) {
         }
 
         char info[32] = "";
-        models_get_serial(results[i].data, results[i].data_len,
-                          info, sizeof(info));
+        if (models_get_serial(results[i].data, results[i].data_len,
+                              info, sizeof(info)) < 0) {
+            strcpy(info, "-error-");
+        }
         pos += snprintf(buff + pos, sizeof(buff) - pos, "%s\n", info);
     }
 
-    if (pos == 0) {
-        strncpy(buff, "NONE", sizeof(buff));
-    }
+    menu_length = devs;
 
-    if (strncmp(buff, prev_buff, sizeof(buff)) == 0) {
-        return;
+#if !defined(MENU_PREFER_VOLCANO) && !defined(MENU_PREFER_CRAFTY)
+    if ((menu_selection < 0) && (menu_length > 0)) {
+        menu_selection = 0;
     }
-    strncpy(prev_buff, buff, sizeof(prev_buff));
+#endif // !defined(MENU_PREFER_VOLCANO) && !defined(MENU_PREFER_CRAFTY)
 
-    static struct text_font font = {
-        .fontname = "fixed_10x20",
-        .font = NULL,
-    };
-    if (font.font == NULL) {
-        text_prepare_font(&font);
+    if (menu_length == 0) {
+        strncpy(buff, "NONE", sizeof(buff));
     }
 
-    struct text_conf text = {
-        .text = "",
-        .x = 0,
-        .y = 50,
-        .justify = false,
-        .alignment = MF_ALIGN_CENTER,
-        .width = 240,
-        .height = 240 - 80,
-        .margin = 2,
-        .fg = RGB_565(0xFF, 0xFF, 0xFF),
-        .bg = RGB_565(0x00, 0x00, 0x00),
-        .font = &font,
-    };
-
-    text.text = buff;
-    text_draw(&text);
+    if (strncmp(buff, prev_buff, sizeof(buff)) != 0) {
+        strncpy(prev_buff, buff, sizeof(prev_buff));
+        text_box(buff);
+    }
 }