diff --git a/tasmota/xdrv_23_zigbee_5__constants.ino b/tasmota/xdrv_23_zigbee_5__constants.ino index b9af8d092..16dd91af2 100644 --- a/tasmota/xdrv_23_zigbee_5__constants.ino +++ b/tasmota/xdrv_23_zigbee_5__constants.ino @@ -372,6 +372,9 @@ const char Z_strings[] PROGMEM = "LastMessageRSSI" "\x00" "TuyaScheduleWorkdays" "\x00" "TuyaScheduleHolidays" "\x00" + "Power2" "\x00" + "Power3" "\x00" + "Power4" "\x00" "TuyaChildLock" "\x00" "TuyaWindowDetection" "\x00" "TuyaValveDetection" "\x00" @@ -782,115 +785,118 @@ enum Z_offsets { Zo_LastMessageRSSI = 4891, Zo_TuyaScheduleWorkdays = 4907, Zo_TuyaScheduleHolidays = 4928, - Zo_TuyaChildLock = 4949, - Zo_TuyaWindowDetection = 4963, - Zo_TuyaValveDetection = 4983, - Zo_TuyaAutoLock = 5002, - Zo_TuyaTempTarget = 5015, - Zo_TuyaBattery = 5030, - Zo_TuyaMinTemp = 5042, - Zo_TuyaMaxTemp = 5054, - Zo_TuyaBoostTime = 5066, - Zo_TuyaComfortTemp = 5080, - Zo_TuyaEcoTemp = 5096, - Zo_TuyaValvePosition = 5108, - Zo_TuyaAwayTemp = 5126, - Zo_TuyaAwayDays = 5139, - Zo_TuyaPreset = 5152, - Zo_TuyaFanMode = 5163, - Zo_TuyaForceMode = 5175, - Zo_TuyaWeekSelect = 5189, - Zo_TerncyDuration = 5204, - Zo_TerncyRotate = 5219, - Zo_Identify = 5232, - Zo_xxxx = 5241, - Zo_IdentifyQuery = 5246, - Zo_AddGroup = 5260, - Zo_xxxx00 = 5269, - Zo_ViewGroup = 5276, - Zo_GetGroup = 5286, - Zo_01xxxx = 5295, - Zo_GetAllGroups = 5302, - Zo_00 = 5315, - Zo_RemoveGroup = 5318, - Zo_RemoveAllGroups = 5330, - Zo_ViewScene = 5346, - Zo_xxxxyy = 5356, - Zo_RemoveScene = 5363, - Zo_RemoveAllScenes = 5375, - Zo_RecallScene = 5391, - Zo_GetSceneMembership = 5403, - Zo_PowerOffEffect = 5422, - Zo_xxyy = 5437, - Zo_PowerOnRecall = 5442, - Zo_PowerOnTimer = 5456, - Zo_xxyyyyzzzz = 5469, - Zo_xx0A00 = 5480, - Zo_DimmerUp = 5487, - Zo_00190200 = 5496, - Zo_DimmerDown = 5505, - Zo_01190200 = 5516, - Zo_DimmerStop = 5525, - Zo_ResetAlarm = 5536, - Zo_xxyyyy = 5547, - Zo_ResetAllAlarms = 5554, - Zo_xx000A00 = 5569, - Zo_HueSat = 5578, - Zo_xxyy0A00 = 5585, - Zo_Color = 5594, - Zo_xxxxyyyy0A00 = 5600, - Zo_xxxx0A00 = 5613, - Zo_ShutterOpen = 5622, - Zo_ShutterClose = 5634, - Zo_ShutterStop = 5647, - Zo_ShutterLift = 5659, - Zo_xx = 5671, - Zo_ShutterTilt = 5674, - Zo_Shutter = 5686, - Zo_DimmerMove = 5694, - Zo_xx0A = 5705, - Zo_DimmerStepUp = 5710, - Zo_00xx0A00 = 5723, - Zo_DimmerStepDown = 5732, - Zo_01xx0A00 = 5747, - Zo_DimmerStep = 5756, - Zo_xx190A00 = 5767, - Zo_01 = 5776, - Zo_HueMove = 5779, - Zo_xx19 = 5787, - Zo_HueStepUp = 5792, - Zo_HueStepDown = 5802, - Zo_03xx0A00 = 5814, - Zo_HueStep = 5823, - Zo_SatMove = 5831, - Zo_SatStep = 5839, - Zo_xx190A = 5847, - Zo_ColorMove = 5854, - Zo_xxxxyyyy = 5864, - Zo_ColorStep = 5873, - Zo_ColorTempMoveUp = 5883, - Zo_01xxxx000000000000 = 5899, - Zo_ColorTempMoveDown = 5918, - Zo_03xxxx000000000000 = 5936, - Zo_ColorTempMoveStop = 5955, - Zo_00xxxx000000000000 = 5973, - Zo_ColorTempMove = 5992, - Zo_xxyyyy000000000000 = 6006, - Zo_ColorTempStepUp = 6025, - Zo_01xxxx0A0000000000 = 6041, - Zo_ColorTempStepDown = 6060, - Zo_03xxxx0A0000000000 = 6078, - Zo_ColorTempStep = 6097, - Zo_xxyyyy0A0000000000 = 6111, - Zo_ArrowClick = 6130, - Zo_ArrowHold = 6141, - Zo_ArrowRelease = 6151, - Zo_ZoneStatusChange = 6164, - Zo_xxxxyyzz = 6181, - Zo_xxyyzzzz = 6190, - Zo_AddScene = 6199, - Zo_xxyyyyzz = 6208, - Zo_StoreScene = 6217, + Zo_Power2 = 4949, + Zo_Power3 = 4956, + Zo_Power4 = 4963, + Zo_TuyaChildLock = 4970, + Zo_TuyaWindowDetection = 4984, + Zo_TuyaValveDetection = 5004, + Zo_TuyaAutoLock = 5023, + Zo_TuyaTempTarget = 5036, + Zo_TuyaBattery = 5051, + Zo_TuyaMinTemp = 5063, + Zo_TuyaMaxTemp = 5075, + Zo_TuyaBoostTime = 5087, + Zo_TuyaComfortTemp = 5101, + Zo_TuyaEcoTemp = 5117, + Zo_TuyaValvePosition = 5129, + Zo_TuyaAwayTemp = 5147, + Zo_TuyaAwayDays = 5160, + Zo_TuyaPreset = 5173, + Zo_TuyaFanMode = 5184, + Zo_TuyaForceMode = 5196, + Zo_TuyaWeekSelect = 5210, + Zo_TerncyDuration = 5225, + Zo_TerncyRotate = 5240, + Zo_Identify = 5253, + Zo_xxxx = 5262, + Zo_IdentifyQuery = 5267, + Zo_AddGroup = 5281, + Zo_xxxx00 = 5290, + Zo_ViewGroup = 5297, + Zo_GetGroup = 5307, + Zo_01xxxx = 5316, + Zo_GetAllGroups = 5323, + Zo_00 = 5336, + Zo_RemoveGroup = 5339, + Zo_RemoveAllGroups = 5351, + Zo_ViewScene = 5367, + Zo_xxxxyy = 5377, + Zo_RemoveScene = 5384, + Zo_RemoveAllScenes = 5396, + Zo_RecallScene = 5412, + Zo_GetSceneMembership = 5424, + Zo_PowerOffEffect = 5443, + Zo_xxyy = 5458, + Zo_PowerOnRecall = 5463, + Zo_PowerOnTimer = 5477, + Zo_xxyyyyzzzz = 5490, + Zo_xx0A00 = 5501, + Zo_DimmerUp = 5508, + Zo_00190200 = 5517, + Zo_DimmerDown = 5526, + Zo_01190200 = 5537, + Zo_DimmerStop = 5546, + Zo_ResetAlarm = 5557, + Zo_xxyyyy = 5568, + Zo_ResetAllAlarms = 5575, + Zo_xx000A00 = 5590, + Zo_HueSat = 5599, + Zo_xxyy0A00 = 5606, + Zo_Color = 5615, + Zo_xxxxyyyy0A00 = 5621, + Zo_xxxx0A00 = 5634, + Zo_ShutterOpen = 5643, + Zo_ShutterClose = 5655, + Zo_ShutterStop = 5668, + Zo_ShutterLift = 5680, + Zo_xx = 5692, + Zo_ShutterTilt = 5695, + Zo_Shutter = 5707, + Zo_DimmerMove = 5715, + Zo_xx0A = 5726, + Zo_DimmerStepUp = 5731, + Zo_00xx0A00 = 5744, + Zo_DimmerStepDown = 5753, + Zo_01xx0A00 = 5768, + Zo_DimmerStep = 5777, + Zo_xx190A00 = 5788, + Zo_01 = 5797, + Zo_HueMove = 5800, + Zo_xx19 = 5808, + Zo_HueStepUp = 5813, + Zo_HueStepDown = 5823, + Zo_03xx0A00 = 5835, + Zo_HueStep = 5844, + Zo_SatMove = 5852, + Zo_SatStep = 5860, + Zo_xx190A = 5868, + Zo_ColorMove = 5875, + Zo_xxxxyyyy = 5885, + Zo_ColorStep = 5894, + Zo_ColorTempMoveUp = 5904, + Zo_01xxxx000000000000 = 5920, + Zo_ColorTempMoveDown = 5939, + Zo_03xxxx000000000000 = 5957, + Zo_ColorTempMoveStop = 5976, + Zo_00xxxx000000000000 = 5994, + Zo_ColorTempMove = 6013, + Zo_xxyyyy000000000000 = 6027, + Zo_ColorTempStepUp = 6046, + Zo_01xxxx0A0000000000 = 6062, + Zo_ColorTempStepDown = 6081, + Zo_03xxxx0A0000000000 = 6099, + Zo_ColorTempStep = 6118, + Zo_xxyyyy0A0000000000 = 6132, + Zo_ArrowClick = 6151, + Zo_ArrowHold = 6162, + Zo_ArrowRelease = 6172, + Zo_ZoneStatusChange = 6185, + Zo_xxxxyyzz = 6202, + Zo_xxyyzzzz = 6211, + Zo_AddScene = 6220, + Zo_xxyyyyzz = 6229, + Zo_StoreScene = 6238, }; diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino index 5b1f5f0d5..91d31449a 100644 --- a/tasmota/xdrv_23_zigbee_5_converters.ino +++ b/tasmota/xdrv_23_zigbee_5_converters.ino @@ -602,6 +602,10 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = { // Tuya Moes specific - 0xEF00 { Zoctstr, CxEF00, 0x0070, Z_(TuyaScheduleWorkdays), Cm1, 0 }, { Zoctstr, CxEF00, 0x0071, Z_(TuyaScheduleHolidays), Cm1, 0 }, + { Ztuya1, CxEF00, 0x0101, Z_(Power), Cm1, 0 }, + { Ztuya1, CxEF00, 0x0102, Z_(Power2), Cm1, 0 }, + { Ztuya1, CxEF00, 0x0103, Z_(Power3), Cm1, 0 }, + { Ztuya1, CxEF00, 0x0104, Z_(Power4), Cm1, 0 }, { Ztuya1, CxEF00, 0x0107, Z_(TuyaChildLock), Cm1, 0 }, { Ztuya1, CxEF00, 0x0112, Z_(TuyaWindowDetection), Cm1, 0 }, { Ztuya1, CxEF00, 0x0114, Z_(TuyaValveDetection), Cm1, 0 },