room temp

Author: espenia

main/main.ino

@@ -35,9 +35,9 @@ void analog_read() {
     wifi_mqtt_client.publish(getTopicString(TOPIC_PH_VOLTAGE), ph_voltage);
   }
 
-  if (isTopicEnabled(TOPIC_ROOM_TEMPERATURE)) {
+  if (isTopicEnabled(TOPIC_TEMPERATURE)) {
     float room_temperature = aht10_helper.read_temperature();
-    wifi_mqtt_client.publish(getTopicString(TOPIC_ROOM_TEMPERATURE), room_temperature);
+    wifi_mqtt_client.publish(getTopicString(TOPIC_TEMPERATURE), room_temperature);
 
     if (isTopicEnabled(TOPIC_EC)) {
       float ec = tds_helper.analog_read(room_temperature);

main/topic.h

@@ -17,7 +17,7 @@ enum Topic {
     TOPIC_PH_VOLTAGE,
     TOPIC_EC,
     TOPIC_HUMIDITY,
-    TOPIC_ROOM_TEMPERATURE,
+    TOPIC_TEMPERATURE,
     TOPIC_FLOATER,
     TOPIC_ENABLE,
     TOPIC_DISABLE,

main/topic.ino

@@ -12,7 +12,7 @@ const char* all_topics[TOPIC_COUNT] = {
     "sensors/ph_voltage",
     "sensors/ec",
     "sensors/humidity",
-    "sensors/room_temperature",
+    "sensors/temperature",
     "sensors/floater",
     "sensors/enable",
     "sensors/disable"
@@ -29,7 +29,7 @@ std::map<Topic, Status> topic_map = {
     {TOPIC_PH_VOLTAGE, ON},
     {TOPIC_EC, ON},
     {TOPIC_HUMIDITY, ON},
-    {TOPIC_ROOM_TEMPERATURE, ON},
+    {TOPIC_TEMPERATURE, ON},
     {TOPIC_FLOATER, ON},
     {TOPIC_ENABLE, ON},
     {TOPIC_DISABLE, ON},

main/wifi_mqtt_client.ino

@@ -7,10 +7,10 @@ struct DeviceState {
     unsigned long duration;
 };
 
-DeviceState waterPump = {false, 0, 10000};  // 10 seconds for water
-DeviceState nutesPump = {false, 0, 6000};   // 6 seconds for nutrients
-DeviceState acidPump = {false, 0, 15000};   // 15 seconds for acid
-DeviceState basePump = {false, 0, 15000};   // 15 seconds for base
+DeviceState waterPump = {false, 0, 4000};  // 4 seconds for water
+DeviceState nutesPump = {false, 0, 4000};   // 4 seconds for nutrients
+DeviceState acidPump = {false, 0, 4000};   // 4 seconds for acid
+DeviceState basePump = {false, 0, 4000};   // 4 seconds for base
 
 char device_id[40];
 
@@ -161,5 +161,5 @@ void WiFiAndMQTTClient::publish(const char* topic, float value) {
     snprintf(print_msg, 100, "--- publishing message in topic %s ---", topic_with_device_id);
     Serial.println(print_msg);
     Serial.println(msg);
-    (*wmm).client->publish(MQTT::Publish(topic_with_device_id, msg).set_qos(1));
+    (*wmm).client->publish(topic_with_device_id, msg);
 }