MQTT -> AMPEL_MQTT

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

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
   }

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.

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)

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