print current value in workflow

include/workflow.h

@@ -44,6 +44,7 @@ struct wf_state {
     uint16_t index;
     uint16_t count;
     struct wf_step step;
+    uint16_t start_val, curr_val;
 };
 
 uint16_t wf_count(void);

src/state_volcano_run.c

@@ -81,27 +81,35 @@ static void draw(struct menu_state *menu) {
 
     int pos = 0;
     pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
-                    "step %d / %d\n\n", state.index, state.count);
+                    "step %d / %d\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);
+                        "\nset 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:
+                        "wait temp %.1f C\n", state.step.val / 10.0f);
         pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
-                        "wait time %.1f s", state.step.val / 1000.0f);
+                        "%.1f -> %.1f -> %.1f",
+                        state.start_val / 10.0f,
+                        state.curr_val / 10.0f,
+                        state.step.val / 10.0f);
         break;
 
+    case OP_WAIT_TIME:
     case OP_PUMP_TIME:
         pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
-                        "pump time %.1f s", state.step.val / 1000.0f);
+                        "%s time %.1f s\n",
+                        (state.step.op == OP_WAIT_TIME) ? "wait" : "pump",
+                        state.step.val / 1000.0f);
+        pos += snprintf(menu->buff + pos, MENU_MAX_LEN - pos,
+                        "%.1f -> %.1f -> %.1f",
+                        state.start_val / 1000.0f,
+                        state.curr_val / 1000.0f,
+                        state.step.val / 1000.0f);
         break;
     }
 

src/workflow.c

@@ -129,26 +129,33 @@ static enum wf_status status = WF_IDLE;
 static uint16_t wf_i = 0;
 static uint16_t step = 0;
 static uint32_t start_t = 0;
+static uint16_t start_val = 0;
+static uint16_t curr_val = 0;
 
 static void do_step(void) {
     switch (wf[wf_i].steps[step].op) {
     case OP_SET_TEMPERATURE:
     case OP_WAIT_TEMPERATURE:
         debug("workflow temp %.1f C", wf[wf_i].steps[step].val / 10.0);
+        start_val = volcano_get_current_temp();
         volcano_set_target_temp(wf[wf_i].steps[step].val);
         break;
 
     case OP_PUMP_TIME:
         volcano_set_pump_state(true);
         start_t = to_ms_since_boot(get_absolute_time());
+        start_val = 0;
         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());
+        start_val = 0;
         debug("workflow time %.3f s", wf[wf_i].steps[step].val / 1000.0);
         break;
     }
+
+    curr_val = start_val;
 }
 
 uint16_t wf_count(void) {
@@ -177,6 +184,8 @@ struct wf_state wf_status(void) {
         .index = step,
         .count = wf[wf_i].count,
         .step = wf[wf_i].steps[step],
+        .start_val = start_val,
+        .curr_val = curr_val,
     };
     return s;
 }
@@ -221,15 +230,22 @@ void wf_run(void) {
         done = true;
         break;
 
-    case OP_WAIT_TEMPERATURE:
-        done = (volcano_get_current_temp() >= (wf[wf_i].steps[step].val - 5));
+    case OP_WAIT_TEMPERATURE: {
+        uint16_t temp = volcano_get_current_temp();
+        curr_val = temp;
+        done = (temp >= (wf[wf_i].steps[step].val - 5));
         break;
+    }
 
     case OP_PUMP_TIME:
-    case OP_WAIT_TIME:
-        done = ((to_ms_since_boot(get_absolute_time()) - start_t) >= wf[wf_i].steps[step].val);
+    case OP_WAIT_TIME: {
+        uint32_t now = to_ms_since_boot(get_absolute_time());
+        uint32_t diff = now - start_t;
+        curr_val = diff;
+        done = (diff >= wf[wf_i].steps[step].val);
         break;
     }
+    }
 
     if (done) {
         if (wf[wf_i].steps[step].op == OP_PUMP_TIME) {