add state for wifi settings

CMakeLists.txt

@@ -98,6 +98,7 @@ target_sources(gadget PUBLIC
     src/wifi.c
     src/venty.c
     src/state_venty.c
+    src/state_wifi.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ff.c
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ffunicode.c

include/state.h

@@ -31,6 +31,7 @@ enum system_state {
     STATE_VALUE,
     STATE_VOLCANO_CONF,
     STATE_VENTY,
+    STATE_WIFI_NETS,
 
     STATE_INVALID,
 };

include/state_wifi.h

@@ -0,0 +1,26 @@
+/*
+ * state_wifi.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_WIFI_H__
+#define __STATE_WIFI_H__
+
+void state_wifi_enter(void);
+void state_wifi_exit(void);
+void state_wifi_run(void);
+
+#endif // __STATE_WIFI_H__

src/state.c

@@ -28,6 +28,7 @@
 #include "state_value.h"
 #include "state_volcano_conf.h"
 #include "state_venty.h"
+#include "state_wifi.h"
 #include "state.h"
 
 #define stringify(name) # name
@@ -96,6 +97,11 @@ static const struct state states[STATE_INVALID + 1] = {
         .exit = state_venty_exit,
         .run = state_venty_run,
     }, {
+        .name = stringify(STATE_WIFI_NETS),
+        .enter = state_wifi_enter,
+        .exit = state_wifi_exit,
+        .run = state_wifi_run,
+    }, {
         .name = stringify(STATE_INVALID),
         .enter = NULL,
         .exit = NULL,

src/state_settings.c

@@ -69,11 +69,16 @@ static void enter_cb(int selection) {
         break;
 
     case 4:
+        // WiFi Networks
+        state_switch(STATE_WIFI_NETS);
+        break;
+
+    case 5:
         // Factory Reset
         mem_load_defaults();
         break;
 
-    case 5:
+    case 6:
         // OTA Update
         picowota_reboot(true);
         break;
@@ -112,6 +117,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("Enable WiFi (%d)", mem_data()->enable_wifi);
+    ADD_STATIC_ELEMENT("WiFi Networks");
     ADD_STATIC_ELEMENT("Factory Reset");
     ADD_STATIC_ELEMENT("OTA Update");
 

src/state_wifi.c

@@ -0,0 +1,112 @@
+/*
+ * state_wifi.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 <string.h>
+
+#include "config.h"
+#include "mem.h"
+#include "menu.h"
+#include "state.h"
+#include "state_wifi.h"
+
+static void enter_cb(int selection) {
+    if ((selection >= 0) && (selection < mem_data()->net_count)) {
+        //state_volcano_run_index(selection);
+        //state_switch(STATE_VOLCANO_RUN);
+    }
+}
+
+static void wifi_move_down(uint16_t index) {
+    if ((index < 1) || (index >= mem_data()->net_count)) {
+        return;
+    }
+
+    struct net_credentials tmp = mem_data()->net[index - 1];
+    mem_data()->net[index - 1] = mem_data()->net[index];
+    mem_data()->net[index] = tmp;
+}
+
+static void wifi_move_up(uint16_t index) {
+    if (index >= (mem_data()->net_count - 1)) {
+        return;
+    }
+
+    struct net_credentials tmp = mem_data()->net[index + 1];
+    mem_data()->net[index + 1] = mem_data()->net[index];
+    mem_data()->net[index] = tmp;
+}
+
+static void lower_cb(int selection) {
+    if ((selection > 0) && (selection < mem_data()->net_count)) {
+        wifi_move_down(selection);
+        selection--;
+    }
+}
+
+static void upper_cb(int selection) {
+    if ((selection >= 0) && (selection < (mem_data()->net_count - 1))) {
+        wifi_move_up(selection);
+        selection++;
+    }
+}
+
+static void exit_cb(void) {
+    state_switch(STATE_SETTINGS);
+}
+
+void state_wifi_enter(void) {
+    menu_init(enter_cb, lower_cb, upper_cb, exit_cb);
+}
+
+void state_wifi_exit(void) {
+    menu_deinit();
+}
+
+static void draw(struct menu_state *menu) {
+    menu->length = mem_data()->net_count;
+
+    int pos = 0;
+    for (uint16_t i = 0; i < menu->length; i++) {
+        if ((i < menu->off)
+            || ((i - menu->off) >= MENU_MAX_LINES)) {
+            continue;
+        }
+
+        if (i == menu->selection) {
+            pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, "> ");
+        } else {
+            pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, "  ");
+        }
+
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                        "%s\n", mem_data()->net[i].name);
+    }
+
+    if ((menu->selection < 0) && (menu->length > 0)) {
+        menu->selection = 0;
+    }
+
+    if (menu->length == 0) {
+        strncpy(menu->buff, "NONE", MENU_MAX_LEN);
+    }
+}
+
+void state_wifi_run(void) {
+    menu_run(draw, false);
+}