add basic visual indicator

CMakeLists.txt

@@ -93,6 +93,7 @@ target_sources(gadget PUBLIC
     src/state_settings.c
     src/state_about.c
     src/state_value.c
+    src/textbox.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ff.c
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ffunicode.c

include/lcd.h

@@ -29,10 +29,15 @@
     | (((g) >> 2) << 5)    \
     |  ((b) >> 3)          \
 )
+
 #define RGB_565_REV(c)            \
     ((c & 0xF800) >> 8) / 255.0f, \
     ((c & 0x07E0) >> 3) / 255.0f, \
     ((c & 0x001F) << 3) / 255.0f
+
+#define LCD_BLACK RGB_565(0x00, 0x00, 0x00)
+#define LCD_WHITE RGB_565(0xFF, 0xFF, 0xFF)
+
 uint32_t from_hsv(float h, float s, float v);
 
 void lcd_init(void);

include/menu.h

@@ -24,11 +24,15 @@
 #define MENU_MAX_LINES 5
 #define MENU_MAX_LEN (MENU_MAX_LINES * 32)
 
+#define MENU_BOX_HEIGHT(lines, font, space) ((lines * font) + ((lines - 1) * space))
+
 struct menu_state {
     int off;
     int selection;
     int length;
     char buff[MENU_MAX_LEN];
+    int lines;
+    int y_off;
 };
 
 void menu_init(void (*enter)(int),
@@ -44,7 +48,7 @@ extern bool menu_got_input;
 #define ADD_STATIC_ELEMENT(name) {\
     menu->length += 1; \
     if (((menu->length - 1) >= menu->off) \
-        && ((menu->length - 1 - menu->off) < MENU_MAX_LINES)) { \
+        && ((menu->length - 1 - menu->off) < menu->lines)) { \
         if ((menu->length - 1) == menu->selection) { \
             pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos, "> "); \
         } else { \

include/text.h

@@ -20,10 +20,8 @@
 #define __TEXT_H__
 
 #include "mcufont.h"
-#include "menu.h"
 
 #define TEXT_BG_NONE -1
-#define TEXT_BOX_HEIGHT(font, space) ((MENU_MAX_LINES * font) + ((MENU_MAX_LINES - 1) * space))
 
 struct text_font {
     const char *fontname;
@@ -51,10 +49,4 @@ struct text_conf {
 void text_prepare_font(struct text_font *tf);
 int16_t text_draw(struct text_conf *tc);
 
-int16_t text_box(const char *s, bool centered,
-                 const char *fontname,
-                 uint16_t x_off, uint16_t width,
-                 uint16_t y_off, uint16_t height,
-                 int16_t y_text_off);
-
 #endif // __TEXT_H__

include/textbox.h

@@ -0,0 +1,28 @@
+/*
+ * textbox.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 __TEXTBOX_H__
+#define __TEXTBOX_H__
+
+int16_t text_box(const char *s, bool centered,
+                 const char *fontname,
+                 uint16_t x_off, uint16_t width,
+                 uint16_t y_off, uint16_t height,
+                 int16_t y_text_off);
+
+#endif // __TEXTBOX_H__

src/menu.c

@@ -21,6 +21,7 @@
 #include "config.h"
 #include "buttons.h"
 #include "text.h"
+#include "textbox.h"
 #include "lcd.h"
 #include "menu.h"
 
@@ -83,7 +84,7 @@ static void menu_buttons(enum buttons btn, bool state) {
         while (menu.selection < menu.off) {
             menu.off -= 1;
         }
-        while (menu.selection >= (menu.off + MENU_MAX_LINES)) {
+        while (menu.selection >= (menu.off + menu.lines)) {
             menu.off += 1;
         }
     }
@@ -96,6 +97,8 @@ void menu_init(void (*enter)(int),
     menu.off = 0;
     menu.selection = -1;
     menu.length = 0;
+    menu.lines = MENU_MAX_LINES;
+    menu.y_off = 0;
 
     enter_callback = enter;
     up_callback = up;
@@ -118,7 +121,7 @@ void menu_run(void (*draw)(struct menu_state *), bool centered) {
         text_box(menu.buff, centered,
                  "fixed_10x20",
                  0, LCD_WIDTH,
-                 50, TEXT_BOX_HEIGHT(20, 2),
+                 50 + menu.y_off, MENU_BOX_HEIGHT(menu.lines, 20, 2),
                  0);
     }
 }

src/state_about.c

@@ -24,6 +24,7 @@
 #include "log.h"
 #include "lcd.h"
 #include "text.h"
+#include "textbox.h"
 #include "menu.h"
 #include "state.h"
 #include "state_about.h"
@@ -68,7 +69,7 @@ static const char *about_text =
 ;
 
 static const uint16_t step_size = 10;
-static const uint16_t max_height = TEXT_BOX_HEIGHT(20, 2);
+static const uint16_t max_height = MENU_BOX_HEIGHT(MENU_MAX_LINES, 20, 2);
 
 static uint16_t off = 0;
 static bool held_up = false;

src/state_value.c

@@ -22,7 +22,9 @@
 #include "buttons.h"
 #include "log.h"
 #include "lcd.h"
+#include "menu.h"
 #include "text.h"
+#include "textbox.h"
 #include "state_value.h"
 
 static void *val_p = NULL;
@@ -64,19 +66,22 @@ static void draw(void) {
     } else {
         if (val_mode == VAL_STEP_INCREMENT) {
             pos += snprintf(buff, sizeof(buff),
-                            "%s:\n%d -> %d -> %d",
+                            "%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%04X -> %04X -> %04X",
-                            val_name, val_min, val, val_max);
+                            "%s:\n\n%d -> %d -> %d",
+                            val_name,
+                            __builtin_ffs(val_min),
+                            __builtin_ffs(val),
+                            __builtin_ffs(val_max));
         }
     }
 
     text_box(buff, true,
              "fixed_10x20",
              0, LCD_WIDTH,
-             50, TEXT_BOX_HEIGHT(20, 2),
+             50, MENU_BOX_HEIGHT(MENU_MAX_LINES, 20, 2),
              0);
 }
 

src/state_volcano_run.c

@@ -22,8 +22,10 @@
 #include "config.h"
 #include "buttons.h"
 #include "log.h"
+#include "lcd.h"
 #include "volcano.h"
 #include "workflow.h"
+#include "util.h"
 #include "state.h"
 #include "state_volcano_run.h"
 
@@ -73,20 +75,56 @@ void state_volcano_run_exit(void) {
     wf_reset();
 }
 
+static void bar_graph(int y_off, int h, int val_min, int val, int val_max) {
+    float v = map(val, val_min, val_max, 0.0f, 1.0f);
+    uint16_t width = v * (LCD_WIDTH - 1);
+    uint32_t c = from_hsv(v * 0.333, 1.0, 1.0);
+    lcd_write_rect(0, y_off, width, y_off + h - 1, c);
+}
+
 static void draw(struct menu_state *menu) {
+    static struct wf_state prev_state = {0};
     struct wf_state state = wf_status();
 
+    if ((state.step == prev_state.step)
+        && ((((state.step->op == OP_SET_TEMPERATURE) || (state.step->op == OP_WAIT_TEMPERATURE))
+               && ((state.curr_val / 10) == (prev_state.curr_val / 10)))
+            || (((state.step->op == OP_PUMP_TIME) || (state.step->op == OP_WAIT_TIME))
+               && ((state.curr_val / 500) == (prev_state.curr_val / 500))))) {
+        return;
+    }
+    prev_state = state;
+
+    menu->lines = 3;
+    menu->y_off = 20 + 2;
+
+    lcd_write_rect(0, 50,
+                   LCD_WIDTH - 1,
+                   50 + menu->y_off - 1,
+                   LCD_BLACK);
+    lcd_write_rect(0, 50 + MENU_BOX_HEIGHT(3, 20, 2) + menu->y_off,
+                   LCD_WIDTH - 1,
+                   50 + MENU_BOX_HEIGHT(3, 20, 2) + (menu->y_off * 2) - 1,
+                   LCD_BLACK);
+
     if (state.status == WF_IDLE) {
         if (wait_for_connect) {
             snprintf(menu->buff, MENU_MAX_LEN,
                      "Connecting\nand\nDiscovering");
         } else if (wait_for_disconnect) {
             snprintf(menu->buff, MENU_MAX_LEN,
-                     "Disconnecting");
+                     "\nDisconnecting");
+        } else {
+            snprintf(menu->buff, MENU_MAX_LEN,
+                     "\nDone");
         }
         return;
     }
 
+    bar_graph(50, menu->y_off, 0, state.index, state.count);
+    bar_graph(50 + MENU_BOX_HEIGHT(3, 20, 2) + menu->y_off, menu->y_off,
+              state.start_val, state.curr_val, state.step->val);
+
     int pos = 0;
     pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
                     "step %d / %d\n", state.index, state.count);
@@ -118,8 +156,6 @@ static void draw(struct menu_state *menu) {
                         state.step->val / 1000.0f);
         break;
     }
-
-    // TODO visualize
 }
 
 void state_volcano_run_run(void) {

src/text.c

@@ -16,12 +16,9 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
-
 #include "config.h"
 #include "log.h"
 #include "lcd.h"
-#include "menu.h"
 #include "text.h"
 
 typedef struct {
@@ -170,41 +167,3 @@ int16_t text_draw(struct text_conf *tc) {
 
     return state.y;
 }
-
-int16_t text_box(const char *s, bool centered,
-                 const char *fontname,
-                 uint16_t x_off, uint16_t width,
-                 uint16_t y_off, uint16_t height,
-                 int16_t y_text_off) {
-    static struct text_font font = {
-        .fontname = "",
-        .font = NULL,
-    };
-
-    if ((font.font == NULL) || (strcmp(font.fontname, fontname) != 0)) {
-        font.fontname = fontname;
-        text_prepare_font(&font);
-    }
-
-    struct text_conf text = {
-        .text = s,
-        .x = x_off,
-        .y = y_off,
-        .y_text_off = y_text_off,
-        .justify = false,
-        .alignment = centered ? MF_ALIGN_CENTER : MF_ALIGN_LEFT,
-        .width = width,
-        .height = height,
-        .margin = 2,
-        .fg = RGB_565(0xFF, 0xFF, 0xFF),
-        .bg = TEXT_BG_NONE,
-        .font = &font,
-    };
-
-    lcd_write_rect(x_off, y_off,
-                   x_off + width - 1,
-                   y_off + height - 1,
-                   RGB_565(0x00, 0x00, 0x00));
-
-    return text_draw(&text);
-}

src/textbox.c

@@ -0,0 +1,62 @@
+/*
+ * textbox.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 <string.h>
+
+#include "config.h"
+#include "lcd.h"
+#include "text.h"
+#include "textbox.h"
+
+int16_t text_box(const char *s, bool centered,
+                 const char *fontname,
+                 uint16_t x_off, uint16_t width,
+                 uint16_t y_off, uint16_t height,
+                 int16_t y_text_off) {
+    static struct text_font font = {
+        .fontname = "",
+        .font = NULL,
+    };
+
+    if ((font.font == NULL) || (strcmp(font.fontname, fontname) != 0)) {
+        font.fontname = fontname;
+        text_prepare_font(&font);
+    }
+
+    struct text_conf text = {
+        .text = s,
+        .x = x_off,
+        .y = y_off,
+        .y_text_off = y_text_off,
+        .justify = false,
+        .alignment = centered ? MF_ALIGN_CENTER : MF_ALIGN_LEFT,
+        .width = width,
+        .height = height,
+        .margin = 2,
+        .fg = LCD_WHITE,
+        .bg = TEXT_BG_NONE,
+        .font = &font,
+    };
+
+    lcd_write_rect(x_off, y_off,
+                   x_off + width - 1,
+                   y_off + height - 1,
+                   LCD_BLACK);
+
+    return text_draw(&text);
+}