test workflow in debug console

include/config.h

@@ -39,4 +39,6 @@
 #define DISK_BLOCK_COUNT 256
 #endif // DEBUG_DISK_WRITE_SOURCES
 
+//#define TEST_VOLCANO_AUTO_CONNECT "xx:xx:xx:xx:xx:xx 1"
+
 #endif // __CONFIG_H__

include/main.h

@@ -0,0 +1,24 @@
+/*
+ * main.h
+ *
+ * Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * See <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MAIN_H__
+#define __MAIN_H__
+
+void main_loop_hw(void);
+
+#endif // __MAIN_H__

src/ble.c

@@ -243,7 +243,7 @@ static void hci_event_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa
             return;
         }
         gatt_event_service_query_result_get_service(packet, &services[service_idx].service);
-        debug("got service %s result", uuid128_to_str(services[service_idx].service.uuid128));
+        //debug("got service %s result", uuid128_to_str(services[service_idx].service.uuid128));
         break;
 
     case GATT_EVENT_CHARACTERISTIC_QUERY_RESULT:
@@ -252,7 +252,7 @@ static void hci_event_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa
             return;
         }
         gatt_event_characteristic_query_result_get_characteristic(packet, &services[service_idx].chars[characteristic_idx].c);
-        debug("got characteristic %s result", uuid128_to_str(services[service_idx].chars[characteristic_idx].c.uuid128));
+        //debug("got characteristic %s result", uuid128_to_str(services[service_idx].chars[characteristic_idx].c.uuid128));
         break;
 
     case GATT_EVENT_QUERY_COMPLETE: {
@@ -269,17 +269,17 @@ static void hci_event_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa
             break;
 
         case TC_W4_SERVICE:
-            debug("service %s complete", uuid128_to_str(services[service_idx].service.uuid128));
+            //debug("service %s complete", uuid128_to_str(services[service_idx].service.uuid128));
             state = TC_READY;
             break;
 
         case TC_W4_CHARACTERISTIC:
-            debug("characteristic %s complete", uuid128_to_str(services[service_idx].chars[characteristic_idx].c.uuid128));
+            //debug("characteristic %s complete", uuid128_to_str(services[service_idx].chars[characteristic_idx].c.uuid128));
             state = TC_READY;
             break;
 
         case TC_W4_WRITE:
-            debug("write complete");
+            //debug("write complete");
             state = TC_WRITE_COMPLETE;
             break;
 

src/console.c

@@ -18,10 +18,12 @@
 
 #include <inttypes.h>
 #include <string.h>
-#include "pico/stdlib.h"
 #include <unistd.h>
 #include <stdio.h>
 
+#include "pico/stdlib.h"
+#include "hardware/watchdog.h"
+
 #include "config.h"
 #include "log.h"
 #include "util.h"
@@ -36,12 +38,11 @@
 #include "image.h"
 #include "volcano.h"
 #include "serial.h"
+#include "main.h"
 
-#define CNSL_BUFF_SIZE 1024
+#define CNSL_BUFF_SIZE 64
 #define CNSL_REPEAT_MS 500
 
-//#define TEST_VOLCANO_AUTO_CONNECT "xx:xx:xx:xx:xx:xx 1"
-
 #define VOLCANO_AUTO_CONNECT {                                    \
     ble_scan(BLE_SCAN_OFF);                                       \
     bd_addr_t addr;                                               \
@@ -112,6 +113,7 @@ static void cnsl_interpret(const char *line) {
         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("     vt - Run a hard-coded test workflow");
         println("");
         println("Press Enter with no input to repeat last command.");
         println("Use repeat to continuously execute last command.");
@@ -306,6 +308,94 @@ static void cnsl_interpret(const char *line) {
                 println("success");
             }
         }
+    } else if (strcmp(line, "vt") == 0) {
+#ifdef TEST_VOLCANO_AUTO_CONNECT
+        VOLCANO_AUTO_CONNECT
+#endif // TEST_VOLCANO_AUTO_CONNECT
+
+        println("init workflow test");
+        volcano_set_pump_state(false);
+        volcano_set_heater_state(false);
+        volcano_set_target_temp(1850);
+        volcano_set_heater_state(true);
+
+        println("wait for 185");
+        while (volcano_get_current_temp() < 1840) {
+            main_loop_hw();
+        }
+
+        println("wait for 10s");
+        uint32_t start = to_ms_since_boot(get_absolute_time());
+        while ((to_ms_since_boot(get_absolute_time()) - start) < (10 * 1000)) {
+            main_loop_hw();
+        }
+
+        println("pumping");
+        volcano_set_pump_state(true);
+
+        println("wait for 10s");
+        start = to_ms_since_boot(get_absolute_time());
+        while ((to_ms_since_boot(get_absolute_time()) - start) < (10 * 1000)) {
+            main_loop_hw();
+        }
+
+        println("step done");
+        volcano_set_pump_state(false);
+        volcano_set_target_temp(1950);
+
+        println("wait for 195");
+        while (volcano_get_current_temp() < 1940) {
+            main_loop_hw();
+        }
+
+        println("wait for 5s");
+        start = to_ms_since_boot(get_absolute_time());
+        while ((to_ms_since_boot(get_absolute_time()) - start) < (5 * 1000)) {
+            main_loop_hw();
+        }
+
+        println("pumping");
+        volcano_set_pump_state(true);
+
+        println("wait for 20s");
+        start = to_ms_since_boot(get_absolute_time());
+        while ((to_ms_since_boot(get_absolute_time()) - start) < (20 * 1000)) {
+            main_loop_hw();
+        }
+
+        println("step done");
+        volcano_set_pump_state(false);
+        volcano_set_target_temp(2050);
+
+        println("wait for 205");
+        while (volcano_get_current_temp() < 2040) {
+            main_loop_hw();
+        }
+
+        println("wait for 5s");
+        start = to_ms_since_boot(get_absolute_time());
+        while ((to_ms_since_boot(get_absolute_time()) - start) < (5 * 1000)) {
+            main_loop_hw();
+        }
+
+        println("pumping");
+        volcano_set_pump_state(true);
+
+        println("wait for 20s");
+        start = to_ms_since_boot(get_absolute_time());
+        while ((to_ms_since_boot(get_absolute_time()) - start) < (20 * 1000)) {
+            main_loop_hw();
+        }
+
+        println("turning off");
+        volcano_set_pump_state(false);
+        volcano_set_heater_state(false);
+
+        println("done");
+
+#ifdef TEST_VOLCANO_AUTO_CONNECT
+        ble_disconnect();
+#endif // TEST_VOLCANO_AUTO_CONNECT
     } else {
         println("unknown command \"%s\"", line);
     }

src/log.c

@@ -22,7 +22,7 @@
 #include "ff.h"
 
 #include "config.h"
-#include "usb.h"
+#include "main.h"
 #include "usb_cdc.h"
 #include "serial.h"
 #include "ring.h"
@@ -134,9 +134,7 @@ void debug_wait_input(const char *format, ...) {
     serial_set_reroute(true);
 
     while (!got_input) {
-        watchdog_update();
-        usb_run();
-        serial_run();
+        main_loop_hw();
     }
 
     usb_cdc_set_reroute(false);

src/main.c

@@ -36,6 +36,13 @@
 #include "state.h"
 #include "serial.h"
 
+void main_loop_hw(void) {
+    watchdog_update();
+    usb_run();
+    serial_run();
+    heartbeat_run();
+}
+
 int main(void) {
     // required for debug console
     cnsl_init();
@@ -90,15 +97,9 @@ int main(void) {
     state_switch(STATE_SCAN);
 
     while (1) {
-        watchdog_update();
-
-        heartbeat_run();
+        main_loop_hw();
         buttons_run();
-
-        usb_run();
-        serial_run();
         cnsl_run();
-
         battery_run();
         state_run();
     }