only auto connect when device is visible within 10s of boot

include/config.h

@@ -31,6 +31,7 @@
 
 #ifdef MENU_PREFER_VOLCANO
 #define VOLCANO_AUTO_CONNECT_TIMEOUT_MS 2000
+#define VOLCANO_AUTO_CONNECT_WITHIN_MS 10000
 #endif // MENU_PREFER_VOLCANO
 
 #endif // NDEBUG

include/lcd.h

@@ -21,6 +21,9 @@
 
 #include <stdint.h>
 
+#define LCD_WIDTH 240
+#define LCD_HEIGHT 240
+
 #define RGB_565(r, g, b) ( \
       (((r) >> 3) << 11)   \
     | (((g) >> 2) << 5)    \

src/buttons.c

@@ -69,8 +69,9 @@ void buttons_run(void) {
 
         if ((now - buttons[i].last_time) > DEBOUNCE_DELAY_MS) {
             if (state != buttons[i].current_state) {
+                //debug("btn %d now %s", i, state ? "pressed" : "released");
+
                 buttons[i].current_state = state;
-                debug("btn %d now %s", i, state ? "pressed" : "released");
                 if (callback) {
                     callback(i, state);
                 }

src/console.c

@@ -171,6 +171,14 @@ static void cnsl_interpret(const char *line) {
                         bd_addr_to_str(results[i].addr),
                         results[i].type, results[i].rssi,
                         age / 1000.0, results[i].name, info);
+
+                if (results[i].data_len > 0) {
+                    hexdump(results[i].data, results[i].data_len);
+                }
+
+                if (i < (n - 1)) {
+                    println();
+                }
             }
         }
     } else if (str_startswith(line, "con ")) {

src/lcd.c

@@ -34,8 +34,8 @@
 #define LCD_PIN_RST 12
 #define LCD_PIN_BL 13
 
-#define ST7789_PICO_COLUMN                             240
-#define ST7789_PICO_ROW                                ST7789_PICO_COLUMN
+#define ST7789_PICO_COLUMN                             LCD_HEIGHT
+#define ST7789_PICO_ROW                                LCD_WIDTH
 
 #define ST7789_PICO_ACCESS                            (ST7789_ORDER_PAGE_TOP_TO_BOTTOM | \
                                                        ST7789_ORDER_COLUMN_LEFT_TO_RIGHT | \

src/mem.c

@@ -79,10 +79,8 @@ static uint32_t calc_checksum(const struct mem_contents *data) {
 
 void mem_load_defaults(void) {
     data_ram.data.wf_count = wf_default_count;
-    debug("preparing %d default workflows", data_ram.data.wf_count);
     for (uint16_t i = 0; i < wf_default_count; i++) {
         data_ram.data.wf[i] = wf_default_data[i];
-        debug("\"%s\" by \"%s\"", data_ram.data.wf[i].name, data_ram.data.wf[i].author);
     }
 }
 
@@ -108,11 +106,6 @@ void mem_init(void) {
     } else {
         debug("invalid config (0x%02X != 0x%02X)", flash_ptr->version, MEM_VERSION);
     }
-
-    debug("found %d workflows", data_ram.data.wf_count);
-    for (uint16_t i = 0; i < data_ram.data.wf_count; i++) {
-        debug("\"%s\" by \"%s\"", data_ram.data.wf[i].name, data_ram.data.wf[i].author);
-    }
 }
 
 static void mem_write_flash(void *param) {

src/state_scan.c

@@ -100,9 +100,16 @@ static void draw(struct menu_state *menu) {
 #ifdef MENU_PREFER_VOLCANO
             if (dev == DEV_VOLCANO) {
                 menu->selection = devs - 1;
+
 #ifdef VOLCANO_AUTO_CONNECT_TIMEOUT_MS
-                auto_connect_time = to_ms_since_boot(get_absolute_time());
-                auto_connect_idx = i;
+#ifdef VOLCANO_AUTO_CONNECT_WITHIN_MS
+                if (to_ms_since_boot(get_absolute_time()) <= VOLCANO_AUTO_CONNECT_WITHIN_MS) {
+#endif // VOLCANO_AUTO_CONNECT_WITHIN_MS
+                    auto_connect_time = to_ms_since_boot(get_absolute_time());
+                    auto_connect_idx = i;
+#ifdef VOLCANO_AUTO_CONNECT_WITHIN_MS
+                }
+#endif // VOLCANO_AUTO_CONNECT_WITHIN_MS
 #endif // VOLCANO_AUTO_CONNECT_TIMEOUT_MS
             }
 #endif // MENU_PREFER_VOLCANO

src/text.c

@@ -166,16 +166,16 @@ void text_box(const char *s, bool centered) {
         text_prepare_font(&font);
     }
 
-    int x = 0;
-    int width = 240;
+    int x_off = 0;
+    int width = LCD_WIDTH;
 
-    int y = 50;
-    int height = MENU_MAX_LINES * (20 + 2);
+    int y_off = 50;
+    int height = (MENU_MAX_LINES * 20) + ((MENU_MAX_LINES - 1) * 2);
 
     struct text_conf text = {
         .text = "",
-        .x = x,
-        .y = y,
+        .x = x_off,
+        .y = y_off,
         .justify = false,
         .alignment = centered ? MF_ALIGN_CENTER : MF_ALIGN_LEFT,
         .width = width,
@@ -186,10 +186,9 @@ void text_box(const char *s, bool centered) {
         .font = &font,
     };
 
-    lcd_write_rect(x,
-                   y,
-                   x + width - 1,
-                   y + height - 1,
+    lcd_write_rect(x_off, y_off,
+                   x_off + width - 1,
+                   y_off + height - 1,
                    RGB_565(0x00, 0x00, 0x00));
 
     text.text = s;