print workflow step and allow aborting

include/workflow.h

@@ -21,6 +21,18 @@
 
 #include <stdint.h>
 
+enum wf_op {
+    OP_SET_TEMPERATURE = 0,
+    OP_WAIT_TEMPERATURE,
+    OP_WAIT_TIME,
+    OP_PUMP_TIME,
+};
+
+struct wf_step {
+    enum wf_op op;
+    uint16_t val;
+};
+
 enum wf_status {
     WF_IDLE = 0,
     WF_RUNNING,
@@ -29,8 +41,9 @@ enum wf_status {
 struct wf_state {
     enum wf_status status;
 
-    uint16_t step;
+    uint16_t index;
     uint16_t count;
+    struct wf_step step;
 };
 
 uint16_t wf_count(void);

src/state_volcano_run.c

@@ -20,7 +20,9 @@
 #include <string.h>
 
 #include "config.h"
+#include "buttons.h"
 #include "log.h"
+#include "volcano.h"
 #include "workflow.h"
 #include "state.h"
 #include "state_volcano_run.h"
@@ -42,19 +44,62 @@ void state_volcano_run_target(bd_addr_t addr, bd_addr_type_t type) {
     ble_type = type;
 }
 
+static void volcano_buttons(enum buttons btn, bool state) {
+    if (state && (btn == BTN_Y)) {
+        if ((!wait_for_connect) && (!wait_for_disconnect)) {
+            debug("workflow abort");
+            wf_reset();
+            volcano_set_pump_state(false);
+            volcano_set_heater_state(false);
+            ble_disconnect();
+            wait_for_disconnect = true;
+        }
+    }
+}
+
 void state_volcano_run_enter(void) {
+    menu_init(NULL, NULL);
+    buttons_callback(volcano_buttons);
+
     debug("workflow connect");
     ble_connect(ble_addr, ble_type);
     wait_for_connect = true;
 }
 
 void state_volcano_run_exit(void) {
+    menu_deinit();
     wf_reset();
 }
 
 static void draw(struct menu_state *menu) {
     struct wf_state state = wf_status();
-    snprintf(menu->buff, MENU_MAX_LEN, "%d / %d", state.step, state.count);
+
+    int pos = 0;
+    pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                    "step %d / %d\n\n", state.index, state.count);
+
+    switch (state.step.op) {
+    case OP_SET_TEMPERATURE:
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                        "set temp %.1f C", state.step.val / 10.0f);
+        break;
+
+    case OP_WAIT_TEMPERATURE:
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                        "wait temp %.1f C", state.step.val / 10.0f);
+        break;
+
+    case OP_WAIT_TIME:
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                        "wait time %.1f s", state.step.val / 1000.0f);
+        break;
+
+    case OP_PUMP_TIME:
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                        "pump time %.1f s", state.step.val / 1000.0f);
+        break;
+    }
+
     // TODO visualize
 }
 

src/workflow.c

@@ -24,18 +24,6 @@
 #define WF_MAX_STEPS 42
 #define WF_MAX_FLOWS 6
 
-enum wf_op {
-    OP_SET_TEMPERATURE = 0,
-    OP_WAIT_TEMPERATURE,
-    OP_WAIT_TIME,
-    OP_PUMP_TIME,
-};
-
-struct wf_step {
-    enum wf_op op;
-    uint16_t val;
-};
-
 struct workflow {
     const char *name;
     const char *author;
@@ -186,8 +174,9 @@ const char *wf_author(uint16_t index) {
 struct wf_state wf_status(void) {
     struct wf_state s = {
         .status = status,
-        .step = step,
+        .index = step,
         .count = wf[wf_i].count,
+        .step = wf[wf_i].steps[step],
     };
     return s;
 }