diff --git a/.gitignore b/.gitignore index b16930c8..868aeb06 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ emsesp /interface/node_modules /interface/.eslintcache src/pid.cpp -src/pid.cpp +src/pid.h diff --git a/platformio.ini b/platformio.ini index 929857bf..da0cc711 100644 --- a/platformio.ini +++ b/platformio.ini @@ -70,10 +70,10 @@ board_build.f_cpu = 160000000L ; 160MHz ; eagle.flash.4m2m.ld = 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer ; board_build.ldscript = eagle.flash.4m2m.ld build_flags = ${common.build_flags} ${common.debug_flags} - -D PIO_FRAMEWORK_ARDUINO_MMU_CUSTOM - -D MMU_IRAM_SIZE=0xC000 - -D MMU_ICACHE_SIZE=0x4000 - -D MMU_IRAM_HEAP +; -D PIO_FRAMEWORK_ARDUINO_MMU_CUSTOM +; -D MMU_IRAM_SIZE=0xC000 +; -D MMU_ICACHE_SIZE=0x4000 +; -D MMU_IRAM_HEAP -D FLASH_MAP_SUPPORT=1 lib_ignore = AsyncTCP diff --git a/src/emsesp.h b/src/emsesp.h index 3c93ca90..e5305b16 100644 --- a/src/emsesp.h +++ b/src/emsesp.h @@ -52,14 +52,21 @@ #define WATCH_ID_NONE 0 // no watch id set -#define EMSESP_MAX_JSON_SIZE_HA_CONFIG min(384,ESP.getMaxFreeBlockSize() - 512) // for small HA config payloads, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_HA_CONFIG 384 // for small HA config payloads, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_SMALL 256 // for smaller json docs, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_MEDIUM 768 // for medium json docs from ems devices, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_LARGE 1924 // for large json docs from ems devices, like boiler or thermostat data, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_MEDIUM_DYN 1024 // for large json docs, using DynamicJsonDocument +#define EMSESP_MAX_JSON_SIZE_LARGE_DYN 2048 // for very large json docs, using DynamicJsonDocument +#define EMSESP_MAX_JSON_SIZE_MAX_DYN 4096 // for very very large json docs, using DynamicJsonDocument +/* #define EMSESP_MAX_JSON_SIZE_HA_CONFIG min(384,ESP.getMaxFreeBlockSize() - 512) // for small HA config payloads, using StaticJsonDocument #define EMSESP_MAX_JSON_SIZE_SMALL min(256,ESP.getMaxFreeBlockSize() - 512) // for smaller json docs, using StaticJsonDocument #define EMSESP_MAX_JSON_SIZE_MEDIUM min(768,ESP.getMaxFreeBlockSize() - 512) // for medium json docs from ems devices, using StaticJsonDocument #define EMSESP_MAX_JSON_SIZE_LARGE min(1024,ESP.getMaxFreeBlockSize() - 512) // for large json docs from ems devices, like boiler or thermostat data, using StaticJsonDocument #define EMSESP_MAX_JSON_SIZE_MEDIUM_DYN min(1024,ESP.getMaxFreeBlockSize() - 512) // for large json docs, using DynamicJsonDocument #define EMSESP_MAX_JSON_SIZE_LARGE_DYN min(2048,ESP.getMaxFreeBlockSize() - 512) // for very large json docs, using DynamicJsonDocument #define EMSESP_MAX_JSON_SIZE_MAX_DYN min(4096,ESP.getMaxFreeBlockSize() - 512) // for very very large json docs, using DynamicJsonDocument - + */ namespace emsesp { class Shower; // forward declaration for compiler diff --git a/src/version.h b/src/version.h index 184ece38..77aab5c1 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define EMSESP_APP_VERSION "2.3.1b0" +#define EMSESP_APP_VERSION "2.3.1b1" #define EMSESP_PLATFORM "ESP8266"