[Memory] Tweak some memory allocations

src/src/ESPEasyCore/Controller.cpp

@@ -826,10 +826,20 @@ bool MQTTpublish(controllerIndex_t controller_idx,
   if (MQTT_queueFull(controller_idx)) {
     return false;
   }
+  String topic_str;
+  String payload_str;
+  if (!reserve_special(topic_str, strlen_P(topic)) ||
+      !reserve_special(payload_str, strlen_P(payload))) {
+    return false;
+  }
+  topic_str = topic;
+  payload_str = payload;
   const bool success =
-    MQTTDelayHandler->addToQueue(std::unique_ptr<MQTT_queue_element>(new (std::nothrow) MQTT_queue_element(controller_idx, taskIndex, topic,
-                                                                                                           payload, retained,
-                                                                                                           callbackTask)));
+    MQTTDelayHandler->addToQueue(std::unique_ptr<MQTT_queue_element>(new (std::nothrow) MQTT_queue_element(
+      controller_idx, taskIndex, 
+      std::move(topic_str),
+      std::move(payload_str), retained,
+      callbackTask)));
 
   scheduleNextMQTTdelayQueue();
   return success;

src/src/Helpers/ESPEasy_Storage.cpp

@@ -1967,7 +1967,7 @@ String LoadFromFile(const char *fname, String& data, int offset)
   STOP_TIMER(LOADFILE_STATS);
   delay(0);
 
-  return String();
+  return EMPTY_STRING;
 }
 
 /********************************************************************************************\

src/src/Helpers/Memory.cpp

@@ -242,7 +242,10 @@ class PSRAM_String : public String {
 
 
 bool String_reserve_special(String& str, size_t size) {
-  if (str.length() < size) {
+  if (!UsePSRAM()) {
+    return str.reserve(size);
+  }
+  if (str.length() <= size) {
     // As we like to move this to PSRAM, it also makes sense 
     // to do this when the length equals size
     PSRAM_String psram_str(size);

src/src/Helpers/Misc.cpp

@@ -528,7 +528,7 @@ void logMemUsageAfter(const __FlashStringHelper *function, int value) {
   if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
     String log;
 
-    if (log.reserve(128)) {
+    if (reserve_special(log, 128)) {
       log  = F("After ");
       log += function;
 

src/src/Helpers/PortStatus.cpp

@@ -3,6 +3,8 @@
 #include "../DataStructs/PinMode.h"
 #include "../Globals/GlobalMapPortStatus.h"
 
+#include "../Helpers/StringConverter.h"
+
 #include "../../ESPEasy-Globals.h"
 
 
@@ -208,7 +210,7 @@ String getPinStateJSON(bool search, uint32_t key, const String& log, int16_t noS
   if (!search || found)
   {
     String reply;
-    reply.reserve(128);
+    reserve_special(reply, 128);
     reply += F("{\n\"log\": \"");
     {
       // truncate to 25 chars, max MQTT message size = 128 including header...

src/src/Helpers/RulesHelper.cpp

@@ -163,13 +163,11 @@ void RulesHelperClass::init()
 #ifndef BUILD_NO_DEBUG
 
         if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
-          String log = F("Cache rules event: ");
-          log += filename;
-          log += F(" pos: ");
-          log += pos_start_line;
-          log += ' ';
-          log += rulesLine;
-          addLogMove(LOG_LEVEL_DEBUG, log);
+          addLogMove(LOG_LEVEL_DEBUG, strformat(
+            F("Cache rules event: %s pos: %u %s"),
+            filename.c_str(),
+            pos_start_line,
+            rulesLine.c_str()));
         }
 #endif // ifndef BUILD_NO_DEBUG
       }
@@ -296,7 +294,7 @@ String RulesHelperClass::readLn(const String& filename,
 
       while (f.available()) {
         if (addChar(char(f.read()), tmpStr, firstNonSpaceRead)) {
-          lines.push_back(tmpStr);
+          lines.push_back(move_special(std::move(tmpStr)));
           ++readPos;
 
           firstNonSpaceRead = false;
@@ -307,7 +305,7 @@ String RulesHelperClass::readLn(const String& filename,
       if (tmpStr.length() > 0) {
         rules_strip_trailing_comments(tmpStr);
         check_rules_line_user_errors(tmpStr);
-        lines.push_back(tmpStr);
+        lines.push_back(move_special(std::move(tmpStr)));
         tmpStr.clear();
       }
 # ifndef BUILD_NO_DEBUG

src/src/Helpers/Scheduler_SystemEventTimer.cpp

@@ -97,8 +97,8 @@ void ESPEasy_Scheduler::schedule_mqtt_controller_event_timer(
     const size_t topic_length = strlen_P(c_topic);
 
     // This is being called from a callback function, so do not try to allocate this on the 2nd heap, but rather on the default heap.
-    if (!(event.String1.reserve(topic_length) &&
-          event.String2.reserve(length))) {
+    if (!(reserve_special(event.String1, topic_length) &&
+          reserve_special(event.String2, length))) {
       addLog(LOG_LEVEL_ERROR, F("MQTT : Out of Memory! Cannot process MQTT message"));
       return;
     }

src/src/PluginStructs/P028_data_struct.cpp

@@ -105,7 +105,7 @@ bool P028_data_struct::updateMeasurements(taskIndex_t task_index) {
   String log;
 
   if (loglevelActiveFor(LOG_LEVEL_INFO)) {
-    log.reserve(120); // Prevent re-allocation
+    reserve_special(log, 120); // Prevent re-allocation
     log  = getDeviceName(sensorID);
     log += ':';
   }