Change SerialBridge command SSerialSend9 replaced by SSerialMode

- Bump version v14.1.0.2
arendst · Jun 11, 2024 · 87148ae · 87148ae
1 parent 7e8bcd8
commit 87148ae
Show file tree

Hide file tree

Showing 7 changed files with 172 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,19 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - Development
 
-## [14.1.0.1]
+## [14.1.0.2]
+### Added
+
+### Breaking Changed
+
+### Changed
+- SerialBridge command ``SSerialSend9`` replaced by ``SSerialMode``
+
+### Fixed
+
+### Removed
+
+## [14.1.0.1] 20240611
 ### Added
 - Berry solidification of `bytes` instances (#21558)
 - Matter support for Air Quality sensors (#21559)
@@ -13,8 +25,6 @@ All notable changes to this project will be documented in this file.
 - Berry add `math.round` (#21602)
 - Support for QMP6988 temperature and pressure sensor
 
-### Breaking Changed
-
 ### Changed
 - Matter refactoring of bridged devices (#21575)
 - 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.
 ### Fixed
 - Berry `input()` returns empty string and does not crash (#21565)
 
-### Removed
-
 ## [Released]
 
 ## [14.1.0] 20240603

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -119,7 +119,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 [Complete list](BUILDS.md) of available feature and sensors.
 
-## Changelog v14.1.0.1
+## Changelog v14.1.0.2
 ### Added
 - Support for QMP6988 temperature and pressure sensor
 - 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
 - Optional MQTT_TELE_RETAIN to Energy Margins message replaced by ``SensorRetain``
 - Display timing splash screen with display modes 1 to 5
 - Allow receive or send using SerialBridge
+- SerialBridge command ``SSerialSend9`` replaced by ``SSerialMode``
 - ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 [#21569](https://github.com/arendst/Tasmota/issues/21569)
 - ESP32 MI32 refactoring, bugfixes, generic device scanning [#21603](https://github.com/arendst/Tasmota/issues/21603)
 - Matter refactoring of bridged devices [#21575](https://github.com/arendst/Tasmota/issues/21575)

diff --git a/tasmota/include/i18n.h b/tasmota/include/i18n.h
@@ -609,6 +609,7 @@
 // Commands xdrv_08_serial_bridge.ino
 #define D_CMND_SSERIALSEND "SSerialSend"
 #define D_CMND_SBAUDRATE "SBaudrate"
+#define D_CMND_SSERIALMODE "SSerialMode"
 #define D_CMND_SSERIALBUFFER "SSerialBuffer"
 #define D_CMND_SSERIALCONFIG "SSerialConfig"
  #define D_JSON_SSERIALRECEIVED "SSerialReceived"

diff --git a/tasmota/include/tasmota_types.h b/tasmota/include/tasmota_types.h
@@ -286,7 +286,7 @@ typedef union {
  uint32_t sspm_display : 1; // bit 8 (v10.0.0.4) - CMND_SSPMDISPLAY - Enable gui display of powered on relays only
  uint32_t local_ntp_server : 1; // bit 9 (v11.0.0.4) - CMND_RTCNTPSERVER - Enable local NTP server
  uint32_t influxdb_sensor : 1; // bit 10 (v11.0.0.5) - CMND_IFXSENSOR - Enable sensor support in addition to teleperiod support
- uint32_t serbridge_console : 1;  // bit 11 (v11.1.0.4) - CMND_SSERIALSEND9 - Enable logging tee to serialbridge
+ uint32_t ex_serbridge_console : 1; // bit 11 (v11.1.0.4) - (v14.1.0.2) Replaced by CMND_SSERIALMODE
  uint32_t telegram_disable_af : 1; // bit 12 (v14.0.0.2) - CMND_TMSTATE 6/7 - Disable Telegram auto-fingerprint fix
  uint32_t spare13 : 1; // bit 13
  uint32_t spare14 : 1; // bit 14
@@ -515,6 +515,7 @@ typedef struct {
  uint8_t text_pool_290[66]; // 290
 
  // End of single char array of 698 chars max ****************
+
  uint8_t display_model; // 2D2
  uint8_t display_mode; // 2D3
  uint8_t display_refresh; // 2D4
@@ -832,9 +833,7 @@ typedef struct {
  uint8_t windmeter_tele_pchange; // F3E
  uint8_t ledpwm_on; // F3F
  uint8_t ledpwm_off; // F40
-
- uint8_t ex_tcp_baudrate; // F41 ex_tcp_baudrate, free since v14.0.0.4 
-
+ uint8_t sserial_mode; // F41
  uint8_t fallback_module; // F42
  uint8_t shutter_mode; // F43
  uint16_t energy_power_delta[3]; // F44

diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h
@@ -22,6 +22,6 @@
 
 #define TASMOTA_SHA_SHORT // Filled by Github sed
 
-const uint32_t TASMOTA_VERSION = 0x0E010001; // 14.1.0.1
+const uint32_t TASMOTA_VERSION = 0x0E010002; // 14.1.0.2
 
 #endif // _TASMOTA_VERSION_H_
diff --git a/tasmota/tasmota_support/settings.ino b/tasmota/tasmota_support/settings.ino
@@ -1817,7 +1817,10 @@ void SettingsDelta(void) {
  Settings->power_lock = 0;
  }
  if (Settings->version < 0x0E000004) { // 14.0.0.4
- Settings->tcp_baudrate = (uint16_t)Settings->ex_tcp_baudrate * 4;
+ Settings->tcp_baudrate = (uint16_t)Settings->sserial_mode * 4;
+ }
+ if (Settings->version < 0x0E010002) { // 14.1.0.2
+ Settings->sserial_mode = Settings->sbflag1.ex_serbridge_console;
  }
 
  Settings->version = TASMOTA_VERSION;