Merge pull request #3261 from esphome/bump-2022.2.6

2022.2.6
Bump version to 2022.2.6
2022-03-02 22:54:51 +13:00 · 2022-03-02 17:07:08 +13:00 · 2022-03-02 17:07:08 +13:00
2 changed files with 3 additions and 3 deletions
--- a/esphome/components/json/json_util.cpp
+++ b/esphome/components/json/json_util.cpp
@@ -22,7 +22,7 @@ std::string build_json(const json_build_t &f) {
 #ifdef USE_ESP8266
  const size_t free_heap = ESP.getMaxFreeBlockSize() - 2048;  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
-  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT) - 2048;
+  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL) - 2048;
 #endif

  DynamicJsonDocument json_document(free_heap);
@@ -42,7 +42,7 @@ void parse_json(const std::string &data, const json_parse_t &f) {
 #ifdef USE_ESP8266
  const size_t free_heap = ESP.getMaxFreeBlockSize() - 2048;  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
-  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT) - 2048;
+  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL) - 2048;
 #endif

  DynamicJsonDocument json_document(free_heap);
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""

-__version__ = "2022.2.5"
+__version__ = "2022.2.6"

 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
Author	SHA1	Message	Date
Jesse Hills	1ef6fd8fb0	Merge pull request #3261 from esphome/bump-2022.2.6 2022.2.6	2022-03-02 22:54:51 +13:00
Jesse Hills	942b0de7fd	Bump version to 2022.2.6	2022-03-02 17:07:08 +13:00
Jesse Hills	859cca49d1	Only get free memory size from internal (#3259 )	2022-03-02 17:07:08 +13:00