Skip to content

Commit 87148ae

Browse files
committed
Change SerialBridge command SSerialSend9 replaced by SSerialMode
- Bump version v14.1.0.2
1 parent 7e8bcd8 commit 87148ae

File tree

7 files changed

+172
-66
lines changed

7 files changed

+172
-66
lines changed

CHANGELOG.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,19 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased] - Development
55

6-
## [14.1.0.1]
6+
## [14.1.0.2]
7+
### Added
8+
9+
### Breaking Changed
10+
11+
### Changed
12+
- SerialBridge command ``SSerialSend9`` replaced by ``SSerialMode``
13+
14+
### Fixed
15+
16+
### Removed
17+
18+
## [14.1.0.1] 20240611
719
### Added
820
- Berry solidification of `bytes` instances (#21558)
921
- Matter support for Air Quality sensors (#21559)
@@ -13,8 +25,6 @@ All notable changes to this project will be documented in this file.
1325
- Berry add `math.round` (#21602)
1426
- Support for QMP6988 temperature and pressure sensor
1527

16-
### Breaking Changed
17-
1828
### Changed
1929
- Matter refactoring of bridged devices (#21575)
2030
- ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 (#21569)
@@ -27,8 +37,6 @@ All notable changes to this project will be documented in this file.
2737
### Fixed
2838
- Berry `input()` returns empty string and does not crash (#21565)
2939

30-
### Removed
31-
3240
## [Released]
3341

3442
## [14.1.0] 20240603

RELEASENOTES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
119119

120120
[Complete list](BUILDS.md) of available feature and sensors.
121121

122-
## Changelog v14.1.0.1
122+
## Changelog v14.1.0.2
123123
### Added
124124
- Support for QMP6988 temperature and pressure sensor
125125
- Berry solidification of `bytes` instances [#21558](https://github.com/arendst/Tasmota/issues/21558)
@@ -133,6 +133,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
133133
- Optional MQTT_TELE_RETAIN to Energy Margins message replaced by ``SensorRetain``
134134
- Display timing splash screen with display modes 1 to 5
135135
- Allow receive or send using SerialBridge
136+
- SerialBridge command ``SSerialSend9`` replaced by ``SSerialMode``
136137
- ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 [#21569](https://github.com/arendst/Tasmota/issues/21569)
137138
- ESP32 MI32 refactoring, bugfixes, generic device scanning [#21603](https://github.com/arendst/Tasmota/issues/21603)
138139
- Matter refactoring of bridged devices [#21575](https://github.com/arendst/Tasmota/issues/21575)

tasmota/include/i18n.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
// Commands xdrv_08_serial_bridge.ino
610610
#define D_CMND_SSERIALSEND "SSerialSend"
611611
#define D_CMND_SBAUDRATE "SBaudrate"
612+
#define D_CMND_SSERIALMODE "SSerialMode"
612613
#define D_CMND_SSERIALBUFFER "SSerialBuffer"
613614
#define D_CMND_SSERIALCONFIG "SSerialConfig"
614615
#define D_JSON_SSERIALRECEIVED "SSerialReceived"

tasmota/include/tasmota_types.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ typedef union {
286286
uint32_t sspm_display : 1; // bit 8 (v10.0.0.4) - CMND_SSPMDISPLAY - Enable gui display of powered on relays only
287287
uint32_t local_ntp_server : 1; // bit 9 (v11.0.0.4) - CMND_RTCNTPSERVER - Enable local NTP server
288288
uint32_t influxdb_sensor : 1; // bit 10 (v11.0.0.5) - CMND_IFXSENSOR - Enable sensor support in addition to teleperiod support
289-
uint32_t serbridge_console : 1; // bit 11 (v11.1.0.4) - CMND_SSERIALSEND9 - Enable logging tee to serialbridge
289+
uint32_t ex_serbridge_console : 1; // bit 11 (v11.1.0.4) - (v14.1.0.2) Replaced by CMND_SSERIALMODE
290290
uint32_t telegram_disable_af : 1; // bit 12 (v14.0.0.2) - CMND_TMSTATE 6/7 - Disable Telegram auto-fingerprint fix
291291
uint32_t spare13 : 1; // bit 13
292292
uint32_t spare14 : 1; // bit 14
@@ -515,6 +515,7 @@ typedef struct {
515515
uint8_t text_pool_290[66]; // 290
516516

517517
// End of single char array of 698 chars max ****************
518+
518519
uint8_t display_model; // 2D2
519520
uint8_t display_mode; // 2D3
520521
uint8_t display_refresh; // 2D4
@@ -832,9 +833,7 @@ typedef struct {
832833
uint8_t windmeter_tele_pchange; // F3E
833834
uint8_t ledpwm_on; // F3F
834835
uint8_t ledpwm_off; // F40
835-
836-
uint8_t ex_tcp_baudrate; // F41 ex_tcp_baudrate, free since v14.0.0.4
837-
836+
uint8_t sserial_mode; // F41
838837
uint8_t fallback_module; // F42
839838
uint8_t shutter_mode; // F43
840839
uint16_t energy_power_delta[3]; // F44

tasmota/include/tasmota_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222

2323
#define TASMOTA_SHA_SHORT // Filled by Github sed
2424

25-
const uint32_t TASMOTA_VERSION = 0x0E010001; // 14.1.0.1
25+
const uint32_t TASMOTA_VERSION = 0x0E010002; // 14.1.0.2
2626

2727
#endif // _TASMOTA_VERSION_H_

tasmota/tasmota_support/settings.ino

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,10 @@ void SettingsDelta(void) {
18171817
Settings->power_lock = 0;
18181818
}
18191819
if (Settings->version < 0x0E000004) { // 14.0.0.4
1820-
Settings->tcp_baudrate = (uint16_t)Settings->ex_tcp_baudrate * 4;
1820+
Settings->tcp_baudrate = (uint16_t)Settings->sserial_mode * 4;
1821+
}
1822+
if (Settings->version < 0x0E010002) { // 14.1.0.2
1823+
Settings->sserial_mode = Settings->sbflag1.ex_serbridge_console;
18211824
}
18221825

18231826
Settings->version = TASMOTA_VERSION;

0 commit comments

Comments
 (0)