clear text box bg. fix ble disconnect and workflow notify.

src/ble.c

@@ -491,7 +491,11 @@ bool ble_is_connected(void) {
 
     bool v = (state == TC_READY)
              || (state == TC_W4_READ)
-             || (state == TC_READ_COMPLETE);
+             || (state == TC_READ_COMPLETE)
+             || (state == TC_W4_SERVICE)
+             || (state == TC_W4_CHARACTERISTIC)
+             || (state == TC_W4_WRITE)
+             || (state == TC_WRITE_COMPLETE);
 
     cyw43_thread_exit();
     return v;

src/state_volcano_run.c

@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include "config.h"
+#include "log.h"
 #include "workflow.h"
 #include "state.h"
 #include "state_volcano_run.h"
@@ -30,6 +31,7 @@ static uint16_t wf_index;
 static bd_addr_t ble_addr;
 static bd_addr_type_t ble_type;
 static bool wait_for_connect = false;
+static bool wait_for_disconnect = false;
 
 void state_volcano_run_index(uint16_t index) {
     wf_index = index;
@@ -41,13 +43,13 @@ void state_volcano_run_target(bd_addr_t addr, bd_addr_type_t type) {
 }
 
 void state_volcano_run_enter(void) {
+    debug("workflow connect");
     ble_connect(ble_addr, ble_type);
     wait_for_connect = true;
 }
 
 void state_volcano_run_exit(void) {
     wf_reset();
-    ble_disconnect();
 }
 
 static void draw(struct menu_state *menu) {
@@ -58,13 +60,24 @@ static void draw(struct menu_state *menu) {
 void state_volcano_run_run(void) {
     if (wait_for_connect && ble_is_connected()) {
         wait_for_connect = false;
+        debug("workflow start");
         wf_start(wf_index);
     }
 
     menu_run(draw);
 
-    struct wf_state state = wf_status();
-    if (state.status == WF_IDLE) {
+    if (!wait_for_connect) {
+        struct wf_state state = wf_status();
+        if (state.status == WF_IDLE) {
+            debug("workflow disconnect");
+            ble_disconnect();
+            wait_for_disconnect = true;
+        }
+    }
+
+    if (wait_for_disconnect && !ble_is_connected()) {
+        wait_for_disconnect = false;
+        debug("workflow done");
         state_switch(STATE_SCAN);
     }
 }

src/text.c

@@ -161,21 +161,31 @@ void text_box(const char *s) {
         text_prepare_font(&font);
     }
 
+    int x = 0;
+    int width = 240;
+
+    int y = 50;
+    int height = 120;
+
     struct text_conf text = {
         .text = "",
-        .x = 0,
-        .y = 50,
+        .x = x,
+        .y = y,
         .justify = false,
         .alignment = MF_ALIGN_CENTER,
-        .width = 240,
-        .height = 240 - 80,
+        .width = width,
+        .height = height,
         .margin = 2,
         .fg = RGB_565(0xFF, 0xFF, 0xFF),
         .bg = RGB_565(0x00, 0x00, 0x00),
         .font = &font,
     };
 
-    // TODO clear background?!
+    lcd_write_rect(240 - y - 1 - height,
+                   x,
+                   240 - y - 1,
+                   x + width - 1,
+                   text.bg);
 
     text.text = s;
     text_draw(&text);

src/workflow.c

@@ -43,6 +43,10 @@ struct workflow {
     uint16_t count;
 };
 
+#define NOTIFY \
+    { .op = OP_WAIT_TIME, .val = 1000 }, \
+    { .op = OP_PUMP_TIME, .val = 1000 }
+
 static const struct workflow wf[WF_MAX_FLOWS] = {
     {
         .name = "Default",
@@ -60,17 +64,7 @@ static const struct workflow wf[WF_MAX_FLOWS] = {
             { .op = OP_WAIT_TIME, .val = 5000 },
             { .op = OP_PUMP_TIME, .val = 20000 },
 
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
+            NOTIFY, NOTIFY, NOTIFY, NOTIFY,
 
             { .op = OP_SET_TEMPERATURE, .val = 1900 },
         },
@@ -112,23 +106,13 @@ static const struct workflow wf[WF_MAX_FLOWS] = {
             { .op = OP_WAIT_TIME, .val = 5000 },
             { .op = OP_PUMP_TIME, .val = 20000 },
 
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
+            NOTIFY, NOTIFY, NOTIFY, NOTIFY,
 
             { .op = OP_SET_TEMPERATURE, .val = 1900 },
         },
         .count = 18,
     }, {
-        .name = "Hardcore",
+        .name = "Hotty",
         .author = "xythobuz",
         .steps = {
             { .op = OP_WAIT_TEMPERATURE, .val = 1900 },
@@ -143,17 +127,7 @@ static const struct workflow wf[WF_MAX_FLOWS] = {
             { .op = OP_WAIT_TIME, .val = 5000 },
             { .op = OP_PUMP_TIME, .val = 20000 },
 
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
-
-            { .op = OP_PUMP_TIME, .val = 1000 },
-            { .op = OP_WAIT_TIME, .val = 1000 },
+            NOTIFY, NOTIFY, NOTIFY, NOTIFY,
 
             { .op = OP_SET_TEMPERATURE, .val = 1900 },
         },
@@ -178,7 +152,9 @@ static void do_step(void) {
 
     case OP_PUMP_TIME:
         volcano_set_pump_state(true);
-        __attribute__((fallthrough));
+        start_t = to_ms_since_boot(get_absolute_time());
+        debug("workflow pump %.3f s", wf[wf_i].steps[step].val / 1000.0);
+        break;
 
     case OP_WAIT_TIME:
         start_t = to_ms_since_boot(get_absolute_time());