add commands for heater and pump state

include/volcano.h

@@ -19,6 +19,9 @@
 #ifndef __VOLCANO_H__
 #define __VOLCANO_H__
 
+#include <stdint.h>
+#include <stdbool.h>
+
 // in 1/10th degrees C, or < 0 on error
 int16_t volcano_get_current_temp(void);
 int16_t volcano_get_target_temp(void);
@@ -26,4 +29,8 @@ int16_t volcano_get_target_temp(void);
 // v in 1/10th degrees C, returns < 0 on error
 int8_t volcano_set_target_temp(uint16_t v);
 
+// returns < 0 on error
+int8_t volcano_set_heater_state(bool value);
+int8_t volcano_set_pump_state(bool value);
+
 #endif // __VOLCANO_H__

src/ble.c

@@ -421,10 +421,6 @@ void ble_connect(bd_addr_t addr, bd_addr_type_t type) {
     cyw43_thread_enter();
 
     switch (state) {
-    case TC_OFF:
-        cyw43_thread_exit();
-        return;
-
     case TC_W4_SCAN:
         cyw43_thread_exit();
         ble_scan(0);
@@ -435,8 +431,13 @@ void ble_connect(bd_addr_t addr, bd_addr_type_t type) {
         gap_disconnect(connection_handle);
         break;
 
-    default:
+    case TC_IDLE:
         break;
+
+    default:
+        debug("invalid state for connect %d", state);
+        cyw43_thread_exit();
+        return;
     }
 
     debug("connecting to %s", bd_addr_to_str(addr));
@@ -461,7 +462,10 @@ void ble_disconnect(void) {
     cyw43_thread_enter();
 
     if (state == TC_READY) {
+        debug("disconnecting");
         gap_disconnect(connection_handle);
+    } else {
+        debug("invalid state for disconnect %d", state);
     }
 
     cyw43_thread_exit();
@@ -578,8 +582,6 @@ int8_t ble_write(const uint8_t *service, const uint8_t *characteristic,
         service_idx = srvc;
         cyw43_thread_exit();
 
-        debug("waiting for service discovery");
-
         uint32_t start_time = to_ms_since_boot(get_absolute_time());
         while (1) {
             sleep_ms(1);
@@ -598,7 +600,6 @@ int8_t ble_write(const uint8_t *service, const uint8_t *characteristic,
             cyw43_thread_exit();
 
             if (state_cached == TC_READY) {
-            debug("service discovery done");
                 break;
             }
         }
@@ -650,8 +651,6 @@ int8_t ble_write(const uint8_t *service, const uint8_t *characteristic,
         characteristic_idx = ch;
         cyw43_thread_exit();
 
-        debug("waiting for characteristic discovery");
-
         uint32_t start_time = to_ms_since_boot(get_absolute_time());
         while (1) {
             sleep_ms(1);
@@ -670,7 +669,6 @@ int8_t ble_write(const uint8_t *service, const uint8_t *characteristic,
             cyw43_thread_exit();
 
             if (state_cached == TC_READY) {
-                debug("characteristic discovery done");
                 break;
             }
         }
@@ -699,8 +697,6 @@ int8_t ble_write(const uint8_t *service, const uint8_t *characteristic,
     state = TC_W4_WRITE;
     cyw43_thread_exit();
 
-    debug("waiting for write");
-
     uint32_t start_time = to_ms_since_boot(get_absolute_time());
     while (1) {
         sleep_ms(1);
@@ -719,7 +715,6 @@ int8_t ble_write(const uint8_t *service, const uint8_t *characteristic,
         cyw43_thread_exit();
 
         if ((state_cached == TC_WRITE_COMPLETE) || (state_cached == TC_READY)) {
-            debug("write done (%s)", (state_cached == TC_READY) ? "error" : "success");
             break;
         }
     }

src/console.c

@@ -110,6 +110,8 @@ static void cnsl_interpret(const char *line) {
         println("   vrct - Volcano read current temperature");
         println("   vrtt - Volcano read target temperature");
         println(" vwtt X - Volcano write target temperature");
+        println("  vwh X - Set heater to 1 or 0");
+        println("  vwp X - Set heater to 1 or 0");
         println("");
         println("Press Enter with no input to repeat last command.");
         println("Use repeat to continuously execute last command.");
@@ -260,6 +262,50 @@ static void cnsl_interpret(const char *line) {
                 println("success");
             }
         }
+    } else if (str_startswith(line, "vwh ")) {
+        int val;
+        int r = sscanf(line, "vwh %d", &val);
+        if ((r != 1) || ((val != 0) && (val != 1))) {
+            println("invalid input (%d %d)", r, val);
+        } else {
+#ifdef TEST_VOLCANO_AUTO_CONNECT
+            VOLCANO_AUTO_CONNECT
+#endif // TEST_VOLCANO_AUTO_CONNECT
+
+            int8_t r = volcano_set_heater_state(val == 1);
+
+#ifdef TEST_VOLCANO_AUTO_CONNECT
+            ble_disconnect();
+#endif // TEST_VOLCANO_AUTO_CONNECT
+
+            if (r < 0) {
+                println("error writing heater state %d", r);
+            } else {
+                println("success");
+            }
+        }
+    } else if (str_startswith(line, "vwp ")) {
+        int val;
+        int r = sscanf(line, "vwp %d", &val);
+        if ((r != 1) || ((val != 0) && (val != 1))) {
+            println("invalid input (%d %d)", r, val);
+        } else {
+#ifdef TEST_VOLCANO_AUTO_CONNECT
+            VOLCANO_AUTO_CONNECT
+#endif // TEST_VOLCANO_AUTO_CONNECT
+
+            int8_t r = volcano_set_pump_state(val == 1);
+
+#ifdef TEST_VOLCANO_AUTO_CONNECT
+            ble_disconnect();
+#endif // TEST_VOLCANO_AUTO_CONNECT
+
+            if (r < 0) {
+                println("error writing pump state %d", r);
+            } else {
+                println("success");
+            }
+        }
     } else {
         println("unknown command \"%s\"", line);
     }

src/volcano.c

@@ -83,3 +83,37 @@ int8_t volcano_set_target_temp(uint16_t value) {
     }
     return r;
 }
+
+int8_t volcano_set_heater_state(bool value) {
+    uuid_base[3] = UUID_WRITE_SRVC;
+
+    if (value) {
+        uuid_base2[3] = UUID_HEATER_ON;
+    } else {
+        uuid_base2[3] = UUID_HEATER_OFF;
+    }
+
+    uint8_t d = 0;
+    int8_t r = ble_write(uuid_base, uuid_base2, &d, 1);
+    if (r != 0) {
+        debug("ble_write unexpected value %d", r);
+    }
+    return r;
+}
+
+int8_t volcano_set_pump_state(bool value) {
+    uuid_base[3] = UUID_WRITE_SRVC;
+
+    if (value) {
+        uuid_base2[3] = UUID_PUMP_ON;
+    } else {
+        uuid_base2[3] = UUID_PUMP_OFF;
+    }
+
+    uint8_t d = 0;
+    int8_t r = ble_write(uuid_base, uuid_base2, &d, 1);
+    if (r != 0) {
+        debug("ble_write unexpected value %d", r);
+    }
+    return r;
+}