Merge branch 'mega' of https://github.com/letscontrolit/ESPEasy into feature/i2c-scanner-show-plugin-name

src/src/ControllerQueue/MQTT_queue_element.cpp

@@ -1,5 +1,6 @@
 #include "../ControllerQueue/MQTT_queue_element.h"
 
+#ifdef USES_MQTT
 
 MQTT_queue_element::MQTT_queue_element(int ctrl_idx,
                                        taskIndex_t TaskIndex,
@@ -42,3 +43,4 @@ void MQTT_queue_element::removeEmptyTopics() {
     _topic.replace(F("//"), F("/"));
   }
 }
+#endif // USES_MQTT

src/src/ControllerQueue/MQTT_queue_element.h

@@ -5,6 +5,7 @@
 #include "../DataStructs/UnitMessageCount.h"
 #include "../Globals/CPlugins.h"
 
+#ifdef USES_MQTT
 
 /*********************************************************************************************\
 * MQTT_queue_element for all MQTT base controllers
@@ -48,5 +49,6 @@ public:
   UnitMessageCount_t UnitMessageCount;
 };
 
+#endif // USES_MQTT
 
 #endif // CONTROLLERQUEUE_MQTT_QUEUE_ELEMENT_H

src/src/WebServer/Metrics.cpp

@@ -7,12 +7,13 @@
 # include "../../_Plugin_Helper.h"
 # include "../Helpers/ESPEasyStatistics.h"
 # include "../Static/WebStaticData.h"
-HELPERS_ESPEASY_MATH_H
+
+#ifdef WEBSERVER_METRICS
+
 #ifdef ESP32
 # include <esp_partition.h>
 #endif // ifdef ESP32
 
-
 void handle_metrics() {
     TXBuffer.startStream(F("text/plain"), F("*"));
 
@@ -71,12 +72,7 @@ void handle_metrics() {
       TXBuffer.endStream();
 }
 
-
-
-
 void handle_metrics_devices(){
-
-
     for (taskIndex_t x = 0; validTaskIndex(x); x++)
     {        
         const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(x);
@@ -118,4 +114,4 @@ void handle_metrics_devices(){
          }
     }
 }
-
+#endif // WEBSERVER_METRICS

src/src/WebServer/Metrics.h

@@ -3,16 +3,11 @@
 
 #include "../WebServer/common.h"
 
-
 #ifdef WEBSERVER_METRICS
 
 void handle_metrics();
-
-
-
 void handle_metrics_devices();
 
-
 #endif    // ifdef WEBSERVER_METRICS
 
-#endif
+#endif