From 82b6d1ee9102b350bdfe545f0033527def1b18f4 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 15 Jan 2023 17:45:59 +0100 Subject: [PATCH] Bump version to v12.3.1.4 --- CHANGELOG.md | 18 ++++++++++++------ RELEASENOTES.md | 2 +- tasmota/include/tasmota_version.h | 2 +- tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino | 10 +++++----- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f8c20e1..70dd1dee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,16 +3,24 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [12.3.1.3] +## [12.3.1.4] +### Added + +### Breaking Changed + +### Changed + +### Fixed + +### Removed + +## [12.3.1.3] 20230115 ### Added - Support for PCA9632 4-channel 8-bit PWM driver as light driver by Pascal Heinrich (#17557) - Berry `bytes()` now evaluates to `false` if empty - Berry ``crypto.AES_CCM`` (required by Matter protocol) - ESP32 support for BMPxxx sensors on two I2C busses (#17643) - Berry add implicit ``_class`` parameter to static methods -- Berry add ``static class`` to declare inner classes - -### Breaking Changed ### Changed - Energy totals max supported value from +/-21474.83647 to +/-2147483.647 kWh @@ -28,8 +36,6 @@ All notable changes to this project will be documented in this file. - Rename ``tasmota4M.bin`` to ``tasmota-4M.bin`` to solve use of ``tasmota-minimal.bin`` (#17674) - DNS lookup for ``upload`` from ota server using http regression from v12.3.1.1 -### Removed - ## [12.3.1.2] 20221231 ### Added - Berry crypto add ``EC_P256`` and ``PBKDF2_HMAC_SHA256`` algorithms required by Matter protocol diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9aa0b4f61..a35c8136a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -107,7 +107,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 v12.3.1.3 +## Changelog v12.3.1.4 ### Added - Support for up to 3 single phase modbus energy monitoring device using generic Energy Modbus driver- Support for RGB displays [#17414](https://github.com/arendst/Tasmota/issues/17414) - Support for IPv6 DNS records (AAAA) and IPv6 ``Ping`` for ESP32 and ESP8266 [#17417](https://github.com/arendst/Tasmota/issues/17417) diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h index ff08a85fb..39ddb7b90 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 = 0x0C030103; // 12.3.1.3 +const uint32_t VERSION = 0x0C030104; // 12.3.1.4 #endif // _TASMOTA_VERSION_H_ diff --git a/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino b/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino index bc8f588f0..c2f17bfd8 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_09_bmp.ino @@ -71,7 +71,7 @@ typedef struct { float bmp_humidity; } bmp_sensors_t; -uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2, BMP_ADDR1, BMP_ADDR2}; +uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2 }; uint8_t bmp_count = 0; uint8_t bmp_once = 1; @@ -487,10 +487,10 @@ void BmpDetect(void) { for (uint32_t i = 0; i < BMP_MAX_SENSORS; i++) { uint8_t bus = i >>1; - if (!I2cSetDevice(bmp_addresses[i], bus)) { continue; } - uint8_t bmp_type = I2cRead8(bmp_addresses[i], BMP_REGISTER_CHIPID, bus); + if (!I2cSetDevice(bmp_addresses[i &1], bus)) { continue; } + uint8_t bmp_type = I2cRead8(bmp_addresses[i &1], BMP_REGISTER_CHIPID, bus); if (bmp_type) { - bmp_sensors[bmp_count].bmp_address = bmp_addresses[i]; + bmp_sensors[bmp_count].bmp_address = bmp_addresses[i &1]; bmp_sensors[bmp_count].bmp_bus = bus; bmp_sensors[bmp_count].bmp_type = bmp_type; bmp_sensors[bmp_count].bmp_model = 0; @@ -560,7 +560,7 @@ void BmpShow(bool json) { for (uint32_t i = 1; i < bmp_count; i++) { if (bus != bmp_sensors[i].bmp_bus) { // Different busses // BMP280-77-1 - snprintf_P(name, sizeof(name), PSTR("%s%c%1d"), name, IndexSeparator(), bmp_sensors[bmp_idx].bmp_bus +1); + snprintf_P(name, sizeof(name), PSTR("%s%c%d"), name, IndexSeparator(), bmp_sensors[bmp_idx].bmp_bus +1); break; } }