tweak volcano conf and steps bar

include/volcano.h

@@ -32,7 +32,7 @@ enum volcano_state {
 };
 
 // returns < 0 on error
-int8_t volcano_discover_characteristics(void);
+int8_t volcano_discover_characteristics(bool wf, bool conf);
 
 // in 1/10th degrees C, or < 0 on error
 int16_t volcano_get_current_temp(void);

src/state_volcano_conf.c

@@ -80,13 +80,15 @@ static void enter_cb(int selection) {
 
 static void send_values(void) {
     volcano_set_unit(val_celsius ? UNIT_C : UNIT_F);
-    sleep_ms(100);
+    sleep_ms(150);
     volcano_set_vibration(val_vibrate);
-    sleep_ms(100);
+    sleep_ms(150);
     volcano_set_display_cooling(val_disp_cool);
 }
 
 static void fetch_values(void) {
+    volcano_discover_characteristics(false, true);
+
     enum unit unit = volcano_get_unit();
     val_celsius = (unit == UNIT_C);
 

src/state_volcano_run.c

@@ -121,7 +121,7 @@ static void draw(struct menu_state *menu) {
         return;
     }
 
-    bar_graph(50, menu->y_off, 0, state.index, state.count);
+    bar_graph(50, menu->y_off, 0, state.index + 1, 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);
 

src/volcano.c

@@ -54,41 +54,69 @@ static uint8_t uuid_base2[16] = {
     0x5a, 0x26, 0x42, 0x49, 0x43, 0x4b, 0x45, 0x4c,
 };
 
-int8_t volcano_discover_characteristics(void) {
-    uuid_base[1] = UUID_SRVC_2;
-    uuid_base2[1] = UUID_SRVC_2;
+int8_t volcano_discover_characteristics(bool wf, bool conf) {
+    if (wf) {
+        uuid_base[1] = UUID_SRVC_2;
+        uuid_base2[1] = UUID_SRVC_2;
 
-    uuid_base[3] = UUID_WRITE_SRVC;
-    int8_t r;
+        uuid_base[3] = UUID_WRITE_SRVC;
+        int8_t r;
 
-    uuid_base2[3] = UUID_TARGET_TEMP;
-    r = ble_discover(uuid_base, uuid_base2);
-    if (r < 0) {
-        return r;
-    }
+        uuid_base2[3] = UUID_TARGET_TEMP;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
 
-    uuid_base2[3] = UUID_HEATER_ON;
-    r = ble_discover(uuid_base, uuid_base2);
-    if (r < 0) {
-        return r;
-    }
+        uuid_base2[3] = UUID_HEATER_ON;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
 
-    uuid_base2[3] = UUID_HEATER_OFF;
-    r = ble_discover(uuid_base, uuid_base2);
-    if (r < 0) {
-        return r;
-    }
+        uuid_base2[3] = UUID_HEATER_OFF;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
 
-    uuid_base2[3] = UUID_PUMP_ON;
-    r = ble_discover(uuid_base, uuid_base2);
-    if (r < 0) {
-        return r;
+        uuid_base2[3] = UUID_PUMP_ON;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
+
+        uuid_base2[3] = UUID_PUMP_OFF;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
     }
 
-    uuid_base2[3] = UUID_PUMP_OFF;
-    r = ble_discover(uuid_base, uuid_base2);
-    if (r < 0) {
-        return r;
+    if (conf) {
+        uuid_base[1] = UUID_SRVC_1;
+        uuid_base2[1] = UUID_SRVC_1;
+
+        uuid_base[3] = UUID_WRITE_SRVC;
+        int8_t r;
+
+        uuid_base2[3] = UUID_PRJSTAT1;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
+
+        uuid_base2[3] = UUID_PRJSTAT2;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
+
+        uuid_base2[3] = UUID_PRJSTAT3;
+        r = ble_discover(uuid_base, uuid_base2);
+        if (r < 0) {
+            return r;
+        }
     }
 
     return 0;

src/workflow.c

@@ -217,7 +217,7 @@ void wf_start(uint16_t index) {
      */
     DO_WHILE(volcano_set_heater_state(true),
              !(volcano_get_state() & VOLCANO_STATE_HEATER));
-    volcano_discover_characteristics();
+    volcano_discover_characteristics(true, false);
 
     do_step();
 }