add basics of settings menu, about screen.

CMakeLists.txt

@@ -90,6 +90,8 @@ target_sources(gadget PUBLIC
     src/mem.c
     src/state_edit_workflow.c
     src/workflow_default.c
+    src/state_settings.c
+    src/state_about.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ff.c
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ffunicode.c

include/config.h

@@ -19,6 +19,9 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#define APP_VERSION_MAJOR 0
+#define APP_VERSION_MINOR 1
+
 #define MENU_PREFER_VOLCANO
 //#define MENU_PREFER_CRAFTY
 

include/mem.h

@@ -20,20 +20,25 @@
 #define __MEM_H__
 
 #include <stdint.h>
+#include <stdbool.h>
+
 #include "workflow.h"
 
-#define MEM_VERSION 0x02
+// to migrate settings when struct changes between releases
+#define MEM_VERSION 0
 
 struct mem_data {
     uint16_t backlight;
+    bool wf_auto_connect;
 
     uint16_t wf_count;
     struct workflow wf[WF_MAX_FLOWS];
-} __attribute__((packed));
+};
 
 // wf and wf_count are assigned in mem_init()
 #define MEM_DATA_INIT {           \
     .backlight = (0xFF00 >> 1),   \
+    .wf_auto_connect = false,     \
 }
 
 void mem_init(void);

include/menu.h

@@ -43,4 +43,17 @@ void menu_run(void (*cb)(struct menu_state *), bool centered);
 extern bool menu_got_input;
 #endif // VOLCANO_AUTO_CONNECT_TIMEOUT_MS
 
+#define ADD_STATIC_ELEMENT(name) {\
+    menu->length += 1; \
+    if (((menu->length - 1) >= menu->off) \
+        && ((menu->length - 1 - menu->off) < MENU_MAX_LINES)) { \
+        if ((menu->length - 1) == 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, name "\n"); \
+    } \
+}
+
 #endif // __MENU_H__

include/state.h

@@ -26,6 +26,8 @@ enum system_state {
     STATE_VOLCANO_RUN,
     STATE_CRAFTY,
     STATE_EDIT_WORKFLOW,
+    STATE_SETTINGS,
+    STATE_ABOUT,
 
     STATE_INVALID,
 };

include/state_about.h

@@ -0,0 +1,26 @@
+/*
+ * state_about.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_ABOUT_H__
+#define __STATE_ABOUT_H__
+
+void state_about_enter(void);
+void state_about_exit(void);
+void state_about_run(void);
+
+#endif // __STATE_ABOUT_H__

include/state_settings.h

@@ -0,0 +1,26 @@
+/*
+ * state_settings.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_SETTINGS_H__
+#define __STATE_SETTINGS_H__
+
+void state_settings_enter(void);
+void state_settings_exit(void);
+void state_settings_run(void);
+
+#endif // __STATE_SETTINGS_H__

src/mem.c

@@ -40,7 +40,7 @@ struct mem_contents {
     uint32_t checksum;
 
     struct mem_data data;
-} __attribute__((packed));
+};
 
 #define MEM_CONTENTS_INIT { \
     .version = MEM_VERSION, \

src/state.c

@@ -23,6 +23,8 @@
 #include "state_volcano_run.h"
 #include "state_crafty.h"
 #include "state_edit_workflow.h"
+#include "state_settings.h"
+#include "state_about.h"
 #include "state.h"
 
 #define stringify(name) # name
@@ -66,6 +68,16 @@ static const struct state states[STATE_INVALID + 1] = {
         .exit = state_edit_wf_exit,
         .run = state_edit_wf_run,
     }, {
+        .name = stringify(STATE_SETTINGS),
+        .enter = state_settings_enter,
+        .exit = state_settings_exit,
+        .run = state_settings_run,
+    }, {
+        .name = stringify(STATE_ABOUT),
+        .enter = state_about_enter,
+        .exit = state_about_exit,
+        .run = state_about_run,
+    }, {
         .name = stringify(STATE_INVALID),
         .enter = NULL,
         .exit = NULL,

src/state_about.c

@@ -0,0 +1,121 @@
+/*
+ * state_about.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 "buttons.h"
+#include "log.h"
+#include "lcd.h"
+#include "text.h"
+#include "menu.h"
+#include "state.h"
+#include "state_about.h"
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+static const char *about_text =
+    "Volcano RC Gadget\n"
+    "by xythobuz\n"
+    "Licensed as GPLv3\n"
+    "\n"
+
+    "V" xstr(APP_VERSION_MAJOR) "." xstr(APP_VERSION_MINOR) "\n"
+#ifdef NDEBUG
+    "Release Build\n"
+#else // NDEBUG
+    "Debug Build\n"
+#endif // NDEBUG
+    __DATE__ " " __TIME__ "\n"
+    "\n"
+
+    "Included libs:\n"
+    "hathach/tinyusb\n"
+    "abbrev/fatfs\n"
+    "bluekitchen/btstack\n"
+    "mcufont/mcufont\n"
+    "hepingood/st7789\n"
+    "\n"
+
+    "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.\n"
+    "\n"
+    "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.\n"
+    "\n"
+    "See <http://www.gnu.org/licenses/>.\n"
+;
+
+static const uint16_t step_size = 10;
+static const uint16_t max_height = (MENU_MAX_LINES * 20) + ((MENU_MAX_LINES - 1) * 2);
+
+static uint16_t off = 0;
+static bool held_up = false;
+static bool held_down = false;
+static int16_t last_draw_off = 0;
+
+static void draw(void) {
+    int16_t r;
+    r = text_box(about_text, false,
+                 "DejaVuSerif16",
+                 0, LCD_WIDTH,
+                 50, max_height,
+                 -off);
+    last_draw_off = r;
+}
+
+static void about_buttons(enum buttons btn, bool state) {
+    if (state && (btn == BTN_Y)) {
+        state_switch(STATE_SCAN);
+    } else if (btn == BTN_UP) {
+        held_up = state;
+    } else if (btn == BTN_DOWN) {
+        held_down = state;
+    }
+}
+
+void state_about_enter(void) {
+    buttons_callback(about_buttons);
+    off = 0;
+    draw();
+}
+
+void state_about_exit(void) {
+    buttons_callback(NULL);
+}
+
+void state_about_run(void) {
+    if (held_up) {
+        if (off >= step_size) {
+            off -= step_size;
+            draw();
+        }
+    }
+    if (held_down) {
+        if (last_draw_off >= max_height) {
+            off += step_size;
+            draw();
+        }
+    }
+}

src/state_scan.c

@@ -59,6 +59,12 @@ static void enter_cb(int selection) {
             return;
         }
     }
+
+    if (selection == devs) {
+        state_switch(STATE_SETTINGS);
+    } else if (selection == (devs + 1)) {
+        state_switch(STATE_ABOUT);
+    }
 }
 
 static void edit_cb(int selection) {
@@ -161,9 +167,8 @@ static void draw(struct menu_state *menu) {
     }
 #endif // !defined(MENU_PREFER_VOLCANO) && !defined(MENU_PREFER_CRAFTY)
 
-    if (menu->length == 0) {
-        strncpy(menu->buff, "NONE", MENU_MAX_LEN);
-    }
+    ADD_STATIC_ELEMENT("Settings");
+    ADD_STATIC_ELEMENT("About");
 }
 
 void state_scan_run(void) {

src/state_settings.c

@@ -0,0 +1,63 @@
+/*
+ * state_settings.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 "log.h"
+#include "menu.h"
+#include "state.h"
+#include "state_settings.h"
+
+static void enter_cb(int selection) {
+    switch (selection) {
+    case 0:
+        // Auto Connect
+
+    }
+}
+
+static void exit_cb(void) {
+    state_switch(STATE_SCAN);
+}
+
+void state_settings_enter(void) {
+    menu_init(enter_cb, NULL, NULL, exit_cb);
+}
+
+void state_settings_exit(void) {
+    menu_deinit();
+}
+
+static void draw(struct menu_state *menu) {
+    int pos = 0;
+    menu->length = 0;
+
+    ADD_STATIC_ELEMENT("Auto Connect");
+    ADD_STATIC_ELEMENT("Brightness");
+    ADD_STATIC_ELEMENT("Workflows");
+
+    if (menu->selection < 0) {
+        menu->selection = 0;
+    }
+}
+
+void state_settings_run(void) {
+    menu_run(draw, false);
+}