only show relevant devices in scan state

CMakeLists.txt

@@ -64,6 +64,7 @@ target_sources(gadget PUBLIC
     src/serial.c
     src/ring.c
     src/models.c
+    src/state_scan.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ff.c
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ffunicode.c

include/state_scan.h

@@ -0,0 +1,26 @@
+/*
+ * state_scan.h
+ *
+ * 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/>.
+ */
+
+#ifndef __STATE_SCAN_H__
+#define __STATE_SCAN_H__
+
+void state_scan_enter(void);
+void state_scan_exit(void);
+void state_scan_run(void);
+
+#endif // __STATE_SCAN_H__

src/models.c

@@ -30,7 +30,7 @@ enum known_devices models_filter_name(const char *name) {
     } else if (strcmp(name, "S&B VOLCANO H") == 0) {
         return DEV_VOLCANO;
     } else if (strcmp(name, "STORZ&BICKEL") == 0) {
-        return DEV_VOLCANO;
+        return DEV_CRAFTY;
     } else {
         return DEV_UNKNOWN;
     }

src/state.c

@@ -1,7 +1,7 @@
 /*
  * state.c
  *
- * Copyright (c) 2022 - 2023 Thomas Buck (thomas@xythobuz.de)
+ * 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
@@ -16,14 +16,9 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-
 #include "config.h"
 #include "log.h"
-#include "buttons.h"
-#include "ble.h"
-#include "lcd.h"
-#include "text.h"
+#include "state_scan.h"
 #include "state.h"
 
 static enum system_state state = STATE_INIT;
@@ -37,7 +32,7 @@ void state_switch(enum system_state next) {
     switch (state) {
     case STATE_SCAN:
         debug("leaving STATE_SCAN");
-        ble_scan(BLE_SCAN_OFF);
+        state_scan_exit();
         break;
 
     default:
@@ -48,7 +43,7 @@ void state_switch(enum system_state next) {
     switch (next) {
     case STATE_SCAN:
         debug("entering STATE_SCAN");
-        ble_scan(BLE_SCAN_ON);
+        state_scan_enter();
         break;
 
     default:
@@ -67,49 +62,12 @@ void state_run(void) {
     }
     last_heartbeat = now;
 
-    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,
-    };
-
     switch (state) {
     case STATE_INIT:
         break;
 
     case STATE_SCAN: {
-        struct ble_scan_result results[BLE_MAX_SCAN_RESULTS] = {0};
-        int n = ble_get_scan_results(results, BLE_MAX_SCAN_RESULTS);
-        if (n <= 0) {
-            text.text = "N\nO\nN\nE";
-            text_draw(&text);
-        } else {
-            char buff[1024] = {0};
-            uint pos = 0;
-
-            for (int i = 0; i < n; i++) {
-                pos += snprintf(buff + pos, sizeof(buff) - pos, "%s\n", results[i].name);
-            }
-
-            text.text = buff;
-            text_draw(&text);
-        }
+        state_scan_run();
         break;
     }
 

src/state_scan.c

@@ -0,0 +1,97 @@
+/*
+ * state_scan.c
+ *
+ * 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/>.
+ */
+
+#include <stdio.h>
+
+#include "config.h"
+#include "log.h"
+#include "buttons.h"
+#include "ble.h"
+#include "lcd.h"
+#include "text.h"
+#include "models.h"
+#include "state.h"
+
+void state_scan_enter(void) {
+    ble_scan(BLE_SCAN_ON);
+}
+
+void state_scan_exit(void) {
+    ble_scan(BLE_SCAN_OFF);
+}
+
+void state_scan_run(void) {
+    static char prev_buff[512] = {0};
+    char buff[512] = {0};
+
+    struct ble_scan_result results[BLE_MAX_SCAN_RESULTS] = {0};
+    int n = ble_get_scan_results(results, BLE_MAX_SCAN_RESULTS);
+
+    uint pos = 0;
+    for (int i = 0; i < n; i++) {
+        enum known_devices dev = models_filter_name(results[i].name);
+        if (dev == DEV_UNKNOWN) {
+            continue;
+        }
+
+        if (dev == DEV_VOLCANO) {
+            pos += snprintf(buff + pos, sizeof(buff) - pos, "Volcano ");
+        } else if (dev == DEV_CRAFTY) {
+            pos += snprintf(buff + pos, sizeof(buff) - pos, "Crafty+ ");
+        }
+
+        char info[32] = "";
+        models_get_serial(results[i].data, results[i].data_len,
+                          info, sizeof(info));
+        pos += snprintf(buff + pos, sizeof(buff) - pos, "%s\n", info);
+    }
+
+    if (pos == 0) {
+        strncpy(buff, "NONE", sizeof(buff));
+    }
+
+    if (strncmp(buff, prev_buff, sizeof(buff)) == 0) {
+        return;
+    }
+    strncpy(prev_buff, buff, sizeof(prev_buff));
+
+    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,
+    };
+
+    text.text = buff;
+    text_draw(&text);
+}