Cloud monitoring and control for your spa 🏊♂️
+ +");
+ }
+ }
+ #endif
}
+#ifdef ENABLE_ESPA_CONTROL
+// Handle serial commands for EspaControl pairing
+void handleSerialCommands() {
+ static String serialBuffer = "";
+
+ while (Serial.available()) {
+ char c = Serial.read();
+
+ if (c == '\n' || c == '\r') {
+ if (serialBuffer.length() > 0) {
+ String cmd = serialBuffer;
+ cmd.trim();
+ serialBuffer = "";
+
+ // Handle commands
+ if (cmd.startsWith("pair ")) {
+ String code = cmd.substring(5);
+ code.trim();
+
+ if (code.length() == 6) {
+ debugI("Submitting pairing code: %s", code.c_str());
+ if (espaControl.submitPairingCode(code)) {
+ debugI("Pairing code submitted successfully");
+ } else {
+ debugE("Failed to submit pairing code");
+ }
+ } else {
+ debugE("Invalid pairing code. Must be 6 digits. Usage: pair 123456");
+ }
+ }
+ else if (cmd == "unpair") {
+ debugI("Clearing pairing token...");
+ espaControl.unpair();
+ debugI("Device unpaired");
+ }
+ else if (cmd == "status") {
+ debugI("=== EspaControl Status ===");
+ debugI("Device ID: %s", espaControl.getDeviceId().c_str());
+
+ PairingState state = espaControl.getPairingState();
+ String stateStr;
+ switch(state) {
+ case NOT_PAIRED: stateStr = "NOT_PAIRED"; break;
+ case CODE_SUBMITTED: stateStr = "CODE_SUBMITTED"; break;
+ case POLLING: stateStr = "POLLING"; break;
+ case PAIRED: stateStr = "PAIRED"; break;
+ case PAIRING_ERROR: stateStr = "PAIRING_ERROR"; break;
+ default: stateStr = "UNKNOWN"; break;
+ }
+ debugI("Pairing State: %s", stateStr.c_str());
+ debugI("Is Paired: %s", espaControl.isPaired() ? "YES" : "NO");
+ debugI("Connected: %s", espaControl.isConnected() ? "YES" : "NO");
+ }
+ else if (cmd == "help") {
+ debugI("=== EspaControl Commands ===");
+ debugI("pair - Submit 6-digit pairing code (e.g., pair 123456)");
+ debugI("unpair - Clear pairing token and reset device");
+ debugI("status - Show current pairing status");
+ debugI("help - Show this help message");
+ }
+ }
+ } else {
+ serialBuffer += c;
+
+ // Prevent buffer overflow
+ if (serialBuffer.length() > 100) {
+ serialBuffer = "";
+ }
+ }
+ }
+}
+#endif
+
void loop() {
checkButton(); // Check if the button is pressed to start Wi-Fi Manager
Debug.handle();
+
+ #ifdef ENABLE_ESPA_CONTROL
+ handleSerialCommands(); // Handle serial commands for pairing
+ #endif
if (setSpaCallbackReady) {
if (spaCallbackProperty == "reboot") {
@@ -727,17 +902,27 @@ void loop() {
if (delayedStart) {
delayedStart = !(bootTime + 10000 < millis());
} else {
- si.loop();
+ // In desktop test mode, skip spa interface entirely
+ if (!desktopTestMode) {
+ si.loop();
+ }
- if (!si.isInitialised()) {
+ if (!desktopTestMode && !si.isInitialised()) {
// set status lights to indicate we are waiting for spa connection before we proceed
blinker.setState(STATE_WAITING_FOR_SPA);
} else {
if ( spaSerialNumber=="" ) {
debugI("Initialising...");
- spaSerialNumber = si.getSerialNo1()+"-"+si.getSerialNo2();
- debugI("Spa serial number is %s",spaSerialNumber.c_str());
+ if (desktopTestMode) {
+ // Use MAC address as serial number in test mode
+ spaSerialNumber = WiFi.macAddress();
+ spaSerialNumber.replace(":", "");
+ debugI("Desktop test mode - using MAC as serial: %s",spaSerialNumber.c_str());
+ } else {
+ spaSerialNumber = si.getSerialNo1()+"-"+si.getSerialNo2();
+ debugI("Spa serial number is %s",spaSerialNumber.c_str());
+ }
mqttBase = String("sn_esp32/") + spaSerialNumber + String("/");
mqttStatusTopic = mqttBase + "status";
@@ -745,7 +930,7 @@ void loop() {
mqttAvailability = mqttBase+"available";
debugI("MQTT base topic is %s",mqttBase.c_str());
}
- if (!mqttClient.connected()) { // MQTT broker reconnect if not connected
+ if (!desktopTestMode && !mqttClient.connected()) { // MQTT broker reconnect if not connected (skip in test mode)
long now=millis();
if (now - mqttLastConnect > 1000) {
blinker.setState(STATE_MQTT_NOT_CONNECTED);
@@ -768,10 +953,9 @@ void loop() {
} else {
debugW("MQTT connection failed");
}
-
}
} else {
- if (!autoDiscoveryPublished) { // This is the setup area, gets called once when communication with Spa and MQTT broker have been established.
+ if (!desktopTestMode && !autoDiscoveryPublished) { // This is the setup area, gets called once when communication with Spa and MQTT broker have been established.
debugI("Publish autodiscovery information");
mqttHaAutoDiscovery();
autoDiscoveryPublished = true;
@@ -780,15 +964,27 @@ void loop() {
si.statusResponse.setCallback(mqttPublishStatusString);
}
+
+ #ifdef ENABLE_ESPA_CONTROL
+ espaControl.loop(); // Process WebSocket events
+ #endif
// all systems are go! Start the knight rider animation loop
blinker.setState(KNIGHT_RIDER);
}
+
+ // In desktop test mode, we're always "ready" after delayed start
+ if (desktopTestMode) {
+ #ifdef ENABLE_ESPA_CONTROL
+ espaControl.loop(); // Process WebSocket events for pairing testing
+ #endif
+ blinker.setState(KNIGHT_RIDER);
+ }
}
}
}
- if (updateMqtt) {
+ if (!desktopTestMode && updateMqtt) {
debugD("Changing MQTT settings...");
mqttClient.disconnect();
mqttClient.setServer(config.MqttServer.getValue(), config.MqttPort.getValue());
@@ -811,5 +1007,7 @@ void loop() {
updateSoftAP = false;
}
- mqttClient.loop();
+ if (!desktopTestMode) {
+ mqttClient.loop();
+ }
}
\ No newline at end of file