diff --git a/src/connections.cpp b/src/connections.cpp index 88c0d2c..4abc8a5 100644 --- a/src/connections.cpp +++ b/src/connections.cpp @@ -10,7 +10,7 @@ extern "C" { #define MQTT_VALVE_COMMAND MQTT_TOPIC_BASE_SUB "/" MQTT_DEVICE_ID "/valve" #define MQTT_SOIL_PROPERTIES MQTT_TOPIC_BASE_SUB "/" MQTT_DEVICE_ID "/soil" -#define MQTT_LIGHT_COMMAND MQTT_TOPIC_BASE_SUB "/" MQTT_DEVICE_ID "/light" +#define MQTT_LIGHT_PROPERTIES MQTT_TOPIC_BASE_SUB "/" MQTT_DEVICE_ID "/light" TimerHandle_t mqttReconnectTimer; TimerHandle_t wifiReconnectTimer; @@ -102,13 +102,9 @@ void onMqttMessage(char *topic, byte *payload, unsigned int payload_length) { } Serial.println(); - if (strcmp(topic, MQTT_LIGHT_COMMAND) == 0) { + if (strcmp(topic, MQTT_LIGHT_PROPERTIES) == 0) { Serial.println("receiving light treshold..."); Serial.println(topic); - } - if (strcmp(topic, MQTT_VALVE_COMMAND) == 0) { - Serial.println("toggling valve..."); - Serial.println(topic); StaticJsonDocument<1024> doc; DeserializationError err = deserializeJson(doc, payload); if (err == DeserializationError::Ok) { @@ -118,6 +114,11 @@ Serial.println("receiving light treshold..."); Serial.println(err.c_str()); } } + if (strcmp(topic, MQTT_VALVE_COMMAND) == 0) { + Serial.println("toggling valve..."); + Serial.println(topic); + toggleValve(); + } if (strcmp(topic, MQTT_SOIL_PROPERTIES) == 0) { Serial.println("receiving soil thresholds..."); Serial.println(topic);