[Cleanup] Reduce build size + clean up loose ends

docs/source/Reference/SystemVariable.rst

@@ -153,6 +153,15 @@ More uses of these system variables can be seen in the rules section and formula
      - 11
      - WiFi channel of current AP.
      - Yes
+   * - ``%iswifi%``
+     - 7
+     - Bitset of WiFi connection state
+
+       * ``0`` = disconnected
+       * ``1`` = Connected
+       * ``3`` = Got IP && Connected
+       * ``7`` = Got IP && Connected && Completed to set all flags WiFi is initialized
+     - Yes
    * - ``%vcc%``
      - 5.2
      - VCC value, this is only available in the VCC builds of FW (with "VCC" in the file name).
@@ -167,6 +176,14 @@ More uses of these system variables can be seen in the rules section and formula
      - 2212667
      - MAC address in integer to be used in rules (only the last 24 bit).
      - Yes
+   * - ``%isntp%``
+     - 1
+     - Indicates whether time was set
+     - yes
+   * - ``%ismqtt%``
+     - 1
+     - Indicates whether a configured MQTT broker is active
+     - yes
 
 
 Standard Conversions

src/_C002.ino

@@ -19,8 +19,6 @@
 # include "src/Helpers/PeriodicalActions.h"
 # include "src/Helpers/StringParser.h"
 
-# include <ArduinoJson.h>
-
 String CPlugin_002_pubname;
 bool   CPlugin_002_mqtt_retainFlag = false;
 
@@ -77,31 +75,11 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
       controllerIndex_t ControllerID = findFirstEnabledControllerWithId(CPLUGIN_ID_002);
 
       if (validControllerIndex(ControllerID)) {
-        DynamicJsonDocument root(512);
-        deserializeJson(root, event->String2.c_str());
-
-        if (!root.isNull())
-        {
-          unsigned int idx = root[F("idx")];
-          float nvalue     = root[F("nvalue")];
-          long  nvaluealt  = root[F("nvalue")];
-
-          // const char* name = root["name"]; // Not used
-          // const char* svalue = root["svalue"]; // Not used
-          const char *svalue1 = root[F("svalue1")];
-
-          // const char* svalue2 = root["svalue2"]; // Not used
-          // const char* svalue3 = root["svalue3"]; // Not used
-          const char *switchtype = root[F("switchType")]; // Expect "On/Off" or "dimmer"
-
-          if (nvalue == 0) {
-            nvalue = nvaluealt;
-          }
-
-          if ((int)switchtype == 0) {
-            switchtype = "?";
-          }
-
+        unsigned int idx;
+        float nvalue;
+        long nvaluealt;
+        String svalue1, switchtype;
+        if (deserializeDomoticzJson(event->String2, idx, nvalue, nvaluealt, svalue1, switchtype)) {
           for (taskIndex_t x = 0; x < TASKS_MAX; x++) {
             // We need the index of the controller we are: 0...CONTROLLER_MAX
             if (Settings.TaskDeviceEnabled[x] && (Settings.TaskDeviceID[ControllerID][x] == idx)) // get idx for our controller index
@@ -122,7 +100,7 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
                 {
                   int baseVar = x * VARS_PER_TASK;
 
-                  if (strcasecmp_P(switchtype, PSTR("dimmer")) == 0)
+                  if (switchtype.equalsIgnoreCase(F("dimmer")))
                   {
                     mustSendEvent = true;
                     int pwmValue = UserVar[baseVar];
@@ -205,59 +183,7 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
     {
       if (event->idx != 0)
       {
-        String json;
-        {
-          DynamicJsonDocument root(200);
-          root[F("idx")]  = event->idx;
-          root[F("RSSI")] = mapRSSItoDomoticz();
-            # if FEATURE_ADC_VCC
-          root[F("Battery")] = mapVccToDomoticz();
-            # endif // if FEATURE_ADC_VCC
-
-          const Sensor_VType sensorType = event->getSensorType();
-
-          switch (sensorType)
-          {
-            case Sensor_VType::SENSOR_TYPE_SWITCH:
-              root[F("command")] = String(F("switchlight"));
-
-              if (UserVar[event->BaseVarIndex] == 0) {
-                root[F("switchcmd")] = String(F("Off"));
-              }
-              else {
-                root[F("switchcmd")] = String(F("On"));
-              }
-              break;
-            case Sensor_VType::SENSOR_TYPE_DIMMER:
-              root[F("command")] = String(F("switchlight"));
-
-              if (UserVar[event->BaseVarIndex] == 0) {
-                root[F("switchcmd")] = String(F("Off"));
-              }
-              else {
-                root[F("Set%20Level")] = UserVar[event->BaseVarIndex];
-              }
-              break;
-
-            case Sensor_VType::SENSOR_TYPE_SINGLE:
-            case Sensor_VType::SENSOR_TYPE_LONG:
-            case Sensor_VType::SENSOR_TYPE_DUAL:
-            case Sensor_VType::SENSOR_TYPE_TRIPLE:
-            case Sensor_VType::SENSOR_TYPE_QUAD:
-            case Sensor_VType::SENSOR_TYPE_TEMP_HUM:
-            case Sensor_VType::SENSOR_TYPE_TEMP_BARO:
-            case Sensor_VType::SENSOR_TYPE_TEMP_EMPTY_BARO:
-            case Sensor_VType::SENSOR_TYPE_TEMP_HUM_BARO:
-            case Sensor_VType::SENSOR_TYPE_WIND:
-            case Sensor_VType::SENSOR_TYPE_STRING:
-            default:
-              root[F("nvalue")] = 0;
-              root[F("svalue")] = formatDomoticzSensorType(event);
-              break;
-          }
-
-          serializeJson(root, json);
-        }
+        String json = serializeDomoticzJson(event);
 # ifndef BUILD_NO_DEBUG
         String log = F("MQTT : ");
         log += json;
@@ -272,8 +198,7 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
       } // if ixd !=0
       else
       {
-        String log = F("MQTT : IDX cannot be zero!");
-        addLog(LOG_LEVEL_ERROR, log);
+        addLog(LOG_LEVEL_ERROR, F("MQTT : IDX cannot be zero!"));
       }
       break;
     }

src/_C003.ino

@@ -53,9 +53,9 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String&
       // We now create a URI for the request
       String url = F("variableset ");
       url    += event->idx;
-      url    += ",";
+      url    += ',';
       url    += formatUserVarNoCheck(event, 0);
-      url    += "\n";
+      url    += '\n';
       success = C003_DelayHandler->addToQueue(C003_queue_element(event->ControllerIndex, event->TaskIndex, std::move(url)));
       Scheduler.scheduleNextDelayQueue(ESPEasy_Scheduler::IntervalTimer_e::TIMER_C003_DELAY_QUEUE, C003_DelayHandler->getNextScheduleTime());
 

src/_C004.ino

@@ -124,7 +124,7 @@ bool do_process_c004_delay_queue(int controller_number, const C004_queue_element
   String postStr = do_create_http_request(
     hostName, F("POST"),
     F("/update"), // uri
-    "",           // auth_header
+    EMPTY_STRING,           // auth_header
     F("Content-Type: application/x-www-form-urlencoded\r\n"),
     postDataStr.length());
 

src/_C007.ino

@@ -99,13 +99,13 @@ bool do_process_c007_delay_queue(int controller_number, const C007_queue_element
   url += F("&json=");
 
   for (byte i = 0; i < element.valueCount; ++i) {
-    url += (i == 0) ? F("{") : F(",");
+    url += (i == 0) ? '{' : ',';
     url += F("field");
     url += element.idx + i;
-    url += ":";
+    url += ':';
     url += element.txt[i];
   }
-  url += "}";
+  url += '}';
   url += F("&apikey=");
   url += getControllerPass(element.controller_idx, ControllerSettings); // "0UDNN17RW6XAS2E5" // api key
 

src/_C008.ino

@@ -9,7 +9,6 @@
 # define CPLUGIN_008
 # define CPLUGIN_ID_008         8
 # define CPLUGIN_NAME_008       "Generic HTTP"
-# include <ArduinoJson.h>
 
 bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& string)
 {

src/_C009.ino

@@ -31,7 +31,6 @@
 # define CPLUGIN_009
 # define CPLUGIN_ID_009         9
 # define CPLUGIN_NAME_009       "FHEM HTTP"
-# include <ArduinoJson.h>
 
 bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String& string)
 {
@@ -76,7 +75,7 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String&
         break;
       }
 
-      
+
       success = C009_DelayHandler->addToQueue(C009_queue_element(event));
       Scheduler.scheduleNextDelayQueue(ESPEasy_Scheduler::IntervalTimer_e::TIMER_C009_DELAY_QUEUE, C009_DelayHandler->getNextScheduleTime());
       break;
@@ -110,52 +109,87 @@ bool do_process_c009_delay_queue(int controller_number, const C009_queue_element
   if (!try_connect_host(controller_number, client, ControllerSettings)) {
     return false;
   }
-
   LoadTaskSettings(element.TaskIndex);
   String jsonString;
+  jsonString.reserve(768);
   {
-    // Create json root object
-    DynamicJsonDocument root(1024);
-    root[F("module")]  = String(F("ESPEasy"));
-    root[F("version")] = String(F("1.04"));
-
-    // Create nested objects
-    JsonObject data = root.createNestedObject(String(F("data")));
-    JsonObject ESP  = data.createNestedObject(String(F("ESP")));
-    ESP[F("name")]         = Settings.Name;
-    ESP[F("unit")]         = Settings.Unit;
-    ESP[F("version")]      = Settings.Version;
-    ESP[F("build")]        = Settings.Build;
-    ESP[F("build_notes")]  = String(F(BUILD_NOTES));
-    ESP[F("build_git")]    = getValue(LabelType::GIT_BUILD);
-    ESP[F("node_type_id")] = NODE_TYPE_ID;
-    ESP[F("sleep")]        = Settings.deepSleep_wakeTime;
-
-    // embed IP, important if there is NAT/PAT
-    // char ipStr[20];
-    // IPAddress ip = NetworkLocalIP();
-    // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]);
-    ESP[F("ip")] = NetworkLocalIP().toString();
-
-    // Create nested SENSOR json object
-    JsonObject SENSOR = data.createNestedObject(String(F("SENSOR")));
-
-    // char itemNames[valueCount][2];
-    for (byte x = 0; x < element.valueCount; x++)
+    jsonString = '{';
     {
-      // Each sensor value get an own object (0..n)
-      // sprintf(itemNames[x],"%d",x);
-      JsonObject val = SENSOR.createNestedObject(String(x));
-      val[F("deviceName")] = getTaskDeviceName(element.TaskIndex);
-      val[F("valueName")]  = ExtraTaskSettings.TaskDeviceValueNames[x];
-      val[F("type")]       = static_cast<int>(element.sensorType);
-      val[F("value")]      = element.txt[x];
+      jsonString += to_json_object_value(F("module"),  F("ESPEasy"));
+      jsonString += ',';
+      jsonString += to_json_object_value(F("version"), F("1.04"));
+
+      // Create nested object "ESP" inside "data"
+      jsonString += ',';
+      jsonString += F("\"data\":{");
+      {
+        jsonString += F("\"ESP\":{");
+        {
+          // Create nested objects in "ESP":
+          jsonString += to_json_object_value(F("name"), Settings.Name);
+          jsonString += ',';
+          jsonString += to_json_object_value(F("unit"), String(Settings.Unit));
+          jsonString += ',';
+          jsonString += to_json_object_value(F("version"), String(Settings.Version));
+          jsonString += ',';
+          jsonString += to_json_object_value(F("build"), String(Settings.Build));
+          jsonString += ',';
+          jsonString += to_json_object_value(F("build_notes"), F(BUILD_NOTES));
+          jsonString += ',';
+          jsonString += to_json_object_value(F("build_git"), getValue(LabelType::GIT_BUILD));
+          jsonString += ',';
+          jsonString += to_json_object_value(F("node_type_id"), String(NODE_TYPE_ID));
+          jsonString += ',';
+          jsonString += to_json_object_value(F("sleep"), String(Settings.deepSleep_wakeTime));
+
+          // embed IP, important if there is NAT/PAT
+          // char ipStr[20];
+          // IPAddress ip = NetworkLocalIP();
+          // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]);
+          jsonString += ',';
+          jsonString += to_json_object_value(F("ip"), NetworkLocalIP().toString());
+        }
+        jsonString += '}'; // End "ESP"
+
+        jsonString += ',';
+
+        // Create nested object "SENSOR" json object inside "data"
+        jsonString += F("\"SENSOR\":{");
+        {
+          // char itemNames[valueCount][2];
+          for (byte x = 0; x < element.valueCount; x++)
+          {
+            // Each sensor value get an own object (0..n)
+            // sprintf(itemNames[x],"%d",x);
+            if (x != 0) {
+              jsonString += ',';
+            }
+
+            jsonString += '"';
+            jsonString += x;
+            jsonString += F("\":{");
+            {
+              jsonString += to_json_object_value(F("deviceName"), getTaskDeviceName(element.TaskIndex));
+              jsonString += ',';
+              jsonString += to_json_object_value(F("valueName"), ExtraTaskSettings.TaskDeviceValueNames[x]);
+              jsonString += ',';
+              jsonString += to_json_object_value(F("type"), String(static_cast<int>(element.sensorType)));
+              jsonString += ',';
+              jsonString += to_json_object_value(F("value"), element.txt[x]);
+            }
+            jsonString += '}'; // End "sensor value N"
+          }
+        }
+        jsonString += '}';     // End "SENSOR"
+      }
+      jsonString += '}';       // End "data"
     }
-
-    // Create json buffer
-    serializeJson(root, jsonString);
+    jsonString += '}';         // End JSON structure
   }
 
+  // addLog(LOG_LEVEL_INFO, F("C009 Test JSON:"));
+  // addLog(LOG_LEVEL_INFO, jsonString);
+
   // We now create a URI for the request
   String request = create_http_request_auth(
     controller_number, element.controller_idx, ControllerSettings,