From d0483949bce9e58d4914b0d2cf44287c4965584f Mon Sep 17 00:00:00 2001 From: Eric Duminil <eric.duminil@gmail.com> Date: Sun, 27 Dec 2020 14:10:17 +0100 Subject: [PATCH] MQTT -> AMPEL_MQTT --- ampel-firmware.h | 2 +- ampel-firmware.ino | 6 +++--- config.public.h | 2 +- web_server.cpp | 4 ++-- web_server.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ampel-firmware.h b/ampel-firmware.h index cd211f4..12515ac 100644 --- a/ampel-firmware.h +++ b/ampel-firmware.h @@ -12,7 +12,7 @@ #ifdef CSV_WRITER # include "csv_writer.h" #endif -#ifdef MQTT +#ifdef AMPEL_MQTT # include "mqtt.h" #endif #ifdef LORAWAN diff --git a/ampel-firmware.ino b/ampel-firmware.ino index cfa4a2c..387eb13 100644 --- a/ampel-firmware.ino +++ b/ampel-firmware.ino @@ -95,7 +95,7 @@ void setup() { Serial.println(F("Error setting up MDNS responder!")); } -#ifdef MQTT +#ifdef AMPEL_MQTT mqtt::initialize("CO2sensors/" + SENSOR_ID); #endif } @@ -137,7 +137,7 @@ void loop() { csv_writer::logIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity); #endif -#ifdef MQTT +#ifdef AMPEL_MQTT mqtt::publishIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity); #endif @@ -189,7 +189,7 @@ void keepServicesAlive() { #ifdef HTTP web_server::update(); #endif -#ifdef MQTT +#ifdef AMPEL_MQTT mqtt::keepConnection(); // MQTT client has its own timer. It will keep alive every 15s. #endif } diff --git a/config.public.h b/config.public.h index 072a457..d4ae25e 100644 --- a/config.public.h +++ b/config.public.h @@ -76,7 +76,7 @@ /** * MQTT SERVER */ -# define MQTT // Comment or remove this line if you want to disable MQTT +# define AMPEL_MQTT // Comment or remove this line if you want to disable MQTT /* * If MQTT is enabled, co2ampel will publish data every MQTT_SENDING_INTERVAL seconds. diff --git a/web_server.cpp b/web_server.cpp index 812dbcc..2cbfc54 100644 --- a/web_server.cpp +++ b/web_server.cpp @@ -89,7 +89,7 @@ namespace web_server { "<tr><td>Last write</td><td>%s</td></tr>\n" "<tr><td>Timestep</td><td>%5d s</td></tr>\n" #endif -#ifdef MQTT +#ifdef AMPEL_MQTT "<tr><th colspan='2'>MQTT</th></tr>\n" "<tr><td>Last publish</td><td>%s</td></tr>\n" "<tr><td>Timestep</td><td>%5d s</td></tr>\n" @@ -217,7 +217,7 @@ namespace web_server { #ifdef CSV_WRITER csv_writer::last_successful_write.c_str(), config::csv_interval, #endif -#ifdef MQTT +#ifdef AMPEL_MQTT mqtt::last_successful_publish.c_str(), config::sending_interval, #endif #if defined(LORAWAN) && defined(ESP32) diff --git a/web_server.h b/web_server.h index d453e63..f942dec 100644 --- a/web_server.h +++ b/web_server.h @@ -12,7 +12,7 @@ #ifdef CSV_WRITER # include "csv_writer.h" #endif -#ifdef MQTT +#ifdef AMPEL_MQTT # include "mqtt.h" #endif #ifdef LORAWAN -- GitLab