From ac731d08fbe3cc84e5aa1617c3cc2dfd99c58669 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 16 Dec 2022 09:36:08 +0100 Subject: [PATCH] Fix ESP8266 zifbee exception 3 --- CHANGELOG.md | 10 ++++++++++ RELEASENOTES.md | 8 +++++--- platformio_override_sample.ini | 8 ++++---- tasmota/include/tasmota_version.h | 2 +- tasmota/my_user_config.h | 10 +++++----- .../tasmota_xdrv_driver/xdrv_23_zigbee_7_7_plugin.ino | 4 ++-- 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2e2a23fc080..c16286d9602e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. ## [Released] +## [12.3.1] 20221216 +- Release Percy + +## [12.3.0.1] 20221216 +### Changed +- ESP32 initial otaurl from http to https + +### Fixed +- ESP8266 zigbee exception 3 regression from v12.3.0 (#17397) + ## [12.3.0] 20221215 - Release Percy diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 85f2cfa46d9a..3e85cd33fdc3 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -72,7 +72,7 @@ Latest released binaries can be downloaded from - http://ota.tasmota.com/tasmota/release Historical binaries can be downloaded from -- http://ota.tasmota.com/tasmota/release-12.3.0 +- http://ota.tasmota.com/tasmota/release-12.3.1 The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz`` @@ -97,7 +97,7 @@ Latest released binaries can be downloaded from - http://ota.tasmota.com/tasmota32/release Historical binaries can be downloaded from -- http://ota.tasmota.com/tasmota32/release-12.3.0 +- http://ota.tasmota.com/tasmota32/release-12.3.1 The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota32/release/tasmota32.bin`` @@ -107,7 +107,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo [Complete list](BUILDS.md) of available feature and sensors. -## Changelog v12.3.0 Percy +## Changelog v12.3.1 Percy ### Added - Command ``SetOption35 0..255`` to skip number of received messages in Serial Bridge (default 0) [#17140](https://github.com/arendst/Tasmota/issues/17140) @@ -157,6 +157,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - Removed leading spaces on commands ``(S)SerialSend1 to 6`` but keep on duplicate commands ``(S)SerialSend11 to 16`` [#16723](https://github.com/arendst/Tasmota/issues/16723 - Shutter bug fixes and functionality upgrade [#17380](https://github.com/arendst/Tasmota/issues/17380 - MQTT now uses Tasmota's DNS resolver instead of LWIP [#17387](https://github.com/arendst/Tasmota/issues/17387 +- ESP32 initial otaurl from http to https ### Fixed - TasmotaSerial ``read(buffer, size)`` regression from v9.3.0 @@ -170,6 +171,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - Analog MQ exception 28 on restart [#17271](https://github.com/arendst/Tasmota/issues/17271) - RCSwitch exception 0/6 on some protocols [#17285](https://github.com/arendst/Tasmota/issues/17285) - ESP32 exception 28 when RtcNtpServer is enabled on restart [#17338](https://github.com/arendst/Tasmota/issues/17338) +- ESP8266 zigbee exception 3 regression from v12.3.0 [#17397](https://github.com/arendst/Tasmota/issues/17397) ### Removed - Define ``USE_PN532_DATA_RAW`` from NFC reader [#16939](https://github.com/arendst/Tasmota/issues/16939) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 5f36e32f4a59..3dcff4fae515 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -97,10 +97,10 @@ lib_extra_dirs = ${library.lib_extra_dirs} [env:tasmota32_base] ; *** Uncomment next lines ";" to enable development Tasmota Arduino version ESP32 -;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip -;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1008/framework-arduinoespressif32-IDF_Arduino-d772747b2.zip -; framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1014/framework-arduinoespressif32-solo1-IDF_Arduino-d772747b2.zip -; framework-arduino-ITEAD @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1013/framework-arduinoespressif32-ITEAD-IDF_Arduino-d772747b2.zip +;platform = https://github.com/tasmota/platform-espressif32.git +;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1088/framework-arduinoespressif32-release_v4.4-a0113c7bfe.zip +; framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1092/framework-arduinoespressif32-solo1-release_v4.4-a0113c7bfe.zip +; framework-arduino-ITEAD @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1091/framework-arduinoespressif32-ITEAD-release_v4.4-a0113c7bfe.zip ;build_unflags = ${esp32_defaults.build_unflags} ;build_flags = ${esp32_defaults.build_flags} ;board = esp32 diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h index 2665d17c2da2..6f40c002cb6c 100644 --- a/tasmota/include/tasmota_version.h +++ b/tasmota/include/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x0C030000; // 12.3.0.0 +const uint32_t VERSION = 0x0C030100; // 12.3.1.0 #endif // _TASMOTA_VERSION_H_ diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 8d2a50a6e1c4..0b879687f509 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -99,15 +99,15 @@ #endif // ESP8266 #ifdef ESP32 #ifdef CONFIG_IDF_TARGET_ESP32C3 -#define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32c3.bin" // [OtaUrl] +#define OTA_URL "https://ota.tasmota.com/tasmota32/release/tasmota32c3.bin" // [OtaUrl] #elif defined(CONFIG_IDF_TARGET_ESP32S2) -#define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32s2.bin" // [OtaUrl] +#define OTA_URL "https://ota.tasmota.com/tasmota32/release/tasmota32s2.bin" // [OtaUrl] #elif defined(CONFIG_IDF_TARGET_ESP32S3) -#define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32s3.bin" // [OtaUrl] +#define OTA_URL "https://ota.tasmota.com/tasmota32/release/tasmota32s3.bin" // [OtaUrl] #elif defined(CORE32SOLO1) -#define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32solo1.bin" // [OtaUrl] +#define OTA_URL "https://ota.tasmota.com/tasmota32/release/tasmota32solo1.bin" // [OtaUrl] #else -#define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32.bin" // [OtaUrl] +#define OTA_URL "https://ota.tasmota.com/tasmota32/release/tasmota32.bin" // [OtaUrl] #endif // CONFIG_IDF_TARGET_ESP32C3 #endif // ESP32 diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_7_plugin.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_7_plugin.ino index 75adbc2030f9..f6cc778d5757 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_7_plugin.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_7_plugin.ino @@ -165,8 +165,8 @@ bool ZbLoad_inner(const char *filename, File &fp) { if (filename_imported == nullptr) { // allocate only once the filename for multiple entries // freed only by `ZbUnload` - filename_imported = (char*) malloc(strlen(filename)+1); - strcpy(filename_imported, filename); + filename_imported = (char*) malloc(strlen_P(filename)+1); + strcpy_P(filename_imported, filename); } // there is a non-empty line, containing no space/tab/crlf