From 8eb7b007d5a4a3f28178fe3618ebead444f7877f Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 3 Oct 2022 18:02:50 +0200 Subject: [PATCH] Support for Shelly Plus 2PM - Version bump to v12.1.1.4 - Support for Shelly Plus 2PM using template ``{"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3457,0,0,0,0,0,9472,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}`` --- CHANGELOG.md | 15 ++++++++++----- RELEASENOTES.md | 5 +++-- tasmota/include/tasmota_version.h | 2 +- tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3cc815a1..6ea7974d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,18 +3,23 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [12.1.1.3] +## [12.1.1.4] ### Added -- ESP32-S2 and ESP32-S3 touch input support -- Zigbee friendly names per endpoint - +- Support for Shelly Plus 2PM using template ``{"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3457,0,0,0,0,0,9472,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}`` ### Changed ### Fixed -- ESP32 touch button multi-press and hold detection (#16596) ### Removed +## [12.1.1.3] 20221003 +### Added +- ESP32-S2 and ESP32-S3 touch button support +- Zigbee friendly names per endpoint + +### Fixed +- ESP32 touch button multi-press and hold detection (#16596) + ## [12.1.1.2] 20220927 ### Added - Berry has persistent MQTT subscriptions: auto-subscribe at (re)connection diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0adcc81fd..9da6261d7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -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.1.1.3 +## Changelog v12.1.1.4 ### Added - Command ``SetOption46 0..255`` to add 0..255 * 10 milliseconds power on delay before initializing I/O [#15438](https://github.com/arendst/Tasmota/issues/15438) - Command ``SetOption146 1`` to enable display of ESP32 internal temperature @@ -121,11 +121,12 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - Support for DFRobot SEN0390 V30B ambient light sensor [#16105](https://github.com/arendst/Tasmota/issues/16105) - Zigbee device plugin mechanism with commands ``ZbLoad``, ``ZbUnload`` and ``ZbLoadDump`` [#16252](https://github.com/arendst/Tasmota/issues/16252) - Zigbee basic support for Green Power [#16407](https://github.com/arendst/Tasmota/issues/16407) +- Zigbee friendly names per endpoint - Flowrate meter flow amount/duration, show values in table format [#16385](https://github.com/arendst/Tasmota/issues/16385) - Support of optional file calib.dat on ADE7953 based energy monitors like Shelly EM [#16486](https://github.com/arendst/Tasmota/issues/16486) - Support for Ethernet in ESP32 safeboot firmware [#16388](https://github.com/arendst/Tasmota/issues/16388) - ESP32-S3 support for internal temperature sensor -- ESP32-S2 and ESP32-S3 touch input support +- ESP32-S2 and ESP32-S3 touch button support - Berry has persistent MQTT subscriptions: auto-subscribe at (re)connection - Berry automated solidification of code diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h index 2a74211ef..e22993eb5 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 = 0x0C010103; // 12.1.1.3 +const uint32_t VERSION = 0x0C010104; // 12.1.1.4 #endif // _TASMOTA_VERSION_H_ diff --git a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino index bd5eb4cc5..468f19b7a 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino @@ -26,7 +26,7 @@ * {"NAME":"Shelly 2.5","GPIO":[320,0,32,0,224,193,0,0,640,192,608,225,3456,4736],"FLAG":0,"BASE":18} * {"NAME":"Shelly EM","GPIO":[0,0,0,0,0,0,0,0,640,3457,608,224,0,1],"FLAG":0,"BASE":18} * {"NAME":"Shelly Plus 2PM PCB v0.1.5","GPIO":[320,0,192,0,0,0,1,1,225,224,0,0,0,0,193,0,0,0,0,0,0,608,3840,32,0,0,0,0,0,640,0,0,3457,4736,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,32000,40000,3350"} - * {"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3457,0,0,0,0,0,0,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"} + * {"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3457,0,0,0,0,0,9472,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"} * * Based on datasheet from https://www.analog.com/en/products/ade7953.html *