Revert heap_caps_free to cJSON_free

Slider0007 · Nov 3, 2024 · b587d0a · b587d0a
1 parent 1fd286a
commit b587d0a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/code/components/fileserver_ota/server_file.cpp b/code/components/fileserver_ota/server_file.cpp
@@ -92,7 +92,7 @@ esp_err_t getDataFileList(httpd_req_t *req)
 
     if (jsonChar != NULL) {
         retVal = httpd_resp_send(req, jsonChar, strlen(jsonChar));
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
     }
 
     return retVal;
@@ -147,7 +147,7 @@ esp_err_t getTfliteFileList(httpd_req_t *req)
 
     if (jsonChar != NULL) {
         retVal = httpd_resp_send(req, jsonChar, strlen(jsonChar));
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
     }
 
     return retVal;
@@ -199,7 +199,7 @@ esp_err_t getCertFileList(httpd_req_t *req)
 
     if (jsonChar != NULL) {
         retVal = httpd_resp_send(req, jsonChar, strlen(jsonChar));
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
     }
 
     return retVal;

diff --git a/code/components/gpio_ctrl/gpioPin.cpp b/code/components/gpio_ctrl/gpioPin.cpp
@@ -226,7 +226,7 @@ bool GpioPin::mqttPublishPinState(int _pwmDuty)
 
         if (jsonChar != NULL) {
             retVal &= MQTTPublish(mqttTopic + "/state", std::string(jsonChar), 1);
-            heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+            cJSON_free(jsonChar);
         }
 
         if (!retVal) {

diff --git a/code/components/mainprocess_ctrl/ClassFlowMQTT.cpp b/code/components/mainprocess_ctrl/ClassFlowMQTT.cpp
@@ -178,7 +178,7 @@ bool ClassFlowMQTT::doFlow(std::string zwtime)
             if (jsonChar != NULL) {
                 retValData &= MQTTPublish(cfgDataPtr->mainTopic + "/process/data/" + std::to_string(sequence->sequenceId) + "/json",
                                         std::string(jsonChar), MQTT_QOS, cfgDataPtr->retainProcessData);
-                heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+                cJSON_free(jsonChar);
             }
         }
 

diff --git a/code/components/mainprocess_ctrl/ClassFlowWebhook.cpp b/code/components/mainprocess_ctrl/ClassFlowWebhook.cpp
@@ -122,7 +122,7 @@ bool ClassFlowWebhook::doFlow(std::string zwtime)
                 setFlowStateHandlerEvent(1); // Set warning event code, continue process flow
             }
         }
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
     }
 
     if (!getFlowState()->isSuccessful)

diff --git a/code/components/mqtt_ctrl/server_mqtt.cpp b/code/components/mqtt_ctrl/server_mqtt.cpp
@@ -104,7 +104,7 @@ bool mqttServer_publishDeviceInfo(int _qos)
 
     if (jsonChar != NULL) {
         retVal &= MQTTPublish(cfgDataPtr->mainTopic + deviceInfoTopic + "hardware", std::string(jsonChar), _qos, true);
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
         jsonChar = NULL;
     }
 
@@ -128,7 +128,7 @@ bool mqttServer_publishDeviceInfo(int _qos)
 
     if (jsonChar != NULL) {
         retVal &= MQTTPublish(cfgDataPtr->mainTopic + deviceInfoTopic + "network", std::string(jsonChar), _qos, true);
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
         jsonChar = NULL;
     }
 
@@ -194,7 +194,7 @@ bool mqttServer_publishDeviceStatus(int _qos)
 
     if (jsonChar != NULL) {
         retVal &= MQTTPublish(cfgDataPtr->mainTopic + deviceStatusTopic + "heap", std::string(jsonChar), _qos, false);
-        heap_caps_free(jsonChar); // Avoid using cJSON_Delete, because configClass using modified cJSON initHooks
+        cJSON_free(jsonChar);
     }
 
     retVal &= MQTTPublish(cfgDataPtr->mainTopic + deviceStatusTopic + "sd_partition_free", std::to_string(getSDCardFreePartitionSpace()), _qos, false);