Fix Modbus serial config

This commit is contained in:
Theo Arends 2022-01-06 14:06:56 +01:00
parent 1e6b78a957
commit 479b378707
16 changed files with 16 additions and 9 deletions

View File

@ -9,12 +9,15 @@ All notable changes to this project will be documented in this file.
### Changed
- PubSubClient library from v2.8.12 to v2.8.13
- TasmotaSerial library from v3.3.0 to v3.4.0
- TasmotaModbus library from v1.2.0 to v3.4.0
- From Semantic Versioning (SemVer) to Calendar Versioning (CalVer)
- Set ESP32 stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics
- Berry stores compiled bytecode into IRAM, freeing space in heap
- ESP32 Set stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics
- ESP32 Berry stores compiled bytecode into IRAM, freeing space in heap (#14307)
### Fixed
- Intermittent exceptions and heap corruption due to PubSubClient library buffer overflow (#13700)
- Modbus serial config regression from v10.1.0.3
## [10.1.0.3] 20211231
### Added

View File

@ -114,11 +114,15 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
### Changed
- PubSubClient library from v2.8.12 to v2.8.13
- TasmotaSerial library from v3.3.0 to v3.4.0
- TasmotaModbus library from v1.2.0 to v3.4.0
- ESP8266Audio library from v1.9.2 to v1.9.5
- ESP8266SAM library from v1.0 to v1.0.1
- From Semantic Versioning (SemVer) to Calendar Versioning (CalVer)
- Mitsubishi HVAC temperature resolution [#13936](https://github.com/arendst/Tasmota/issues/13936)
- Remove restriction of topic must differ from mqttclient [#14019](https://github.com/arendst/Tasmota/issues/14019)
- ESP32 Set stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics
- ESP32 Berry stores compiled bytecode into IRAM, freeing space in heap [#14307](https://github.com/arendst/Tasmota/issues/14307)
### Fixed
- Intermittent exceptions and heap corruption due to PubSubClient library buffer overflow [#13700](https://github.com/arendst/Tasmota/issues/13700)

View File

@ -1,6 +1,6 @@
{
"name": "TasmotaSerial",
"version": "3.3.0",
"version": "3.4.0",
"keywords": [
"serial", "io", "TasmotaSerial"
],

View File

@ -1,5 +1,5 @@
name=TasmotaSerial
version=3.3.0
version=3.4.0
author=Theo Arends
maintainer=Theo Arends <theo@arends.com>
sentence=Implementation of software serial with hardware serial fallback for ESP8266 and ESP32.

View File

@ -1,6 +1,6 @@
{
"name": "TasmotaModbus",
"version": "1.2.0",
"version": "3.4.0",
"keywords": [
"serial", "io", "TasmotaModbus"
],

View File

@ -1,5 +1,5 @@
name=TasmotaModbus
version=1.2.0
version=3.4.0
author=Theo Arends
maintainer=Theo Arends <theo@arends.com>
sentence=Basic modbus wrapper for TasmotaSerial for ESP8266.

View File

@ -42,11 +42,11 @@ uint16_t TasmotaModbus::CalculateCRC(uint8_t *frame, uint8_t num)
return crc;
}
int TasmotaModbus::Begin(long speed, int stop_bits)
int TasmotaModbus::Begin(long speed, uint32_t config)
{
int result = 0;
if (begin(speed, stop_bits)) {
if (begin(speed, config)) {
result = 1;
if (hardwareSerial()) { result = 2; }
}

View File

@ -30,7 +30,7 @@ class TasmotaModbus : public TasmotaSerial {
TasmotaModbus(int receive_pin, int transmit_pin);
virtual ~TasmotaModbus() {}
int Begin(long speed = TM_MODBUS_BAUDRATE, int stop_bits = 1);
int Begin(long speed = TM_MODBUS_BAUDRATE, uint32_t config = SERIAL_8N1);
uint16_t CalculateCRC(uint8_t *frame, uint8_t num);