jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-03 17:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issues and clean up old comments

Browse Source
This commit is contained in:
Kevin Ahrendt 2025-07-14 10:47:38 -04:00
parent a1281febe9
commit 815744b0f6
1 changed files with 29 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
esphome/components/json/json_util.cpp
View File

@ -26,59 +26,41 @@ struct SpiRamAllocator : ArduinoJson::Allocator {
}; };
std::string build_json(const json_build_t &f) { std::string build_json(const json_build_t &f) {
// Here we are allocating up to 5kb of memory, auto doc_allocator = SpiRamAllocator();
// with the heap size minus 2kb to be safe if less than 5kb JsonDocument json_document(&doc_allocator);
// as we can not have a true dynamic sized document. if (json_document.overflowed()) {
// The excess memory is freed below with `shrinkToFit()` ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
while (true) { return "{}";
auto doc_allocator = SpiRamAllocator();
JsonDocument json_document(&doc_allocator);
if (json_document.overflowed()) {
ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
return "{}";
}
JsonObject root = json_document.to<JsonObject>();
f(root);
if (json_document.overflowed()) {
if (request_size == free_heap) {
ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
return "{}";
}
request_size = std::min(request_size * 2, free_heap);
continue;
}
std::string output;
serializeJson(json_document, output);
return output;
} }
JsonObject root = json_document.to<JsonObject>();
f(root);
if (json_document.overflowed()) {
ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
return "{}";
}
std::string output;
serializeJson(json_document, output);
return output;
} }
bool parse_json(const std::string &data, const json_parse_t &f) { bool parse_json(const std::string &data, const json_parse_t &f) {
// Here we are allocating 1.5 times the data size, auto doc_allocator = SpiRamAllocator();
// with the heap size minus 2kb to be safe if less than that JsonDocument json_document(&doc_allocator);
// as we can not have a true dynamic sized document. if (json_document.overflowed()) {
// The excess memory is freed below with `shrinkToFit()` ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
while (true) { return false;
auto doc_allocator = SpiRamAllocator(); }
JsonDocument json_document(&doc_allocator); DeserializationError err = deserializeJson(json_document, data);
if (json_document.overflowed()) {
ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
return false;
}
DeserializationError err = deserializeJson(json_document, data);
JsonObject root = json_document.as<JsonObject>(); JsonObject root = json_document.as<JsonObject>();
if (err == DeserializationError::Ok) { if (err == DeserializationError::Ok) {
return f(root); return f(root);
} else if (err == DeserializationError::NoMemory) { } else if (err == DeserializationError::NoMemory) {
ESP_LOGE(TAG, "Can not allocate more memory for deserialization. Consider making source string smaller"); ESP_LOGE(TAG, "Can not allocate more memory for deserialization. Consider making source string smaller");
return false; return false;
} else { }
ESP_LOGE(TAG, "Parse error: %s", err.c_str()); ESP_LOGE(TAG, "Parse error: %s", err.c_str());
return false;
}
};
return false; return false;
} }