change mem check to same values as in v3.6.5, add log

MichaelDvP · Sep 8, 2024 · 6d81525 · 6d81525
1 parent beeafd4
commit 6d81525
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
@@ -1903,12 +1903,13 @@ void EMSdevice::mqtt_ha_entity_config_create() {
                 create_device_config = false; // only create the main config once
                 count++;
             }
-// #ifndef EMSESP_STANDALONE
+#ifndef EMSESP_STANDALONE
             // always create minimum one config
-            if (count && (heap_caps_get_free_size(MALLOC_CAP_8BIT) < 41 * 1024)) { // checks free Heap+PSRAM
+            // if (count && (heap_caps_get_free_size(MALLOC_CAP_8BIT) < 41 * 1024)) { // checks free Heap+PSRAM
+            if (ESP.getMaxAllocHeap() < (6 * 1024) || (!EMSESP::system_.PSram() && ESP.getFreeHeap() < (65 * 1024))) {
                 break;
             }
-// #endif
+#endif
         }
     }
 #if defined(EMSESP_DEBUG) || defined(EMSESP_STANDALONE)

diff --git a/src/mqtt.cpp b/src/mqtt.cpp
@@ -613,13 +613,13 @@ bool Mqtt::queue_message(const uint8_t operation, const std::string & topic, con
 // check free mem
 #ifndef EMSESP_STANDALONE
     // if (ESP.getFreeHeap() < 60 * 1024 || ESP.getMaxAllocHeap() < 40 * 1024) {
-    // if (!EMSESP::system_.PSram() && (ESP.getFreeHeap() < 60 * 1024 || ESP.getMaxAllocHeap() < 40 * 1024)) {
-    if (heap_caps_get_free_size(MALLOC_CAP_8BIT) < 40 * 1024) { // checks free Heap+PSRAM
+    if (!EMSESP::system_.PSram() && (ESP.getFreeHeap() < 60 * 1024 || ESP.getMaxAllocHeap() < 40 * 1024)) {
+    // if (heap_caps_get_free_size(MALLOC_CAP_8BIT) < 40 * 1024) { // checks free Heap+PSRAM
         if (operation == Operation::PUBLISH) {
             mqtt_message_id_++;
             mqtt_publish_fails_++;
         }
-        LOG_WARNING("%s failed: low memory", operation == Operation::PUBLISH ? "Publish" : operation == Operation::SUBSCRIBE ? "Subscribe" : "Unsubscribe");
+        LOG_WARNING("%s %s failed: low memory", operation == Operation::PUBLISH ? "Publish" : operation == Operation::SUBSCRIBE ? "Subscribe" : "Unsubscribe", topic.c_str());
         return false; // quit
     }
     if (queuecount_ >= MQTT_QUEUE_MAX_SIZE) {