Merge pull request #1291 from proddy/dev

preparing 3.7.0

CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.1] September 9 2023
+
+## **IMPORTANT! BREAKING CHANGES**
+
+- `shower_data` MQTT topic shows duration is seconds (was previously a full english sentence)
+
+## Added
+
+- show WiFi rssi in Network Status Page, show quality as color
+
+## Fixed
+
+- Issue in espMqttClient causing a memory leak when MQTT broker is disconnected due to network unavailability [#1264](https://github.com/emsesp/EMS-ESP32/issues/1264)
+- Using MQTT enum values correctly formatted in MQTT Discovery [#1280](https://github.com/emsesp/EMS-ESP32/issues/1280)
+
+## Changed
+
+- mqtt free mem check set to 60 kb
+- small cosmetic changes to Searching in Customization web page
+- updated to espressif32@6.4.0
+
 # [3.6.0] August 13 2023
 
 ## **IMPORTANT! BREAKING CHANGES**

CHANGELOG_LATEST.md

@@ -4,19 +4,8 @@
 
 ## **IMPORTANT! BREAKING CHANGES**
 
-- `shower_data` MQTT topic shows duration is seconds (was previously a full english sentence)
-
 ## Added
 
-- show WiFi rssi in Network Status Page, show quality as color
-
 ## Fixed
 
-- Issue in espMqttClient causing a memory leak when MQTT broker is disconnected due to network unavailability [#1264](https://github.com/emsesp/EMS-ESP32/issues/1264)
-- Using MQTT enum values correctly formatted in MQTT Discovery [#1280](https://github.com/emsesp/EMS-ESP32/issues/1280)
-
 ## Changed
-
-- mqtt free mem check set to 60 kb
-- small cosmetic changes to Searching in Customization web page
-- updated to espressif32@6.4.0

platformio.ini

@@ -17,10 +17,10 @@ core_build_flags =
   -D NDEBUG
   -D ARDUINO_ARCH_ESP32=1
   -D ESP32=1
-  ; -std=gnu++17
+  -std=gnu++17
 
-; core_unbuild_flags = -std=gnu++11
-core_unbuild_flags =
+core_unbuild_flags = -std=gnu++11
+; core_unbuild_flags =
 
 ; my_build_flags is set in pio_local.ini
 my_build_flags =
@@ -39,7 +39,17 @@ unbuild_flags =
   ${common.core_unbuild_flags}
 
 [espressi32_base]
-platform = espressif32
+platform = espressif32@6.4.0
+framework = arduino
+build_flags = ${common.build_flags}
+build_unflags = ${common.unbuild_flags}
+extra_scripts =
+  pre:scripts/build_interface.py
+  scripts/rename_fw.py
+
+[espressi32_base_tasmota]
+  ; use Tasmota's 2.0.11 core based libary from https://github.com/tasmota/platform-espressif32 which removes some libs (like mbedtsl) and increases available heap
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.01/platform-espressif32.zip
 framework = arduino
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
@@ -64,9 +74,7 @@ check_flags =
 ; build for GitHub Actions CI
 ; the Web interface is built seperately
 [env:ci]
-extends = espressi32_base
-; stay on platform 6.3.2 until heap issue is solved
-platform = espressif32@6.3.2
+extends = espressi32_base_tasmota
 extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_build.partitions = esp32_partition_4M.csv
@@ -74,7 +82,6 @@ board_build.filesystem = littlefs
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
 
-; for github Actions actually standard platform is buggy, use dev-platform
 [env:ci_s3]
 extends = espressi32_base
 extra_scripts = scripts/rename_fw.py
@@ -86,27 +93,21 @@ build_flags = ${common.build_flags} -O2
 build_unflags = ${common.unbuild_flags}
 
 [env:esp32_4M]
-extends = espressi32_base
-; stay on platform 6.3.2 until heap issue is solved
-platform = espressif32@6.3.2
+extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
 build_flags = ${common.build_flags} -Os
 
 [env:esp32_4Mplus]
-extends = espressi32_base
-; stay on platform 6.3.2 until heap issue is solved
-platform = espressif32@6.3.2
+extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_asym_partition_4M.csv
 build_flags = ${common.build_flags}
 
 [env:esp32_16M]
-extends = espressi32_base
-; stay on platform 6.3.2 until heap issue is solved
-platform = espressif32@6.3.2
+extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.1-dev.2"
+#define EMSESP_APP_VERSION "3.7.0-dev.0"