[Build] Fix use of flag BUILD_NO_DEBUG

The check in the code was for #ifndef BUILD_NO_DEBUG.
But even when it is defined as 0, it is still defined.
So the code was still included in the binary.

memanalyzer.py

@@ -125,6 +125,7 @@ try:
     plugins.append('USE_SETTINGS_ARCHIVE')
     plugins.append('WEBSERVER_RULES_DEBUG=1')
     plugins.append('WEBSERVER_TIMINGSTATS')
+    plugins.append('WEBSERVER_NEW_UI')
 
     
 

platformio.ini

@@ -92,7 +92,6 @@ build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
                             -lstdc++ -lsupc++
                             -mtarget-align
                             -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-                            -DWEBSERVER_RULES_DEBUG=0
                             -DVTABLES_IN_FLASH
                             -DPUYA_SUPPORT=1
 
@@ -104,7 +103,6 @@ build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
                             -fno-exceptions
                             -lstdc++
                             -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-                            -DWEBSERVER_RULES_DEBUG=0
                             -DPUYA_SUPPORT=1
                             -DCORE_POST_2_5_0
 
@@ -121,7 +119,6 @@ build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
                             -DNDEBUG
                             -DVTABLES_IN_FLASH
                             -fno-exceptions
-                            -DWEBSERVER_RULES_DEBUG=0
                             -DPUYA_SUPPORT=1
                             -DARDUINO_ESP8266_RELEASE_2_3_0
                             -DFORCE_PRE_2_5_0

pre_custom_esp32.py

@@ -13,7 +13,7 @@ import os
 # - frameworks
 # - dependent libraries
 env.Append(CPPDEFINES=[
-  ("WEBSERVER_RULES_DEBUG", "0")
+#  ("WEBSERVER_RULES_DEBUG", "1")
 ])
 if os.path.isfile('src/Custom.h'):
   env['CPPDEFINES'].append("USE_CUSTOM_H")

pre_memanalyze.py

@@ -15,7 +15,5 @@ env.Append(CPPDEFINES=[
   "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y",
   "CONTROLLER_SET_NONE",
   "NOTIFIER_SET_NONE",
-  "PLUGIN_SET_NONE",
-
-  ("WEBSERVER_RULES_DEBUG", "0")
+  "PLUGIN_SET_NONE"
 ])

src/WebServer_Rules.ino

@@ -1,9 +1,4 @@
-#ifndef WEBSERVER_RULES_DEBUG
-  # define WEBSERVER_RULES_DEBUG 1
-#endif // ifndef WEBSERVER_RULES_DEBUG
-#ifdef BUILD_MINIMAL_OTA
-  # undef WEBSERVER_RULES_DEBUG
-#endif // ifdef BUILD_MINIMAL_OTA
+// #define WEBSERVER_RULES_DEBUG
 
 
 // ********************************************************************************

src/define_plugin_sets.h

@@ -27,9 +27,6 @@ To create/register a plugin, you have to :
 
 
 #ifdef MEMORY_ANALYSIS
-  #ifndef WEBSERVER_RULES_DEBUG
-    #define WEBSERVER_RULES_DEBUG 0
-  #endif
   #ifdef MQTT_ONLY
     #define USES_C002   // Domoticz MQTT
     #define USES_C005   // Home Assistant (openHAB) MQTT
@@ -189,7 +186,7 @@ To create/register a plugin, you have to :
     #define WEBSERVER_SYSVARS
   #endif
   #ifndef WEBSERVER_NEW_UI
-    #define WEBSERVER_NEW_UI
+//    #define WEBSERVER_NEW_UI
   #endif
 #endif
 
@@ -199,7 +196,6 @@ To create/register a plugin, you have to :
     #ifdef WEBSERVER_RULES_DEBUG
         #undef WEBSERVER_RULES_DEBUG
     #endif
-    #define WEBSERVER_RULES_DEBUG 0
 #endif