letscontrolit · TD-er · Aug 10, 2022 · Aug 11, 2022 · Aug 12, 2022 · Aug 12, 2022
diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp
@@ -23,7 +23,7 @@
 #endif // USES_MQTT
 
 #include "../Commands/Networks.h"
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 #include "../Commands/Notifications.h"
 #endif
 #include "../Commands/Provisioning.h"
@@ -395,7 +395,7 @@ bool executeInternalCommand(command_case_data & data)
 #if FEATURE_CUSTOM_PROVISIONING
       COMMAND_CASE_A(       "provisionconfig", Command_Provisioning_Config,       0); // Provisioning.h
       COMMAND_CASE_A(     "provisionsecurity", Command_Provisioning_Security,     0); // Provisioning.h
-      #ifdef USES_NOTIFIER
+      #if FEATURE_NOTIFIER
       COMMAND_CASE_A( "provisionnotification", Command_Provisioning_Notification, 0); // Provisioning.h
       #endif
       COMMAND_CASE_A(    "provisionprovision", Command_Provisioning_Provision,    0); // Provisioning.h

diff --git a/src/src/Commands/Provisioning.cpp b/src/src/Commands/Provisioning.cpp
@@ -19,7 +19,7 @@ String Command_Provisioning_Security(struct EventStruct *event, const char *Line
   return downloadFileType(FileType::SECURITY_DAT);
 }
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 String Command_Provisioning_Notification(struct EventStruct *event, const char *Line)
 {
   return downloadFileType(FileType::NOTIFICATION_DAT);

diff --git a/src/src/Commands/Provisioning.h b/src/src/Commands/Provisioning.h
@@ -11,7 +11,7 @@ String Command_Provisioning_Config(struct EventStruct *event,
                                    const char         *Line);
 String Command_Provisioning_Security(struct EventStruct *event,
                                      const char         *Line);
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 String Command_Provisioning_Notification(struct EventStruct *event,
                                          const char         *Line);
 #endif

diff --git a/src/src/ControllerQueue/C019_queue_element.cpp b/src/src/ControllerQueue/C019_queue_element.cpp
@@ -7,10 +7,10 @@
 #include "../ESPEasyCore/ESPEasy_Log.h"
 
 
-#ifdef USES_PACKED_RAW_DATA
+#if FEATURE_PACKED_RAW_DATA
 String getPackedFromPlugin(struct EventStruct *event,
                            uint8_t             sampleSetCount);
-#endif // USES_PACKED_RAW_DATA
+#endif
 
 #ifdef USE_SECOND_HEAP
 C019_queue_element::C019_queue_element(const C019_queue_element& other) :
@@ -31,15 +31,15 @@ C019_queue_element::C019_queue_element(struct EventStruct *event_p) :
   controller_idx(event_p->ControllerIndex)
 {
   event.deep_copy(event_p);
-  #ifdef USES_PACKED_RAW_DATA
+  #if FEATURE_PACKED_RAW_DATA
   packed = getPackedFromPlugin(event_p, 0);
 
   if (loglevelActiveFor(LOG_LEVEL_INFO)) {
     String log = F("C019 queue element: ");
     log += packed;
     addLog(LOG_LEVEL_INFO, log);
   }
-  #endif // USES_PACKED_RAW_DATA
+  #endif
 
   // Extra check to make sure sensorType is correct.
   event.sensorType = event.getSensorType();

diff --git a/src/src/CustomBuild/check_defines_custom.h b/src/src/CustomBuild/check_defines_custom.h
@@ -126,11 +126,11 @@
 # define FEATURE_MDNS  1
 #endif // if defined(FEATURE_MDNS) && (2-FEATURE_MDNS-2 == 4)
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 # warning "Custom.h has '#define USES_NOTIFIER' to be replaced with '#define FEATURE_NOTIFIER 1', see https://github.com/letscontrolit/ESPEasy/pull/4153"
 # define FEATURE_NOTIFIER  1
 # undef USES_NOTIFIER
-#endif // ifdef USES_NOTIFIER
+#endif // if FEATURE_NOTIFIER
 
 #ifdef USES_MODBUS
 # warning "Custom.h has '#define USES_MODBUS' to be replaced with '#define FEATURE_MODBUS 1', see https://github.com/letscontrolit/ESPEasy/pull/4153"

diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
@@ -2030,8 +2030,8 @@ To create/register a plugin, you have to :
   #undef USES_C019
 #endif
 
-#if defined(USES_C019) && !defined(USES_PACKED_RAW_DATA)
-  #define USES_PACKED_RAW_DATA
+#if defined(USES_C019) && !defined(FEATURE_PACKED_RAW_DATA)
+  #define FEATURE_PACKED_RAW_DATA  1
 #endif
 
 

diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h
@@ -65,7 +65,7 @@ struct EventStruct
   EventValueSource::Enum Source            = EventValueSource::Enum::VALUE_SOURCE_NOT_SET;
   taskIndex_t            TaskIndex         = INVALID_TASK_INDEX;       // index position in TaskSettings array, 0-11
   controllerIndex_t      ControllerIndex   = INVALID_CONTROLLER_INDEX; // index position in Settings.Controller, 0-3
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
   notifierIndex_t        NotificationIndex = INVALID_NOTIFIER_INDEX;   // index position in Settings.Notification, 0-3
 #endif
   uint8_t                BaseVarIndex      = 0;

diff --git a/src/src/DataStructs/Modbus.cpp b/src/src/DataStructs/Modbus.cpp
@@ -1,11 +1,10 @@
 #include "../DataStructs/Modbus.h"
 
-#ifdef USES_MODBUS
+#if FEATURE_MODBUS
 
 #include "../DataStructs/ControllerSettingsStruct.h"
 #include "../ESPEasyCore/ESPEasy_Log.h"
 
-#if FEATURE_MODBUS
 
 Modbus::Modbus() : ModbusClient(nullptr), errcnt(0), timeout(0),
   TXRXstate(MODBUS_IDLE), RXavailable(0), payLoad(0) {}

diff --git a/src/src/DataStructs/NotificationSettingsStruct.cpp b/src/src/DataStructs/NotificationSettingsStruct.cpp
@@ -1,6 +1,6 @@
 #include "../DataStructs/NotificationSettingsStruct.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 NotificationSettingsStruct::NotificationSettingsStruct() : Port(0), Pin1(-1), Pin2(-1) {
     ZERO_FILL(Server);

diff --git a/src/src/DataStructs/NotificationSettingsStruct.h b/src/src/DataStructs/NotificationSettingsStruct.h
@@ -3,7 +3,7 @@
 
 #include "../../ESPEasy_common.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 #include <Arduino.h>
 #include <memory> // For std::shared_ptr

diff --git a/src/src/DataStructs/NotificationStruct.h b/src/src/DataStructs/NotificationStruct.h
@@ -3,7 +3,7 @@
 
 #include "../../ESPEasy_common.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 /*********************************************************************************************\
 * NotificationStruct

diff --git a/src/src/DataTypes/SettingsType.cpp b/src/src/DataTypes/SettingsType.cpp
@@ -16,7 +16,7 @@ const __FlashStringHelper * SettingsType::getSettingsTypeString(Enum settingsTyp
     case Enum::ControllerSettings_Type:        return F("ControllerSettings");
     case Enum::CustomControllerSettings_Type:  return F("CustomControllerSettings");
     case Enum::NotificationSettings_Type:      
-    #ifdef USES_NOTIFIER
+    #if FEATURE_NOTIFIER
         return F("NotificationSettings");
     #else
         break;
@@ -83,7 +83,7 @@ bool SettingsType::getSettingsParameters(Enum settingsType, int index, int& max_
     }
     case Enum::NotificationSettings_Type:
     {
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
       max_index   = NOTIFICATION_MAX;
       offset      = index * (DAT_NOTIFICATION_SIZE);
       max_size    = DAT_NOTIFICATION_SIZE;

diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp
@@ -278,7 +278,7 @@ void ESPEasy_setup()
     if (toDisable != 0) {
       toDisable = disableController(toDisable);
     }
-    #ifdef USES_NOTIFIER
+    #if FEATURE_NOTIFIER
     if (toDisable != 0) {
       toDisable = disableNotification(toDisable);
     }
@@ -295,7 +295,7 @@ void ESPEasy_setup()
     if (toDisable != 0) {
       toDisable = disableAllControllers(toDisable);
     }
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
     if (toDisable != 0) {
       toDisable = disableAllNotifications(toDisable);
     }

diff --git a/src/src/Globals/NPlugins.cpp b/src/src/Globals/NPlugins.cpp
@@ -1,6 +1,6 @@
 #include "../Globals/NPlugins.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 #include "../DataStructs/ESPEasy_EventStruct.h"
 #include "../DataStructs/NotificationStruct.h"

diff --git a/src/src/Globals/NPlugins.h b/src/src/Globals/NPlugins.h
@@ -3,7 +3,7 @@
 
 #include "../../ESPEasy_common.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 #include "../CustomBuild/ESPEasyLimits.h"
 #include "../DataStructs/NotificationStruct.h"

diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp
@@ -660,7 +660,7 @@ uint8_t disableAllControllers(uint8_t bootFailedCount) {
 /********************************************************************************************\
    Disable Notification, based on bootFailedCount
  \*********************************************************************************************/
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 uint8_t disableNotification(uint8_t bootFailedCount) {
   for (uint8_t i = 0; i < NOTIFICATION_MAX && bootFailedCount > 0; ++i) {
     if (Settings.NotificationEnabled[i]) {
@@ -1159,7 +1159,7 @@ String loadProvisioningSettings(ProvisioningStruct& ProvisioningSettings)
 
 #endif
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 /********************************************************************************************\
    Save Controller settings to file system
  \*********************************************************************************************/

diff --git a/src/src/Helpers/ESPEasy_Storage.h b/src/src/Helpers/ESPEasy_Storage.h
@@ -89,7 +89,7 @@ uint8_t disableAllControllers(uint8_t bootFailedCount);
 /********************************************************************************************\
    Disable Notification, based on bootFailedCount
  \*********************************************************************************************/
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 uint8_t disableNotification(uint8_t bootFailedCount);
 uint8_t disableAllNotifications(uint8_t bootFailedCount);
 #endif
@@ -195,7 +195,7 @@ String loadProvisioningSettings(ProvisioningStruct& ProvisioningSettings);
 
 
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 /********************************************************************************************\
    Save Controller settings to file system
  \*********************************************************************************************/

diff --git a/src/src/Helpers/Scheduler.cpp b/src/src/Helpers/Scheduler.cpp
@@ -79,7 +79,7 @@ const __FlashStringHelper * ESPEasy_Scheduler::toString(ESPEasy_Scheduler::Plugi
   switch (pluginType) {
     case PluginPtrType::TaskPlugin:         return F("Plugin");
     case PluginPtrType::ControllerPlugin:   return F("Controller");
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
     case PluginPtrType::NotificationPlugin: return F("Notification");
 #endif
   }
@@ -1127,7 +1127,7 @@ void ESPEasy_Scheduler::schedule_mqtt_controller_event_timer(protocolIndex_t   P
 }
 #endif
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 void ESPEasy_Scheduler::schedule_notification_event_timer(uint8_t              NotificationProtocolIndex,
                                                           NPlugin::Function    Function,
                                                           struct EventStruct&& event) {
@@ -1182,7 +1182,7 @@ void ESPEasy_Scheduler::process_system_event_queue() {
     case PluginPtrType::ControllerPlugin:
       CPluginCall(Index, static_cast<CPlugin::Function>(Function), &ScheduledEventQueue.front().event, tmpString);
       break;
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
     case PluginPtrType::NotificationPlugin:
       NPlugin_ptr[Index](static_cast<NPlugin::Function>(Function), &ScheduledEventQueue.front().event, tmpString);
       break;

diff --git a/src/src/Helpers/Scheduler.h b/src/src/Helpers/Scheduler.h
@@ -75,7 +75,7 @@ class ESPEasy_Scheduler {
   enum class PluginPtrType {
     TaskPlugin,
     ControllerPlugin
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
     ,NotificationPlugin
 #endif
   };
@@ -278,7 +278,7 @@ class ESPEasy_Scheduler {
 #endif
 
   // Note: The event will be moved
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
   void schedule_notification_event_timer(uint8_t              NotificationProtocolIndex,
                                          NPlugin::Function    Function,
                                          struct EventStruct&& event);

diff --git a/src/src/Helpers/_NPlugin_init.cpp b/src/src/Helpers/_NPlugin_init.cpp
@@ -1,6 +1,6 @@
 #include "../Helpers/_NPlugin_init.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 #include "../DataStructs/ESPEasy_EventStruct.h"
 #include "../DataStructs/TimingStats.h"

diff --git a/src/src/Helpers/_NPlugin_init.h b/src/src/Helpers/_NPlugin_init.h
@@ -3,7 +3,7 @@
 
 #include "../../ESPEasy_common.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 #include "../DataTypes/ESPEasy_plugin_functions.h"
 

diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
@@ -560,7 +560,7 @@ void handle_buildinfo() {
     }
     json_close(true);
   }
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
   {
     json_open(true, F("notifications"));
 

diff --git a/src/src/WebServer/NotificationPage.cpp b/src/src/WebServer/NotificationPage.cpp
@@ -1,6 +1,6 @@
 #include "../WebServer/NotificationPage.h"
 
-#ifdef USES_NOTIFIER
+#if FEATURE_NOTIFIER
 
 #include "../WebServer/WebServer.h"
 #include "../WebServer/HTML_wrappers.h"
@@ -22,8 +22,6 @@
 // Web Interface notifcations page
 // ********************************************************************************
 
-#if FEATURE_NOTIFIER
-
 #include "../Globals/NPlugins.h"
 
 

diff --git a/src/src/WebServer/WebTemplateParser.cpp b/src/src/WebServer/WebTemplateParser.cpp
@@ -293,12 +293,12 @@ void WebTemplateParser::getWebPageTemplateVar(const String& varName)
       if ((i == MENU_INDEX_RULES) && !Settings.UseRules) { // hide rules menu item
         continue;
       }
-#ifndef FEATURE_NOTIFIER
+#if FEATURE_NOTIFIER==0
 
       if (i == MENU_INDEX_NOTIFICATIONS) { // hide notifications menu item
         continue;
       }
-#endif // ifndef FEATURE_NOTIFIER
+#endif // if FEATURE_NOTIFIER==0
 
       addHtml(F("<a "));