Skip to content

Commit

Permalink
Merge branch 'pre-release-12.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
arendst committed Dec 16, 2022
2 parents ae12ce7 + ac731d0 commit e8edf97
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 15 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 5 additions & 3 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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``

Expand All @@ -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``

Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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)
8 changes: 4 additions & 4 deletions platformio_override_sample.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasmota/include/tasmota_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
10 changes: 5 additions & 5 deletions tasmota/my_user_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_7_plugin.ino
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e8edf97

Please sign in to comment.