Merge branch 'development' into prerelease-13.2

CHANGELOG.md

@@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - ESP32 shutter frequency (#19717)
 - ModbusBridge write memory leak (#19758)
+- Zigbee timezone when device reads LocalTime attribute (#19772)
 
 ### Removed
 - WiFiClientSecure in favour of WiFiClientSecureLightBearSSL (#19725)

RELEASENOTES.md

@@ -116,7 +116,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - Commands to allow setting of timeprop parameters [#19310](https://github.com/arendst/Tasmota/issues/19310)
 - Command ``Mi32Name`` [#19619](https://github.com/arendst/Tasmota/issues/19619)
 - Variables ``%power<1..28>%`` and  ``%switch<1..28>%`` to rules [#19331](https://github.com/arendst/Tasmota/issues/19331)
-- Support different baudrates on BL0942
+- Support different baudrates on BL0942 energy monitor
 - Support for Shelly PlusPMMini, Plus1Mini and Plus1PMMini
 - Support for HDMI CEC protocol [#19434](https://github.com/arendst/Tasmota/issues/19434)
 - Support for ENS16x (air quality) and ENS210 (temp & RH) sensors [#19479](https://github.com/arendst/Tasmota/issues/19479)
@@ -148,6 +148,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - Exception 3 in IRHVAC [#19389](https://github.com/arendst/Tasmota/issues/19389)
 - PCF8574 mode 1 with base relays exception 3/28 regression from v12.4.0.4 [#19408](https://github.com/arendst/Tasmota/issues/19408)
 - ModbusBridge write memory leak [#19758](https://github.com/arendst/Tasmota/issues/19758)
+- Zigbee timezone when device reads LocalTime attribute [#19772](https://github.com/arendst/Tasmota/issues/19772)
 - ESP32 DS18x20 driver support extended over GPIO33
 - ESP32 Support for IPv6 link-local zones for esp-idf 5.1 (necessary for Matter)
 - ESP32 Shutter migration [#19454](https://github.com/arendst/Tasmota/issues/19454)
@@ -156,8 +157,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - ESP32 shutter frequency [#19717](https://github.com/arendst/Tasmota/issues/19717)
 - ESP32 Arduino Core v2 wifi client flush [#19642](https://github.com/arendst/Tasmota/issues/19642)
 - ESP32 Partition Wizard grow filesystem support [#19645](https://github.com/arendst/Tasmota/issues/19645)
-- ESP32C3 relay click on restart
+- ESP32-C3 relay click on restart
 - Matter support for Virtual Devices controllable via Rules or Berry [#19520](https://github.com/arendst/Tasmota/issues/19520)
 
 ### Removed
-- Removed support for Homekit in favour of Matter [#19738](https://github.com/arendst/Tasmota/issues/19738)
+- Support for Homekit in favour of Matter [#19738](https://github.com/arendst/Tasmota/issues/19738)

tasmota/include/xsns_62_esp32_mi.h

@@ -198,7 +198,7 @@ struct {
       uint32_t triggeredTele:1;
       uint32_t shallShowStatusInfo:1; // react to amount of found sensors via RULES
       uint32_t didGetConfig:1;
-      uint32_t didStartHAP:1;
+
       uint32_t triggerBerryAdvCB:1;
       uint32_t triggerBerryConnCB:1;
       uint32_t triggerNextConnJob:1;
@@ -230,12 +230,6 @@ struct {
 #endif //USE_ENERGY_SENSOR
 #endif //USE_MI_EXT_GUI
 
-#if USE_MI_HOMEKIT==1
-  void *outlet_hap_service[4]; //arbitrary chosen
-  int8_t HKconnectedControllers = 0; //should never be < 0
-  uint8_t HKinfoMsg = 0;
-  char hk_setup_code[11];
-#endif //USE_MI_HOMEKIT
   void *beConnCB;
   void *beAdvCB;
   void *beServerCB;
@@ -331,17 +325,6 @@ struct mi_sensor_t{
   union {
       uint8_t bat; // many values seem to be hard-coded garbage (LYWSD0x, GCD1)
   };
-#if USE_MI_HOMEKIT==1
-  //HAP handles
-  void *temp_hap_service;
-  void *hum_hap_service;
-  void *light_hap_service;
-  void *motion_hap_service;
-  void *door_sensor_hap_service;
-  void *button_hap_service[6];
-  void *bat_hap_service;
-  void *leak_hap_service;
-#endif //USE_MI_HOMEKIT
 };
 
 /*********************************************************************************************\
@@ -400,8 +383,6 @@ const char kMI32_ConnErrorMsg[] PROGMEM = "no Error|could not connect|did discon
 
 const char kMI32_BLEInfoMsg[] PROGMEM = "Scan ended|Got Notification|Did connect|Did disconnect|Still connected|Start passive scanning|Start active scanning|Server characteristic set|Server advertisement set|Server scan response set|Server client did connect|Server client did disconnect";
 
-const char kMI32_HKInfoMsg[] PROGMEM = "HAP core started|HAP core did not start!!|HAP controller disconnected|HAP controller connected|HAP outlet added";
-
 const char kMI32_ButtonMsg[] PROGMEM = "Single|Double|Hold"; //mapping: in Tasmota: 1,2,3 ; for HomeKit and Xiaomi 0,1,2
 /*********************************************************************************************\
  * enumerations
@@ -473,14 +454,6 @@ enum MI32_BLEInfoMsg {
   MI32_SERV_CLIENT_DISCONNECTED
 };
 
-enum MI32_HKInfoMsg {
-  MI32_HAP_DID_START = 1,
-  MI32_HAP_DID_NOT_START,
-  MI32_HAP_CONTROLLER_DISCONNECTED,
-  MI32_HAP_CONTROLLER_CONNECTED,
-  MI32_HAP_OUTLET_ADDED
-};
-
 /*********************************************************************************************\
  * extended web gui
 \*********************************************************************************************/
@@ -523,12 +496,6 @@ const char HTTP_MI32_PARENT_START[] PROGMEM =
       "<div class='box'><h2>MI32 Bridge</h2>"
           "Observing <span id='numDev'>%u</span> devices<br>"
           "Uptime: <span class='Ti'>%u</span> seconds<br>"
-#if USE_MI_HOMEKIT==1
-          "HomeKit setup code: %s<br>"
-          "HAP controller connections: %d<br>"
-#else
-          "HomeKit not enabled%s<br>"
-#endif //USE_MI_HOMEKIT
           "Free Heap: %u kB"
       "</div>";
 

tasmota/my_user_config.h

@@ -573,6 +573,7 @@
 // -- One wire sensors ----------------------------
 #define USE_DS18x20                              // Add support for DS18x20 sensors with id sort, single scan and read retry (+2k6 code)
 //  #define W1_PARASITE_POWER                      // Optimize for parasite powered sensors
+//  #define DS18x20_USE_ID_AS_NAME                 // Use last 3 bytes for naming of sensors
 //  #define DS18x20_USE_ID_ALIAS                   // Add support aliasing for DS18x20 sensors. See comments in xsns_05 files (+0k5 code)
 
 // -- I2C sensors ---------------------------------

tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_8_parsers.ino

@@ -2274,10 +2274,10 @@ void ZCLFrame::autoResponder(const uint16_t *attr_list_ids, size_t attr_len) {
         attr.setUInt((Rtc.utc_time > START_VALID_TIME) ? 0x02 : 0x00);
         break;
       case 0x000A0002:    // TimeZone
-        attr.setUInt(Settings->toffset[0] * 60);
+        attr.setUInt(Rtc.time_timezone * 60);
         break;
       case 0x000A0007:    // LocalTime    // TODO take DST
-        attr.setUInt(Settings->toffset[0] * 60 + ((Rtc.utc_time > START_VALID_TIME) ? Rtc.utc_time - 946684800 : Rtc.utc_time));
+        attr.setUInt(Rtc.time_timezone * 60 + ((Rtc.utc_time > START_VALID_TIME) ? Rtc.utc_time - 946684800 : Rtc.utc_time));
         break;
     }
     if (!attr.isNone()) {

tasmota/tasmota_xsns_sensor/xsns_05_ds18x20.ino

@@ -483,6 +483,7 @@ void Ds18x20Name(uint8_t sensor) {
   }
   snprintf_P(DS18X20Data.name, sizeof(DS18X20Data.name), PSTR("%s%c%s"), DS18X20Data.name, IndexSeparator(), address);
 #elif defined(DS18x20_USE_ID_ALIAS)
+  sensor = ds18x20_sensor[sensor].index;
   if (ds18x20_sensor[sensor].alias[0] != '0') {
     if (isdigit(ds18x20_sensor[sensor].alias[0])) {
       snprintf_P(DS18X20Data.name, sizeof(DS18X20Data.name), PSTR("DS18Sens%c%d"), IndexSeparator(), atoi(ds18x20_sensor[sensor].alias));

tasmota/tasmota_xsns_sensor/xsns_05_esp32_ds18x20.ino

@@ -227,6 +227,7 @@ void Ds18x20Name(uint8_t sensor) {
   }
   snprintf_P(DS18X20Data.name, sizeof(DS18X20Data.name), PSTR("%s%c%s"), DS18X20Data.name, IndexSeparator(), address);
 #elif defined(DS18x20_USE_ID_ALIAS)
+  sensor = ds18x20_sensor[sensor].index;
   if (ds18x20_sensor[sensor].alias[0] != '0') {
     if (isdigit(ds18x20_sensor[sensor].alias[0])) {
       snprintf_P(DS18X20Data.name, sizeof(DS18X20Data.name), PSTR("DS18Sens%c%d"), IndexSeparator(), atoi(ds18x20_sensor[sensor].alias));