From 0e00d082eccf06f929ced76af1b3cb556581bd8d Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Wed, 14 Sep 2022 19:34:47 +0200 Subject: [PATCH] Zigbee update ZCL --- .../xdrv_23_zigbee_5_0_constants.ino | 1020 +++++++++-------- .../xdrv_23_zigbee_5_1_attributes.ino | 33 +- 2 files changed, 537 insertions(+), 516 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_0_constants.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_0_constants.ino index d244032fe..5f2ff5546 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_0_constants.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_0_constants.ino @@ -269,6 +269,7 @@ const char Z_strings[] PROGMEM = "ColorPointRIntensity" "\x00" "ColorPointRX" "\x00" "ColorPointRY" "\x00" + "ColorStartUpColorTempireds" "\x00" "ColorStep" "\x00" "ColorTempMove" "\x00" "ColorTempMoveDown" "\x00" @@ -328,10 +329,16 @@ const char Z_strings[] PROGMEM = "DeviceEnabled" "\x00" "DeviceTempAlarmMask" "\x00" "Dimmer" "\x00" + "DimmerCurrentFrequency" "\x00" "DimmerDown" "\x00" + "DimmerMaxFrequency" "\x00" + "DimmerMaxLevel" "\x00" + "DimmerMinFrequency" "\x00" + "DimmerMinLevel" "\x00" "DimmerMove" "\x00" "DimmerOptions" "\x00" "DimmerRemainingTime" "\x00" + "DimmerStartUpLevel" "\x00" "DimmerStep" "\x00" "DimmerStepDown" "\x00" "DimmerStepUp" "\x00" @@ -969,509 +976,516 @@ enum Z_offsets { Zo_ColorPointRIntensity = 3559, Zo_ColorPointRX = 3580, Zo_ColorPointRY = 3593, - Zo_ColorStep = 3606, - Zo_ColorTempMove = 3616, - Zo_ColorTempMoveDown = 3630, - Zo_ColorTempMoveStop = 3648, - Zo_ColorTempMoveUp = 3666, - Zo_ColorTempPhysicalMaxMireds = 3682, - Zo_ColorTempPhysicalMinMireds = 3709, - Zo_ColorTempStep = 3736, - Zo_ColorTempStepDown = 3750, - Zo_ColorTempStepUp = 3768, - Zo_CommissioningWindow = 3784, - Zo_CommunicationMode = 3804, - Zo_CompanyName = 3822, - Zo_CompensationText = 3834, - Zo_ConfigStatus = 3851, - Zo_Contact = 3864, - Zo_ControlSequenceOfOperation = 3872, - Zo_Coordinate1 = 3899, - Zo_Coordinate2 = 3911, - Zo_Coordinate3 = 3923, - Zo_CurrentGroup = 3935, - Zo_CurrentPositionLift = 3948, - Zo_CurrentPositionLiftPercentage = 3968, - Zo_CurrentPositionTilt = 3998, - Zo_CurrentPositionTiltPercentage = 4018, - Zo_CurrentScene = 4048, - Zo_CurrentTemperature = 4061, - Zo_CurrentTemperatureSetPoint = 4080, - Zo_CurrentZoneSensitivityLevel = 4107, - Zo_CustomerName = 4135, - Zo_DCCurrent = 4148, - Zo_DCCurrentDivisor = 4158, - Zo_DCCurrentMax = 4175, - Zo_DCCurrentMin = 4188, - Zo_DCCurrentMultiplier = 4201, - Zo_DCCurrentOverload = 4221, - Zo_DCOverloadAlarmsMask = 4239, - Zo_DCPower = 4260, - Zo_DCPowerDivisor = 4268, - Zo_DCPowerMax = 4283, - Zo_DCPowerMin = 4294, - Zo_DCPowerMultiplier = 4305, - Zo_DCVoltage = 4323, - Zo_DCVoltageDivisor = 4333, - Zo_DCVoltageMax = 4350, - Zo_DCVoltageMin = 4363, - Zo_DCVoltageMultiplier = 4376, - Zo_DCVoltageOverload = 4396, - Zo_DataQualityID = 4414, - Zo_DateCode = 4428, - Zo_DecelerationTimeLift = 4437, - Zo_DefaultMoveRate = 4458, - Zo_DehumidificationCooling = 4474, - Zo_DehumidificationHysteresis = 4498, - Zo_DehumidificationLockout = 4525, - Zo_DehumidificationMaxCool = 4549, - Zo_DeviceEnabled = 4573, - Zo_DeviceTempAlarmMask = 4587, - Zo_Dimmer = 4607, - Zo_DimmerDown = 4614, - Zo_DimmerMove = 4625, - Zo_DimmerOptions = 4636, - Zo_DimmerRemainingTime = 4650, - Zo_DimmerStep = 4670, - Zo_DimmerStepDown = 4681, - Zo_DimmerStepUp = 4696, - Zo_DimmerStop = 4709, - Zo_DimmerUp = 4720, - Zo_DisableLocalConfig = 4729, - Zo_DoorClosedEvents = 4748, - Zo_DoorOpenEvents = 4765, - Zo_DoorState = 4780, - Zo_DriftCompensation = 4790, - Zo_DstEnd = 4808, - Zo_DstShift = 4815, - Zo_DstStart = 4824, - Zo_ElectricalMeasurementType = 4833, - Zo_EnergyFormatting = 4859, - Zo_EnergyRemote = 4876, - Zo_EnergyTotal = 4889, - Zo_EnhancedColorMode = 4901, - Zo_EnhancedCurrentHue = 4919, - Zo_EurotronicErrors = 4938, - Zo_EurotronicHostFlags = 4955, - Zo_FanMode = 4975, - Zo_FanModeSequence = 4983, - Zo_FastPollTimeout = 4999, - Zo_FastPollTimeoutMax = 5015, - Zo_Fire = 5034, - Zo_FlowMaxMeasuredValue = 5039, - Zo_FlowMinMeasuredValue = 5060, - Zo_FlowRate = 5081, - Zo_FlowTolerance = 5090, - Zo_GenericDeviceClass = 5104, - Zo_GenericDeviceType = 5123, - Zo_GetAllGroups = 5141, - Zo_GetGroup = 5154, - Zo_GetSceneMembership = 5163, - Zo_GlassBreak = 5182, - Zo_GroupNameSupport = 5193, - Zo_HVACSystemTypeConfiguration = 5210, - Zo_HWVersion = 5238, - Zo_HarmonicCurrentMultiplier = 5248, - Zo_HighTempDwellTripPoint = 5274, - Zo_HighTempThreshold = 5297, - Zo_Hue = 5315, - Zo_HueMove = 5319, - Zo_HueSat = 5327, - Zo_HueStep = 5334, - Zo_HueStepDown = 5342, - Zo_HueStepUp = 5354, - Zo_Humidity = 5364, - Zo_HumidityMaxMeasuredValue = 5373, - Zo_HumidityMinMeasuredValue = 5398, - Zo_HumidityTolerance = 5423, - Zo_IASCIEAddress = 5441, - Zo_Identify = 5455, - Zo_IdentifyQuery = 5464, - Zo_IdentifyTime = 5478, - Zo_Illuminance = 5491, - Zo_IlluminanceLevelStatus = 5503, - Zo_IlluminanceLightSensorType = 5526, - Zo_IlluminanceMaxMeasuredValue = 5553, - Zo_IlluminanceMinMeasuredValue = 5581, - Zo_IlluminanceTargetLevel = 5609, - Zo_IlluminanceTolerance = 5632, - Zo_InstalledClosedLimitLift = 5653, - Zo_InstalledClosedLimitTilt = 5678, - Zo_InstalledOpenLimitLift = 5703, - Zo_InstalledOpenLimitTilt = 5726, - Zo_IntermediateSetpointsLift = 5749, - Zo_IntermediateSetpointsTilt = 5775, - Zo_IntrinsicBallastFactor = 5801, - Zo_LampAlarmMode = 5824, - Zo_LampBurnHours = 5838, - Zo_LampBurnHoursTripPoint = 5852, - Zo_LampManufacturer = 5875, - Zo_LampRatedHours = 5892, - Zo_LampType = 5907, - Zo_LastConfiguredBy = 5916, - Zo_LastMessageLQI = 5933, - Zo_LastMessageRSSI = 5948, - Zo_LastSetTime = 5964, - Zo_LegrandHeatingMode = 5976, - Zo_LegrandMode = 5995, - Zo_LegrandOpt1 = 6007, - Zo_LegrandOpt2 = 6019, - Zo_LegrandOpt3 = 6031, - Zo_LidlPower = 6043, - Zo_LineCurrent = 6053, - Zo_LineCurrentPhB = 6065, - Zo_LineCurrentPhC = 6080, - Zo_LinkKey = 6095, - Zo_LocalTemperature = 6103, - Zo_LocalTemperatureCalibration = 6120, - Zo_LocalTime = 6148, - Zo_LocationAge = 6158, - Zo_LocationDescription = 6170, - Zo_LocationMethod = 6190, - Zo_LocationPower = 6205, - Zo_LocationType = 6219, - Zo_LockAlarmMask = 6232, - Zo_LockDefaultConfigurationRegister = 6246, - Zo_LockEnableInsideStatusLED = 6279, - Zo_LockEnableLocalProgramming = 6305, - Zo_LockEnableLogging = 6332, - Zo_LockEnableOneTouchLocking = 6350, - Zo_LockEnablePrivacyModeButton = 6376, - Zo_LockKeypadOperationEventMask = 6404, - Zo_LockKeypadProgrammingEventMask = 6433, - Zo_LockLEDSettings = 6464, - Zo_LockLanguage = 6480, - Zo_LockManualOperationEventMask = 6493, - Zo_LockOperatingMode = 6522, - Zo_LockRFIDOperationEventMask = 6540, - Zo_LockRFIDProgrammingEventMask = 6567, - Zo_LockRFOperationEventMask = 6596, - Zo_LockRFProgrammingEventMask = 6621, - Zo_LockSoundVolume = 6648, - Zo_LockState = 6664, - Zo_LockSupportedOperatingModes = 6674, - Zo_LockType = 6702, - Zo_LongPollInterval = 6711, - Zo_LongPollIntervalMin = 6728, - Zo_LowTempDwellTripPoint = 6748, - Zo_LowTempThreshold = 6770, - Zo_MainsAlarmMask = 6787, - Zo_MainsFrequency = 6802, - Zo_MainsVoltage = 6817, - Zo_MainsVoltageDwellTripPoint = 6830, - Zo_MainsVoltageMaxThreshold = 6857, - Zo_MainsVoltageMinThreshold = 6882, - Zo_Manufacturer = 6907, - Zo_MaxCoolSetpointLimit = 6920, - Zo_MaxHeatSetpointLimit = 6941, - Zo_MaxPINCodeLength = 6962, - Zo_MaxProxyTableEntries = 6979, - Zo_MaxRFIDCodeLength = 7000, - Zo_MaxSearchCounter = 7018, - Zo_MaxSinkTableEntries = 7035, - Zo_MaxTempExperienced = 7055, - Zo_Measured11thHarmonicCurrent = 7074, - Zo_Measured1stHarmonicCurrent = 7102, - Zo_Measured3rdHarmonicCurrent = 7129, - Zo_Measured5thHarmonicCurrent = 7156, - Zo_Measured7thHarmonicCurrent = 7183, - Zo_Measured9thHarmonicCurrent = 7210, - Zo_MeasuredPhase11thHarmonicCurrent = 7237, - Zo_MeasuredPhase1stHarmonicCurrent = 7270, - Zo_MeasuredPhase3rdHarmonicCurrent = 7302, - Zo_MeasuredPhase5thHarmonicCurrent = 7334, - Zo_MeasuredPhase7thHarmonicCurrent = 7366, - Zo_MeasuredPhase9thHarmonicCurrent = 7398, - Zo_MeterTypeID = 7430, - Zo_MinCoolSetpointLimit = 7442, - Zo_MinHeatSetpointLimit = 7463, - Zo_MinPINCodeLength = 7484, - Zo_MinRFIDCodeLength = 7501, - Zo_MinSetpointDeadBand = 7519, - Zo_MinTempExperienced = 7539, - Zo_Mode = 7558, - Zo_Model = 7563, - Zo_ModelId = 7569, - Zo_MotorStepSize = 7577, - Zo_Movement = 7591, - Zo_MullerLightMode = 7600, - Zo_MultiApplicationType = 7616, - Zo_MultiDescription = 7637, - Zo_MultiInApplicationType = 7654, - Zo_MultiInDescription = 7677, - Zo_MultiInNumberOfStates = 7696, - Zo_MultiInOutOfService = 7718, - Zo_MultiInReliability = 7738, - Zo_MultiInStatusFlags = 7757, - Zo_MultiInValue = 7776, - Zo_MultiNumberOfStates = 7789, - Zo_MultiOutApplicationType = 7809, - Zo_MultiOutDescription = 7833, - Zo_MultiOutNumberOfStates = 7853, - Zo_MultiOutOfService = 7876, - Zo_MultiOutOutOfService = 7894, - Zo_MultiOutReliability = 7915, - Zo_MultiOutRelinquishDefault = 7935, - Zo_MultiOutStatusFlags = 7961, - Zo_MultiOutValue = 7981, - Zo_MultiReliability = 7995, - Zo_MultiRelinquishDefault = 8012, - Zo_MultiStatusFlags = 8035, - Zo_MultiValue = 8052, - Zo_MultipleScheduling = 8063, - Zo_NeutralCurrent = 8082, - Zo_NotificationRetryNumber = 8097, - Zo_NotificationRetryTimer = 8121, - Zo_NumberOfDevices = 8144, - Zo_NumberOfHolidaySchedulesSupported = 8160, - Zo_NumberOfLogRecordsSupported = 8194, - Zo_NumberOfPINUsersSupported = 8222, - Zo_NumberOfPrimaries = 8248, - Zo_NumberOfRFIDUsersSupported = 8266, - Zo_NumberOfResets = 8293, - Zo_NumberOfTotalUsersSupported = 8308, - Zo_NumberOfWeekDaySchedulesSupportedPerUser = 8336, - Zo_NumberOfYearDaySchedulesSupportedPerUser = 8377, - Zo_NumberOfZoneSensitivityLevelsSupported = 8418, - Zo_NumberRSSIMeasurements = 8457, - Zo_NumberofActuationsLift = 8480, - Zo_NumberofActuationsTilt = 8503, - Zo_Occupancy = 8526, - Zo_OccupancySensorType = 8536, - Zo_OccupiedCoolingSetpoint = 8556, - Zo_OccupiedHeatingSetpoint = 8580, - Zo_OffTransitionTime = 8604, - Zo_OffWaitTime = 8622, - Zo_OnLevel = 8634, - Zo_OnOff = 8642, - Zo_OnOffTransitionTime = 8648, - Zo_OnTime = 8668, - Zo_OnTransitionTime = 8675, - Zo_OpenPeriod = 8692, - Zo_OppleMode = 8703, - Zo_OutdoorTemperature = 8713, - Zo_OverTempTotalDwell = 8732, - Zo_PICoolingDemand = 8751, - Zo_PIHeatingDemand = 8767, - Zo_PIROccupiedToUnoccupiedDelay = 8783, - Zo_PIRUnoccupiedToOccupiedDelay = 8812, - Zo_PIRUnoccupiedToOccupiedThreshold = 8841, - Zo_POD = 8874, - Zo_Panic = 8878, - Zo_PartNumber = 8884, - Zo_PathLossExponent = 8895, - Zo_PersistentMemoryWrites = 8912, - Zo_PersonalAlarm = 8935, - Zo_PhaseHarmonicCurrentMultiplier = 8949, - Zo_PhysicalClosedLimit = 8980, - Zo_PhysicalClosedLimitLift = 9000, - Zo_PhysicalClosedLimitTilt = 9024, - Zo_PhysicalEnvironment = 9048, - Zo_Power = 9068, - Zo_PowerDivisor = 9074, - Zo_PowerFactor = 9087, - Zo_PowerFactorPhB = 9099, - Zo_PowerFactorPhC = 9114, - Zo_PowerMultiplier = 9129, - Zo_PowerOffEffect = 9145, - Zo_PowerOnRecall = 9160, - Zo_PowerOnTimer = 9174, - Zo_PowerSource = 9187, - Zo_PowerThreshold = 9199, - Zo_Pressure = 9214, - Zo_PressureMaxMeasuredValue = 9223, - Zo_PressureMaxScaledValue = 9248, - Zo_PressureMinMeasuredValue = 9271, - Zo_PressureMinScaledValue = 9296, - Zo_PressureScale = 9319, - Zo_PressureScaledTolerance = 9333, - Zo_PressureScaledValue = 9357, - Zo_PressureTolerance = 9377, - Zo_Primary1Intensity = 9395, - Zo_Primary1X = 9413, - Zo_Primary1Y = 9423, - Zo_Primary2Intensity = 9433, - Zo_Primary2X = 9451, - Zo_Primary2Y = 9461, - Zo_Primary3Intensity = 9471, - Zo_Primary3X = 9489, - Zo_Primary3Y = 9499, - Zo_Primary4Intensity = 9509, - Zo_Primary4X = 9527, - Zo_Primary4Y = 9537, - Zo_Primary5Intensity = 9547, - Zo_Primary5X = 9565, - Zo_Primary5Y = 9575, - Zo_Primary6Intensity = 9585, - Zo_Primary6X = 9603, - Zo_Primary6Y = 9613, - Zo_ProductCode = 9623, - Zo_ProductRevision = 9635, - Zo_ProductURL = 9651, - Zo_ProxyTable = 9662, - Zo_QualityMeasure = 9673, - Zo_RGB = 9688, - Zo_RHDehumidificationSetpoint = 9692, - Zo_RMSCurrent = 9719, - Zo_RMSCurrentMax = 9730, - Zo_RMSCurrentMaxPhB = 9744, - Zo_RMSCurrentMaxPhC = 9761, - Zo_RMSCurrentMin = 9778, - Zo_RMSCurrentMinPhB = 9792, - Zo_RMSCurrentMinPhC = 9809, - Zo_RMSCurrentPhB = 9826, - Zo_RMSCurrentPhC = 9840, - Zo_RMSExtremeOverVoltage = 9854, - Zo_RMSExtremeOverVoltagePeriod = 9876, - Zo_RMSExtremeOverVoltagePeriodPhB = 9904, - Zo_RMSExtremeOverVoltagePeriodPhC = 9935, - Zo_RMSExtremeUnderVoltage = 9966, - Zo_RMSExtremeUnderVoltagePeriod = 9989, - Zo_RMSExtremeUnderVoltagePeriodPhB = 10018, - Zo_RMSExtremeUnderVoltagePeriodPhC = 10050, - Zo_RMSVoltage = 10082, - Zo_RMSVoltageMax = 10093, - Zo_RMSVoltageMaxPhB = 10107, - Zo_RMSVoltageMaxPhC = 10124, - Zo_RMSVoltageMin = 10141, - Zo_RMSVoltageMinPhB = 10155, - Zo_RMSVoltageMinPhC = 10172, - Zo_RMSVoltagePhB = 10189, - Zo_RMSVoltagePhC = 10203, - Zo_RMSVoltageSag = 10217, - Zo_RMSVoltageSagPeriod = 10231, - Zo_RMSVoltageSagPeriodPhB = 10251, - Zo_RMSVoltageSagPeriodPhC = 10274, - Zo_RMSVoltageSwell = 10297, - Zo_RMSVoltageSwellPeriod = 10313, - Zo_RMSVoltageSwellPeriodPhB = 10335, - Zo_RMSVoltageSwellPeriodPhC = 10360, - Zo_ReactiveCurrent = 10385, - Zo_ReactiveCurrentPhB = 10401, - Zo_ReactiveCurrentPhC = 10420, - Zo_ReactivePower = 10439, - Zo_ReactivePowerPhB = 10453, - Zo_ReactivePowerPhC = 10470, - Zo_RecallScene = 10487, - Zo_RelativeHumidity = 10499, - Zo_RelativeHumidityDisplay = 10516, - Zo_RelativeHumidityMode = 10540, - Zo_RemainingTime = 10561, - Zo_RemoteSensing = 10575, - Zo_RemoveAllGroups = 10589, - Zo_RemoveAllScenes = 10605, - Zo_RemoveGroup = 10621, - Zo_RemoveScene = 10633, - Zo_ReportingPeriod = 10645, - Zo_ResetAlarm = 10661, - Zo_ResetAllAlarms = 10672, - Zo_SWBuildID = 10687, - Zo_Sat = 10697, - Zo_SatMove = 10701, - Zo_SatStep = 10709, - Zo_SceneCount = 10717, - Zo_SceneNameSupport = 10728, - Zo_SceneValid = 10745, - Zo_ScheduleMode = 10756, - Zo_SeaPressure = 10769, - Zo_SecurityLevel = 10781, - Zo_ServerActiveFunctionality = 10795, - Zo_ServerFunctionality = 10821, - Zo_SharedSecurityKey = 10841, - Zo_SharedSecurityKeyType = 10859, - Zo_ShortPollInterval = 10881, - Zo_Shutter = 10899, - Zo_ShutterClose = 10907, - Zo_ShutterLift = 10920, - Zo_ShutterOpen = 10932, - Zo_ShutterStop = 10944, - Zo_ShutterTilt = 10956, - Zo_SinkTable = 10968, - Zo_SoftwareRevision = 10978, - Zo_StackVersion = 10995, - Zo_StandardTime = 11008, - Zo_StartUpOnOff = 11021, - Zo_Status = 11034, - Zo_StoreScene = 11041, - Zo_SwitchActions = 11052, - Zo_SwitchType = 11066, - Zo_SystemMode = 11077, - Zo_TRVBoost = 11088, - Zo_TRVChildProtection = 11097, - Zo_TRVMirrorDisplay = 11116, - Zo_TRVMode = 11133, - Zo_TRVWindowOpen = 11141, - Zo_TempTarget = 11155, - Zo_Temperature = 11166, - Zo_TemperatureDisplayMode = 11178, - Zo_TemperatureMaxMeasuredValue = 11201, - Zo_TemperatureMinMeasuredValue = 11229, - Zo_TemperatureTolerance = 11257, - Zo_TerncyDuration = 11278, - Zo_TerncyRotate = 11293, - Zo_ThSetpoint = 11306, - Zo_ThermostatAlarmMask = 11317, - Zo_ThermostatKeypadLockout = 11337, - Zo_ThermostatOccupancy = 11361, - Zo_ThermostatRunningMode = 11381, - Zo_ThermostatScheduleProgrammingVisibility = 11403, - Zo_Time = 11443, - Zo_TimeEpoch = 11448, - Zo_TimeStatus = 11458, - Zo_TimeZone = 11469, - Zo_TotalActivePower = 11478, - Zo_TotalApparentPower = 11495, - Zo_TotalProfileNum = 11514, - Zo_TotalReactivePower = 11530, - Zo_TuyaCalibration = 11549, - Zo_TuyaCalibrationTime = 11565, - Zo_TuyaMCUVersion = 11585, - Zo_TuyaMotorReversal = 11600, - Zo_TuyaMovingState = 11618, - Zo_TuyaQuery = 11634, - Zo_UnoccupiedCoolingSetpoint = 11644, - Zo_UnoccupiedHeatingSetpoint = 11670, - Zo_UtilityName = 11696, - Zo_ValidUntilTime = 11708, - Zo_ValvePosition = 11723, - Zo_VelocityLift = 11737, - Zo_ViewGroup = 11750, - Zo_ViewScene = 11760, - Zo_Water = 11770, - Zo_WhitePointX = 11776, - Zo_WhitePointY = 11788, - Zo_WindowCoveringType = 11800, - Zo_X = 11819, - Zo_Y = 11821, - Zo_ZCLVersion = 11823, - Zo_ZoneID = 11834, - Zo_ZoneState = 11841, - Zo_ZoneStatus = 11851, - Zo_ZoneStatusChange = 11862, - Zo_ZoneType = 11879, - Zo__ = 11888, - Zo_xx = 11890, - Zo_xx000A00 = 11893, - Zo_xx0A = 11902, - Zo_xx0A00 = 11907, - Zo_xx19 = 11914, - Zo_xx190A = 11919, - Zo_xx190A00 = 11926, - Zo_xxxx = 11935, - Zo_xxxx00 = 11940, - Zo_xxxx0A00 = 11947, - Zo_xxxxyy = 11956, - Zo_xxxxyyyy = 11963, - Zo_xxxxyyyy0A00 = 11972, - Zo_xxxxyyzz = 11985, - Zo_xxyy = 11994, - Zo_xxyy0A00 = 11999, - Zo_xxyyyy = 12008, - Zo_xxyyyy000000000000 = 12015, - Zo_xxyyyy0A0000000000 = 12034, - Zo_xxyyyyzz = 12053, - Zo_xxyyyyzzzz = 12062, - Zo_xxyyzzzz = 12073, + Zo_ColorStartUpColorTempireds = 3606, + Zo_ColorStep = 3633, + Zo_ColorTempMove = 3643, + Zo_ColorTempMoveDown = 3657, + Zo_ColorTempMoveStop = 3675, + Zo_ColorTempMoveUp = 3693, + Zo_ColorTempPhysicalMaxMireds = 3709, + Zo_ColorTempPhysicalMinMireds = 3736, + Zo_ColorTempStep = 3763, + Zo_ColorTempStepDown = 3777, + Zo_ColorTempStepUp = 3795, + Zo_CommissioningWindow = 3811, + Zo_CommunicationMode = 3831, + Zo_CompanyName = 3849, + Zo_CompensationText = 3861, + Zo_ConfigStatus = 3878, + Zo_Contact = 3891, + Zo_ControlSequenceOfOperation = 3899, + Zo_Coordinate1 = 3926, + Zo_Coordinate2 = 3938, + Zo_Coordinate3 = 3950, + Zo_CurrentGroup = 3962, + Zo_CurrentPositionLift = 3975, + Zo_CurrentPositionLiftPercentage = 3995, + Zo_CurrentPositionTilt = 4025, + Zo_CurrentPositionTiltPercentage = 4045, + Zo_CurrentScene = 4075, + Zo_CurrentTemperature = 4088, + Zo_CurrentTemperatureSetPoint = 4107, + Zo_CurrentZoneSensitivityLevel = 4134, + Zo_CustomerName = 4162, + Zo_DCCurrent = 4175, + Zo_DCCurrentDivisor = 4185, + Zo_DCCurrentMax = 4202, + Zo_DCCurrentMin = 4215, + Zo_DCCurrentMultiplier = 4228, + Zo_DCCurrentOverload = 4248, + Zo_DCOverloadAlarmsMask = 4266, + Zo_DCPower = 4287, + Zo_DCPowerDivisor = 4295, + Zo_DCPowerMax = 4310, + Zo_DCPowerMin = 4321, + Zo_DCPowerMultiplier = 4332, + Zo_DCVoltage = 4350, + Zo_DCVoltageDivisor = 4360, + Zo_DCVoltageMax = 4377, + Zo_DCVoltageMin = 4390, + Zo_DCVoltageMultiplier = 4403, + Zo_DCVoltageOverload = 4423, + Zo_DataQualityID = 4441, + Zo_DateCode = 4455, + Zo_DecelerationTimeLift = 4464, + Zo_DefaultMoveRate = 4485, + Zo_DehumidificationCooling = 4501, + Zo_DehumidificationHysteresis = 4525, + Zo_DehumidificationLockout = 4552, + Zo_DehumidificationMaxCool = 4576, + Zo_DeviceEnabled = 4600, + Zo_DeviceTempAlarmMask = 4614, + Zo_Dimmer = 4634, + Zo_DimmerCurrentFrequency = 4641, + Zo_DimmerDown = 4664, + Zo_DimmerMaxFrequency = 4675, + Zo_DimmerMaxLevel = 4694, + Zo_DimmerMinFrequency = 4709, + Zo_DimmerMinLevel = 4728, + Zo_DimmerMove = 4743, + Zo_DimmerOptions = 4754, + Zo_DimmerRemainingTime = 4768, + Zo_DimmerStartUpLevel = 4788, + Zo_DimmerStep = 4807, + Zo_DimmerStepDown = 4818, + Zo_DimmerStepUp = 4833, + Zo_DimmerStop = 4846, + Zo_DimmerUp = 4857, + Zo_DisableLocalConfig = 4866, + Zo_DoorClosedEvents = 4885, + Zo_DoorOpenEvents = 4902, + Zo_DoorState = 4917, + Zo_DriftCompensation = 4927, + Zo_DstEnd = 4945, + Zo_DstShift = 4952, + Zo_DstStart = 4961, + Zo_ElectricalMeasurementType = 4970, + Zo_EnergyFormatting = 4996, + Zo_EnergyRemote = 5013, + Zo_EnergyTotal = 5026, + Zo_EnhancedColorMode = 5038, + Zo_EnhancedCurrentHue = 5056, + Zo_EurotronicErrors = 5075, + Zo_EurotronicHostFlags = 5092, + Zo_FanMode = 5112, + Zo_FanModeSequence = 5120, + Zo_FastPollTimeout = 5136, + Zo_FastPollTimeoutMax = 5152, + Zo_Fire = 5171, + Zo_FlowMaxMeasuredValue = 5176, + Zo_FlowMinMeasuredValue = 5197, + Zo_FlowRate = 5218, + Zo_FlowTolerance = 5227, + Zo_GenericDeviceClass = 5241, + Zo_GenericDeviceType = 5260, + Zo_GetAllGroups = 5278, + Zo_GetGroup = 5291, + Zo_GetSceneMembership = 5300, + Zo_GlassBreak = 5319, + Zo_GroupNameSupport = 5330, + Zo_HVACSystemTypeConfiguration = 5347, + Zo_HWVersion = 5375, + Zo_HarmonicCurrentMultiplier = 5385, + Zo_HighTempDwellTripPoint = 5411, + Zo_HighTempThreshold = 5434, + Zo_Hue = 5452, + Zo_HueMove = 5456, + Zo_HueSat = 5464, + Zo_HueStep = 5471, + Zo_HueStepDown = 5479, + Zo_HueStepUp = 5491, + Zo_Humidity = 5501, + Zo_HumidityMaxMeasuredValue = 5510, + Zo_HumidityMinMeasuredValue = 5535, + Zo_HumidityTolerance = 5560, + Zo_IASCIEAddress = 5578, + Zo_Identify = 5592, + Zo_IdentifyQuery = 5601, + Zo_IdentifyTime = 5615, + Zo_Illuminance = 5628, + Zo_IlluminanceLevelStatus = 5640, + Zo_IlluminanceLightSensorType = 5663, + Zo_IlluminanceMaxMeasuredValue = 5690, + Zo_IlluminanceMinMeasuredValue = 5718, + Zo_IlluminanceTargetLevel = 5746, + Zo_IlluminanceTolerance = 5769, + Zo_InstalledClosedLimitLift = 5790, + Zo_InstalledClosedLimitTilt = 5815, + Zo_InstalledOpenLimitLift = 5840, + Zo_InstalledOpenLimitTilt = 5863, + Zo_IntermediateSetpointsLift = 5886, + Zo_IntermediateSetpointsTilt = 5912, + Zo_IntrinsicBallastFactor = 5938, + Zo_LampAlarmMode = 5961, + Zo_LampBurnHours = 5975, + Zo_LampBurnHoursTripPoint = 5989, + Zo_LampManufacturer = 6012, + Zo_LampRatedHours = 6029, + Zo_LampType = 6044, + Zo_LastConfiguredBy = 6053, + Zo_LastMessageLQI = 6070, + Zo_LastMessageRSSI = 6085, + Zo_LastSetTime = 6101, + Zo_LegrandHeatingMode = 6113, + Zo_LegrandMode = 6132, + Zo_LegrandOpt1 = 6144, + Zo_LegrandOpt2 = 6156, + Zo_LegrandOpt3 = 6168, + Zo_LidlPower = 6180, + Zo_LineCurrent = 6190, + Zo_LineCurrentPhB = 6202, + Zo_LineCurrentPhC = 6217, + Zo_LinkKey = 6232, + Zo_LocalTemperature = 6240, + Zo_LocalTemperatureCalibration = 6257, + Zo_LocalTime = 6285, + Zo_LocationAge = 6295, + Zo_LocationDescription = 6307, + Zo_LocationMethod = 6327, + Zo_LocationPower = 6342, + Zo_LocationType = 6356, + Zo_LockAlarmMask = 6369, + Zo_LockDefaultConfigurationRegister = 6383, + Zo_LockEnableInsideStatusLED = 6416, + Zo_LockEnableLocalProgramming = 6442, + Zo_LockEnableLogging = 6469, + Zo_LockEnableOneTouchLocking = 6487, + Zo_LockEnablePrivacyModeButton = 6513, + Zo_LockKeypadOperationEventMask = 6541, + Zo_LockKeypadProgrammingEventMask = 6570, + Zo_LockLEDSettings = 6601, + Zo_LockLanguage = 6617, + Zo_LockManualOperationEventMask = 6630, + Zo_LockOperatingMode = 6659, + Zo_LockRFIDOperationEventMask = 6677, + Zo_LockRFIDProgrammingEventMask = 6704, + Zo_LockRFOperationEventMask = 6733, + Zo_LockRFProgrammingEventMask = 6758, + Zo_LockSoundVolume = 6785, + Zo_LockState = 6801, + Zo_LockSupportedOperatingModes = 6811, + Zo_LockType = 6839, + Zo_LongPollInterval = 6848, + Zo_LongPollIntervalMin = 6865, + Zo_LowTempDwellTripPoint = 6885, + Zo_LowTempThreshold = 6907, + Zo_MainsAlarmMask = 6924, + Zo_MainsFrequency = 6939, + Zo_MainsVoltage = 6954, + Zo_MainsVoltageDwellTripPoint = 6967, + Zo_MainsVoltageMaxThreshold = 6994, + Zo_MainsVoltageMinThreshold = 7019, + Zo_Manufacturer = 7044, + Zo_MaxCoolSetpointLimit = 7057, + Zo_MaxHeatSetpointLimit = 7078, + Zo_MaxPINCodeLength = 7099, + Zo_MaxProxyTableEntries = 7116, + Zo_MaxRFIDCodeLength = 7137, + Zo_MaxSearchCounter = 7155, + Zo_MaxSinkTableEntries = 7172, + Zo_MaxTempExperienced = 7192, + Zo_Measured11thHarmonicCurrent = 7211, + Zo_Measured1stHarmonicCurrent = 7239, + Zo_Measured3rdHarmonicCurrent = 7266, + Zo_Measured5thHarmonicCurrent = 7293, + Zo_Measured7thHarmonicCurrent = 7320, + Zo_Measured9thHarmonicCurrent = 7347, + Zo_MeasuredPhase11thHarmonicCurrent = 7374, + Zo_MeasuredPhase1stHarmonicCurrent = 7407, + Zo_MeasuredPhase3rdHarmonicCurrent = 7439, + Zo_MeasuredPhase5thHarmonicCurrent = 7471, + Zo_MeasuredPhase7thHarmonicCurrent = 7503, + Zo_MeasuredPhase9thHarmonicCurrent = 7535, + Zo_MeterTypeID = 7567, + Zo_MinCoolSetpointLimit = 7579, + Zo_MinHeatSetpointLimit = 7600, + Zo_MinPINCodeLength = 7621, + Zo_MinRFIDCodeLength = 7638, + Zo_MinSetpointDeadBand = 7656, + Zo_MinTempExperienced = 7676, + Zo_Mode = 7695, + Zo_Model = 7700, + Zo_ModelId = 7706, + Zo_MotorStepSize = 7714, + Zo_Movement = 7728, + Zo_MullerLightMode = 7737, + Zo_MultiApplicationType = 7753, + Zo_MultiDescription = 7774, + Zo_MultiInApplicationType = 7791, + Zo_MultiInDescription = 7814, + Zo_MultiInNumberOfStates = 7833, + Zo_MultiInOutOfService = 7855, + Zo_MultiInReliability = 7875, + Zo_MultiInStatusFlags = 7894, + Zo_MultiInValue = 7913, + Zo_MultiNumberOfStates = 7926, + Zo_MultiOutApplicationType = 7946, + Zo_MultiOutDescription = 7970, + Zo_MultiOutNumberOfStates = 7990, + Zo_MultiOutOfService = 8013, + Zo_MultiOutOutOfService = 8031, + Zo_MultiOutReliability = 8052, + Zo_MultiOutRelinquishDefault = 8072, + Zo_MultiOutStatusFlags = 8098, + Zo_MultiOutValue = 8118, + Zo_MultiReliability = 8132, + Zo_MultiRelinquishDefault = 8149, + Zo_MultiStatusFlags = 8172, + Zo_MultiValue = 8189, + Zo_MultipleScheduling = 8200, + Zo_NeutralCurrent = 8219, + Zo_NotificationRetryNumber = 8234, + Zo_NotificationRetryTimer = 8258, + Zo_NumberOfDevices = 8281, + Zo_NumberOfHolidaySchedulesSupported = 8297, + Zo_NumberOfLogRecordsSupported = 8331, + Zo_NumberOfPINUsersSupported = 8359, + Zo_NumberOfPrimaries = 8385, + Zo_NumberOfRFIDUsersSupported = 8403, + Zo_NumberOfResets = 8430, + Zo_NumberOfTotalUsersSupported = 8445, + Zo_NumberOfWeekDaySchedulesSupportedPerUser = 8473, + Zo_NumberOfYearDaySchedulesSupportedPerUser = 8514, + Zo_NumberOfZoneSensitivityLevelsSupported = 8555, + Zo_NumberRSSIMeasurements = 8594, + Zo_NumberofActuationsLift = 8617, + Zo_NumberofActuationsTilt = 8640, + Zo_Occupancy = 8663, + Zo_OccupancySensorType = 8673, + Zo_OccupiedCoolingSetpoint = 8693, + Zo_OccupiedHeatingSetpoint = 8717, + Zo_OffTransitionTime = 8741, + Zo_OffWaitTime = 8759, + Zo_OnLevel = 8771, + Zo_OnOff = 8779, + Zo_OnOffTransitionTime = 8785, + Zo_OnTime = 8805, + Zo_OnTransitionTime = 8812, + Zo_OpenPeriod = 8829, + Zo_OppleMode = 8840, + Zo_OutdoorTemperature = 8850, + Zo_OverTempTotalDwell = 8869, + Zo_PICoolingDemand = 8888, + Zo_PIHeatingDemand = 8904, + Zo_PIROccupiedToUnoccupiedDelay = 8920, + Zo_PIRUnoccupiedToOccupiedDelay = 8949, + Zo_PIRUnoccupiedToOccupiedThreshold = 8978, + Zo_POD = 9011, + Zo_Panic = 9015, + Zo_PartNumber = 9021, + Zo_PathLossExponent = 9032, + Zo_PersistentMemoryWrites = 9049, + Zo_PersonalAlarm = 9072, + Zo_PhaseHarmonicCurrentMultiplier = 9086, + Zo_PhysicalClosedLimit = 9117, + Zo_PhysicalClosedLimitLift = 9137, + Zo_PhysicalClosedLimitTilt = 9161, + Zo_PhysicalEnvironment = 9185, + Zo_Power = 9205, + Zo_PowerDivisor = 9211, + Zo_PowerFactor = 9224, + Zo_PowerFactorPhB = 9236, + Zo_PowerFactorPhC = 9251, + Zo_PowerMultiplier = 9266, + Zo_PowerOffEffect = 9282, + Zo_PowerOnRecall = 9297, + Zo_PowerOnTimer = 9311, + Zo_PowerSource = 9324, + Zo_PowerThreshold = 9336, + Zo_Pressure = 9351, + Zo_PressureMaxMeasuredValue = 9360, + Zo_PressureMaxScaledValue = 9385, + Zo_PressureMinMeasuredValue = 9408, + Zo_PressureMinScaledValue = 9433, + Zo_PressureScale = 9456, + Zo_PressureScaledTolerance = 9470, + Zo_PressureScaledValue = 9494, + Zo_PressureTolerance = 9514, + Zo_Primary1Intensity = 9532, + Zo_Primary1X = 9550, + Zo_Primary1Y = 9560, + Zo_Primary2Intensity = 9570, + Zo_Primary2X = 9588, + Zo_Primary2Y = 9598, + Zo_Primary3Intensity = 9608, + Zo_Primary3X = 9626, + Zo_Primary3Y = 9636, + Zo_Primary4Intensity = 9646, + Zo_Primary4X = 9664, + Zo_Primary4Y = 9674, + Zo_Primary5Intensity = 9684, + Zo_Primary5X = 9702, + Zo_Primary5Y = 9712, + Zo_Primary6Intensity = 9722, + Zo_Primary6X = 9740, + Zo_Primary6Y = 9750, + Zo_ProductCode = 9760, + Zo_ProductRevision = 9772, + Zo_ProductURL = 9788, + Zo_ProxyTable = 9799, + Zo_QualityMeasure = 9810, + Zo_RGB = 9825, + Zo_RHDehumidificationSetpoint = 9829, + Zo_RMSCurrent = 9856, + Zo_RMSCurrentMax = 9867, + Zo_RMSCurrentMaxPhB = 9881, + Zo_RMSCurrentMaxPhC = 9898, + Zo_RMSCurrentMin = 9915, + Zo_RMSCurrentMinPhB = 9929, + Zo_RMSCurrentMinPhC = 9946, + Zo_RMSCurrentPhB = 9963, + Zo_RMSCurrentPhC = 9977, + Zo_RMSExtremeOverVoltage = 9991, + Zo_RMSExtremeOverVoltagePeriod = 10013, + Zo_RMSExtremeOverVoltagePeriodPhB = 10041, + Zo_RMSExtremeOverVoltagePeriodPhC = 10072, + Zo_RMSExtremeUnderVoltage = 10103, + Zo_RMSExtremeUnderVoltagePeriod = 10126, + Zo_RMSExtremeUnderVoltagePeriodPhB = 10155, + Zo_RMSExtremeUnderVoltagePeriodPhC = 10187, + Zo_RMSVoltage = 10219, + Zo_RMSVoltageMax = 10230, + Zo_RMSVoltageMaxPhB = 10244, + Zo_RMSVoltageMaxPhC = 10261, + Zo_RMSVoltageMin = 10278, + Zo_RMSVoltageMinPhB = 10292, + Zo_RMSVoltageMinPhC = 10309, + Zo_RMSVoltagePhB = 10326, + Zo_RMSVoltagePhC = 10340, + Zo_RMSVoltageSag = 10354, + Zo_RMSVoltageSagPeriod = 10368, + Zo_RMSVoltageSagPeriodPhB = 10388, + Zo_RMSVoltageSagPeriodPhC = 10411, + Zo_RMSVoltageSwell = 10434, + Zo_RMSVoltageSwellPeriod = 10450, + Zo_RMSVoltageSwellPeriodPhB = 10472, + Zo_RMSVoltageSwellPeriodPhC = 10497, + Zo_ReactiveCurrent = 10522, + Zo_ReactiveCurrentPhB = 10538, + Zo_ReactiveCurrentPhC = 10557, + Zo_ReactivePower = 10576, + Zo_ReactivePowerPhB = 10590, + Zo_ReactivePowerPhC = 10607, + Zo_RecallScene = 10624, + Zo_RelativeHumidity = 10636, + Zo_RelativeHumidityDisplay = 10653, + Zo_RelativeHumidityMode = 10677, + Zo_RemainingTime = 10698, + Zo_RemoteSensing = 10712, + Zo_RemoveAllGroups = 10726, + Zo_RemoveAllScenes = 10742, + Zo_RemoveGroup = 10758, + Zo_RemoveScene = 10770, + Zo_ReportingPeriod = 10782, + Zo_ResetAlarm = 10798, + Zo_ResetAllAlarms = 10809, + Zo_SWBuildID = 10824, + Zo_Sat = 10834, + Zo_SatMove = 10838, + Zo_SatStep = 10846, + Zo_SceneCount = 10854, + Zo_SceneNameSupport = 10865, + Zo_SceneValid = 10882, + Zo_ScheduleMode = 10893, + Zo_SeaPressure = 10906, + Zo_SecurityLevel = 10918, + Zo_ServerActiveFunctionality = 10932, + Zo_ServerFunctionality = 10958, + Zo_SharedSecurityKey = 10978, + Zo_SharedSecurityKeyType = 10996, + Zo_ShortPollInterval = 11018, + Zo_Shutter = 11036, + Zo_ShutterClose = 11044, + Zo_ShutterLift = 11057, + Zo_ShutterOpen = 11069, + Zo_ShutterStop = 11081, + Zo_ShutterTilt = 11093, + Zo_SinkTable = 11105, + Zo_SoftwareRevision = 11115, + Zo_StackVersion = 11132, + Zo_StandardTime = 11145, + Zo_StartUpOnOff = 11158, + Zo_Status = 11171, + Zo_StoreScene = 11178, + Zo_SwitchActions = 11189, + Zo_SwitchType = 11203, + Zo_SystemMode = 11214, + Zo_TRVBoost = 11225, + Zo_TRVChildProtection = 11234, + Zo_TRVMirrorDisplay = 11253, + Zo_TRVMode = 11270, + Zo_TRVWindowOpen = 11278, + Zo_TempTarget = 11292, + Zo_Temperature = 11303, + Zo_TemperatureDisplayMode = 11315, + Zo_TemperatureMaxMeasuredValue = 11338, + Zo_TemperatureMinMeasuredValue = 11366, + Zo_TemperatureTolerance = 11394, + Zo_TerncyDuration = 11415, + Zo_TerncyRotate = 11430, + Zo_ThSetpoint = 11443, + Zo_ThermostatAlarmMask = 11454, + Zo_ThermostatKeypadLockout = 11474, + Zo_ThermostatOccupancy = 11498, + Zo_ThermostatRunningMode = 11518, + Zo_ThermostatScheduleProgrammingVisibility = 11540, + Zo_Time = 11580, + Zo_TimeEpoch = 11585, + Zo_TimeStatus = 11595, + Zo_TimeZone = 11606, + Zo_TotalActivePower = 11615, + Zo_TotalApparentPower = 11632, + Zo_TotalProfileNum = 11651, + Zo_TotalReactivePower = 11667, + Zo_TuyaCalibration = 11686, + Zo_TuyaCalibrationTime = 11702, + Zo_TuyaMCUVersion = 11722, + Zo_TuyaMotorReversal = 11737, + Zo_TuyaMovingState = 11755, + Zo_TuyaQuery = 11771, + Zo_UnoccupiedCoolingSetpoint = 11781, + Zo_UnoccupiedHeatingSetpoint = 11807, + Zo_UtilityName = 11833, + Zo_ValidUntilTime = 11845, + Zo_ValvePosition = 11860, + Zo_VelocityLift = 11874, + Zo_ViewGroup = 11887, + Zo_ViewScene = 11897, + Zo_Water = 11907, + Zo_WhitePointX = 11913, + Zo_WhitePointY = 11925, + Zo_WindowCoveringType = 11937, + Zo_X = 11956, + Zo_Y = 11958, + Zo_ZCLVersion = 11960, + Zo_ZoneID = 11971, + Zo_ZoneState = 11978, + Zo_ZoneStatus = 11988, + Zo_ZoneStatusChange = 11999, + Zo_ZoneType = 12016, + Zo__ = 12025, + Zo_xx = 12027, + Zo_xx000A00 = 12030, + Zo_xx0A = 12039, + Zo_xx0A00 = 12044, + Zo_xx19 = 12051, + Zo_xx190A = 12056, + Zo_xx190A00 = 12063, + Zo_xxxx = 12072, + Zo_xxxx00 = 12077, + Zo_xxxx0A00 = 12084, + Zo_xxxxyy = 12093, + Zo_xxxxyyyy = 12100, + Zo_xxxxyyyy0A00 = 12109, + Zo_xxxxyyzz = 12122, + Zo_xxyy = 12131, + Zo_xxyy0A00 = 12136, + Zo_xxyyyy = 12145, + Zo_xxyyyy000000000000 = 12152, + Zo_xxyyyy0A0000000000 = 12171, + Zo_xxyyyyzz = 12190, + Zo_xxyyyyzzzz = 12199, + Zo_xxyyzzzz = 12210, }; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino index 7d9daf00c..b2e3bdea0 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino @@ -559,26 +559,32 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = { //{ Zmap8, Cx0005, 0x0004, (NameSupport), Cm1, 0 }, // On/off cluster - { Zbool, Cx0006, 0x0000, Z_(Power), Cm1 + Z_EXPORT_DATA, Z_MAPPING(Z_Data_OnOff, power) }, - { Zenum8, Cx0006, 0x4003, Z_(StartUpOnOff), Cm1, 0 }, - { Zbool, Cx0006, 0x8000, Z_(Power), Cm1, 0 }, // See 7280 - { Zbool, Cx0006, 0x4000, Z_(OnOff), Cm1, 0 }, - { Zuint16, Cx0006, 0x4001, Z_(OnTime), Cm1, 0 }, - { Zuint16, Cx0006, 0x4002, Z_(OffWaitTime), Cm1, 0 }, + { Zbool, Cx0006, 0x0000, Z_(Power), Cm1 + Z_EXPORT_DATA, Z_MAPPING(Z_Data_OnOff, power) }, + { Zenum8, Cx0006, 0x4003, Z_(StartUpOnOff), Cm1, 0 }, + { Zbool, Cx0006, 0x8000, Z_(Power), Cm1, 0 }, // See 7280 + { Zbool, Cx0006, 0x4000, Z_(OnOff), Cm1, 0 }, + { Zuint16, Cx0006, 0x4001, Z_(OnTime), Cm1, 0 }, + { Zuint16, Cx0006, 0x4002, Z_(OffWaitTime), Cm1, 0 }, // On/Off Switch Configuration cluster { Zenum8, Cx0007, 0x0000, Z_(SwitchType), Cm1, 0 }, { Zenum8, Cx0007, 0x0010, Z_(SwitchActions), Cm1, 0 }, // Level Control cluster - { Zuint8, Cx0008, 0x0000, Z_(Dimmer), Cm1 + Z_EXPORT_DATA, Z_MAPPING(Z_Data_Light, dimmer) }, - { Zuint16, Cx0008, 0x0001, Z_(DimmerRemainingTime), Cm1, 0 }, - { Zmap8, Cx0008, 0x000F, Z_(DimmerOptions), Cm1, 0 }, + { Zuint8, Cx0008, 0x0000, Z_(Dimmer), Cm1 + Z_EXPORT_DATA, Z_MAPPING(Z_Data_Light, dimmer) }, + { Zuint16, Cx0008, 0x0001, Z_(DimmerRemainingTime), Cm1, 0 }, + { Zuint8, Cx0008, 0x0002, Z_(DimmerMinLevel), Cm1, 0 }, + { Zuint8, Cx0008, 0x0003, Z_(DimmerMaxLevel), Cm1, 0 }, + { Zuint16, Cx0008, 0x0004, Z_(DimmerCurrentFrequency),Cm1, 0 }, + { Zuint16, Cx0008, 0x0005, Z_(DimmerMinFrequency), Cm1, 0 }, + { Zuint16, Cx0008, 0x0006, Z_(DimmerMaxFrequency), Cm1, 0 }, { Zuint16, Cx0008, 0x0010, Z_(OnOffTransitionTime), Cm1, 0 }, - { Zuint8, Cx0008, 0x0011, Z_(OnLevel), Cm1, 0 }, - { Zuint16, Cx0008, 0x0012, Z_(OnTransitionTime), Cm1, 0 }, - { Zuint16, Cx0008, 0x0013, Z_(OffTransitionTime), Cm1, 0 }, - { Zuint16, Cx0008, 0x0014, Z_(DefaultMoveRate), Cm1, 0 }, + { Zuint8, Cx0008, 0x0011, Z_(OnLevel), Cm1, 0 }, + { Zuint16, Cx0008, 0x0012, Z_(OnTransitionTime), Cm1, 0 }, + { Zuint16, Cx0008, 0x0013, Z_(OffTransitionTime), Cm1, 0 }, + { Zuint16, Cx0008, 0x0014, Z_(DefaultMoveRate), Cm1, 0 }, + { Zmap8, Cx0008, 0x000F, Z_(DimmerOptions), Cm1, 0 }, + { Zuint8, Cx0008, 0x4000, Z_(DimmerStartUpLevel), Cm1, 0 }, // Alarms cluster { Zuint16, Cx0009, 0x0000, Z_(AlarmCount), Cm1, 0 }, @@ -959,6 +965,7 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = { { Zmap16, Cx0300, 0x400A, Z_(ColorCapabilities), Cm1, 0 }, { Zuint16, Cx0300, 0x400B, Z_(ColorTempPhysicalMinMireds), Cm1, 0 }, { Zuint16, Cx0300, 0x400C, Z_(ColorTempPhysicalMaxMireds), Cm1, 0 }, + { Zuint16, Cx0300, 0x4010, Z_(ColorStartUpColorTempireds), Cm1, 0 }, // Ballast Configuration { Zuint8, Cx0301, 0x0000, Z_(BallastPhysicalMinLevel), Cm1, 0 },