settings ui improvements

CMakeLists.txt

@@ -99,6 +99,8 @@ target_sources(gadget PUBLIC
     src/venty.c
     src/state_venty.c
     src/state_wifi.c
+    src/state_wifi_edit.c
+    src/state_string.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ff.c
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ffunicode.c

include/state.h

@@ -32,6 +32,8 @@ enum system_state {
     STATE_VOLCANO_CONF,
     STATE_VENTY,
     STATE_WIFI_NETS,
+    STATE_WIFI_EDIT,
+    STATE_STRING,
 
     STATE_INVALID,
 };

include/state_string.h

@@ -0,0 +1,33 @@
+/*
+ * state_string.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_STRING_H__
+#define __STATE_STRING_H__
+
+#include <sys/types.h>
+#include "state.h"
+
+void state_string_set(char *value, size_t length,
+                      const char *name);
+void state_string_return(enum system_state state);
+
+void state_string_enter(void);
+void state_string_exit(void);
+void state_string_run(void);
+
+#endif // __STATE_STRING_H__

include/state_wifi_edit.h

@@ -0,0 +1,30 @@
+/*
+ * state_wifi_edit.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_EDIT_H__
+#define __STATE_WIFI_EDIT_H__
+
+#include <stdint.h>
+
+void state_wifi_edit_index(uint16_t index);
+
+void state_wifi_edit_enter(void);
+void state_wifi_edit_exit(void);
+void state_wifi_edit_run(void);
+
+#endif // __STATE_WIFI_EDIT_H__

src/mem.c

@@ -114,6 +114,25 @@ void mem_load(void) {
     } else {
         debug("invalid config (0x%02X != 0x%02X)", flash_ptr->version, MEM_VERSION);
     }
+
+    // add default WiFi from #define to flash config, if it is not there yet
+    bool found = false;
+    for (uint16_t i = 0; i < data_ram.data.net_count; i++) {
+        if (strcmp(data_ram.data.net[i].name, DEFAULT_WIFI_SSID) == 0) {
+            if (strcmp(data_ram.data.net[i].pass, DEFAULT_WIFI_PASS) != 0) {
+                debug("warning: restoring wifi password for '%s'", DEFAULT_WIFI_SSID);
+                strcpy(data_ram.data.net[i].pass, DEFAULT_WIFI_PASS);
+            }
+            found = true;
+            break;
+        }
+    }
+    if ((!found) && (data_ram.data.net_count < WIFI_MAX_NET_COUNT)) {
+        debug("info: adding wifi password for '%s'", DEFAULT_WIFI_SSID);
+        strcpy(data_ram.data.net[data_ram.data.net_count].name, DEFAULT_WIFI_SSID);
+        strcpy(data_ram.data.net[data_ram.data.net_count].pass, DEFAULT_WIFI_PASS);
+        data_ram.data.net_count++;
+    }
 }
 
 static void mem_write_flash(void *param) {

src/state.c

@@ -29,6 +29,8 @@
 #include "state_volcano_conf.h"
 #include "state_venty.h"
 #include "state_wifi.h"
+#include "state_wifi_edit.h"
+#include "state_string.h"
 #include "state.h"
 
 #define stringify(name) # name
@@ -102,6 +104,16 @@ static const struct state states[STATE_INVALID + 1] = {
         .exit = state_wifi_exit,
         .run = state_wifi_run,
     }, {
+        .name = stringify(STATE_WIFI_EDIT),
+        .enter = state_wifi_edit_enter,
+        .exit = state_wifi_edit_exit,
+        .run = state_wifi_edit_run,
+    }, {
+        .name = stringify(STATE_STRING),
+        .enter = state_string_enter,
+        .exit = state_string_exit,
+        .run = state_string_run,
+    }, {
         .name = stringify(STATE_INVALID),
         .enter = NULL,
         .exit = NULL,

src/state_edit_workflow.c

@@ -31,6 +31,10 @@
 
 static uint16_t wf_index = 0;
 
+static void exit_cb(void) {
+    state_switch(STATE_WORKFLOW);
+}
+
 static void enter_cb(int selection) {
     static char buff[20];
 
@@ -62,6 +66,8 @@ static void enter_cb(int selection) {
 
         state_value_return(STATE_EDIT_WORKFLOW);
         state_switch(STATE_VALUE);
+    } else {
+        exit_cb();
     }
 }
 
@@ -77,10 +83,6 @@ static void upper_cb(int selection) {
     }
 }
 
-static void exit_cb(void) {
-    state_switch(STATE_WORKFLOW);
-}
-
 void state_edit_wf_index(uint16_t index) {
     wf_index = index;
 }
@@ -114,6 +116,8 @@ static void draw(struct menu_state *menu) {
                         "% 2d: %s\n", i, wf_step_str(step));
     }
 
+    ADD_STATIC_ELEMENT("... go back");
+
     if (menu->selection < 0) {
         menu->selection = 0;
     }

src/state_settings.c

@@ -30,6 +30,10 @@
 #include "state_workflow.h"
 #include "state_settings.h"
 
+static void exit_cb(void) {
+    state_switch(STATE_SCAN);
+}
+
 static void enter_cb(int selection) {
     switch (selection) {
     case 0:
@@ -82,11 +86,11 @@ static void enter_cb(int selection) {
         // OTA Update
         picowota_reboot(true);
         break;
-    }
-}
 
-static void exit_cb(void) {
-    state_switch(STATE_SCAN);
+    default:
+        exit_cb();
+        break;
+    }
 }
 
 void state_settings_enter(void) {
@@ -121,6 +125,8 @@ static void draw(struct menu_state *menu) {
     ADD_STATIC_ELEMENT("Factory Reset");
     ADD_STATIC_ELEMENT("OTA Update");
 
+    ADD_STATIC_ELEMENT("... go back");
+
     if (menu->selection < 0) {
         menu->selection = 0;
     }

src/state_string.c

@@ -0,0 +1,84 @@
+/*
+ * state_string.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 "buttons.h"
+#include "lcd.h"
+#include "menu.h"
+#include "text.h"
+#include "textbox.h"
+#include "state_string.h"
+
+static char *str_p = NULL;
+static size_t str_len = 0;
+static const char *str_name = NULL;
+static enum system_state str_ret_state = STATE_SCAN;
+
+void state_string_set(char *value, size_t length,
+                      const char *name) {
+    str_p = value;
+    str_len = length;
+    str_name = name;
+}
+
+void state_string_return(enum system_state state) {
+    str_ret_state = state;
+}
+
+static void draw(void) {
+    static char buff[42];
+
+    if ((str_p == NULL) || (str_len <= 0) || (str_name == NULL)) {
+        snprintf(buff, sizeof(buff), "error");
+    } else {
+        snprintf(buff, sizeof(buff), "%s:\n\n%s", str_name, str_p);
+    }
+
+    text_box(buff, true,
+             "fixed_10x20",
+             0, LCD_WIDTH,
+             50, MENU_BOX_HEIGHT(MENU_MAX_LINES, 20, 2),
+             0);
+}
+
+static void string_buttons(enum buttons btn, bool state) {
+    if (state && (btn == BTN_Y)) {
+        state_switch(str_ret_state);
+    } else if (state && (btn == BTN_LEFT)) {
+        // TODO
+    } else if (state && (btn == BTN_RIGHT)) {
+        // TODO
+    } else if (state && (btn == BTN_UP)) {
+        // TODO
+    } else if (state && (btn == BTN_DOWN)) {
+        // TODO
+    }
+}
+
+void state_string_enter(void) {
+    buttons_callback(string_buttons);
+    draw();
+}
+
+void state_string_exit(void) {
+    buttons_callback(NULL);
+}
+
+void state_string_run(void) { }

src/state_value.c

@@ -58,23 +58,25 @@ void state_value_return(enum system_state state) {
 
 static void draw(void) {
     static char buff[100];
-    static size_t pos = 0;
 
     if ((val_p == NULL) || (val_len <= 0) || (val_name == NULL)) {
-        pos += snprintf(buff, sizeof(buff),
-                        "error");
+        snprintf(buff, sizeof(buff),
+                 "error");
     } else {
         if (val_mode == VAL_STEP_INCREMENT) {
-            pos += snprintf(buff, sizeof(buff),
-                            "%s:\n\n%d -> %d -> %d",
-                            val_name, val_min / val_step, val / val_step, val_max / val_step);
+            snprintf(buff, sizeof(buff),
+                     "%s:\n\n%d -> %d -> %d",
+                     val_name,
+                     val_min / val_step,
+                     val / val_step,
+                     val_max / val_step);
         } else {
-            pos += snprintf(buff, sizeof(buff),
-                            "%s:\n\n%d -> %d -> %d",
-                            val_name,
-                            __builtin_ffs(val_min),
-                            __builtin_ffs(val),
-                            __builtin_ffs(val_max));
+            snprintf(buff, sizeof(buff),
+                     "%s:\n\n%d -> %d -> %d",
+                     val_name,
+                     __builtin_ffs(val_min),
+                     __builtin_ffs(val),
+                     __builtin_ffs(val_max));
         }
     }
 

src/state_wifi.c

@@ -16,6 +16,8 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
+// TODO adding and removing whole networks
+
 #include <stdio.h>
 #include <string.h>
 
@@ -23,12 +25,19 @@
 #include "mem.h"
 #include "menu.h"
 #include "state.h"
+#include "state_wifi_edit.h"
 #include "state_wifi.h"
 
+static void exit_cb(void) {
+    state_switch(STATE_SETTINGS);
+}
+
 static void enter_cb(int selection) {
     if ((selection >= 0) && (selection < mem_data()->net_count)) {
-        //state_volcano_run_index(selection);
-        //state_switch(STATE_VOLCANO_RUN);
+        state_wifi_edit_index(selection);
+        state_switch(STATE_WIFI_EDIT);
+    } else {
+        exit_cb();
     }
 }
 
@@ -66,10 +75,6 @@ static void upper_cb(int 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);
 }
@@ -95,15 +100,13 @@ static void draw(struct menu_state *menu) {
         }
 
         pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
-                        "%s\n", mem_data()->net[i].name);
+                        "'%s'\n", mem_data()->net[i].name);
     }
 
-    if ((menu->selection < 0) && (menu->length > 0)) {
-        menu->selection = 0;
-    }
+    ADD_STATIC_ELEMENT("... go back");
 
-    if (menu->length == 0) {
-        strncpy(menu->buff, "NONE", MENU_MAX_LEN);
+    if (menu->selection < 0) {
+        menu->selection = 0;
     }
 }
 

src/state_wifi_edit.c

@@ -0,0 +1,87 @@
+/*
+ * state_wifi_edit.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 <stddef.h>
+#include <stdio.h>
+
+#include "config.h"
+#include "menu.h"
+#include "mem.h"
+#include "state.h"
+#include "state_string.h"
+#include "state_wifi_edit.h"
+
+static uint16_t wifi_index = 0;
+
+static void exit_cb(void) {
+    state_switch(STATE_SETTINGS);
+}
+
+static void enter_cb(int selection) {
+    switch (selection) {
+    case 0:
+        // SSID
+        state_string_set(mem_data()->net[wifi_index].name,
+                         WIFI_MAX_NAME_LEN, "SSID");
+        state_string_return(STATE_WIFI_EDIT);
+        state_switch(STATE_STRING);
+        break;
+
+    case 1:
+        // Password
+        state_string_set(mem_data()->net[wifi_index].pass,
+                         WIFI_MAX_NAME_LEN, "Password");
+        state_string_return(STATE_WIFI_EDIT);
+        state_switch(STATE_STRING);
+        break;
+
+    default:
+        exit_cb();
+        break;
+    }
+}
+
+void state_wifi_edit_index(uint16_t index) {
+    wifi_index = index;
+}
+
+void state_wifi_edit_enter(void) {
+    menu_init(enter_cb, NULL, NULL, exit_cb);
+}
+
+void state_wifi_edit_exit(void) {
+    menu_deinit();
+}
+
+static void draw(struct menu_state *menu) {
+    int pos = 0;
+    menu->length = 0;
+
+    ADD_STATIC_ELEMENT("SSID: '%s'", mem_data()->net[wifi_index].name);
+    ADD_STATIC_ELEMENT("Pass: '%s'", mem_data()->net[wifi_index].pass);
+
+    ADD_STATIC_ELEMENT("... go back");
+
+    if (menu->selection < 0) {
+        menu->selection = 0;
+    }
+}
+
+void state_wifi_edit_run(void) {
+    menu_run(draw, false);
+}

src/state_workflow.c

@@ -35,6 +35,14 @@
 static bool edit_mode = false;
 static uint32_t auto_connect_time = 0;
 
+static void exit_cb(void) {
+    if (edit_mode) {
+        state_switch(STATE_SETTINGS);
+    } else {
+        state_switch(STATE_SCAN);
+    }
+}
+
 static void enter_cb(int selection) {
     if ((selection >= 0) && (selection < wf_count())) {
         if (edit_mode) {
@@ -44,6 +52,8 @@ static void enter_cb(int selection) {
             state_volcano_run_index(selection);
             state_switch(STATE_VOLCANO_RUN);
         }
+    } else {
+        exit_cb();
     }
 }
 
@@ -67,14 +77,6 @@ static void upper_cb(int selection) {
     }
 }
 
-static void exit_cb(void) {
-    if (edit_mode) {
-        state_switch(STATE_SETTINGS);
-    } else {
-        state_switch(STATE_SCAN);
-    }
-}
-
 void state_wf_edit(bool edit) {
     edit_mode = edit;
 }
@@ -123,12 +125,10 @@ static void draw(struct menu_state *menu) {
                         "'%s' by %s\n", wf_name(i), wf_author(i));
     }
 
-    if ((menu->selection < 0) && (menu->length > 0)) {
-        menu->selection = 0;
-    }
+    ADD_STATIC_ELEMENT("... go back");
 
-    if (menu->length == 0) {
-        strncpy(menu->buff, "NONE", MENU_MAX_LEN);
+    if (menu->selection < 0) {
+        menu->selection = 0;
     }
 }