mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8615 from s-hadinger/zigbee_autoresponder 

Add Zigbee auto-responder for common attributes
This commit is contained in:
Theo Arends 2020-06-04 09:39:20 +02:00 committed by GitHub
parent f035932c74 45397293e1
commit a799ba3f98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 563 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/CHANGELOG.md
View File

@ -15,6 +15,7 @@
- Add ``CpuFrequency`` to ``status 2`` - Add ``CpuFrequency`` to ``status 2``
- Add ``FlashFrequency`` to ``status 4`` - Add ``FlashFrequency`` to ``status 4``
- Add support for up to two BH1750 sensors controlled by commands ``BH1750Resolution`` and ``BH1750MTime`` (#8139) - Add support for up to two BH1750 sensors controlled by commands ``BH1750Resolution`` and ``BH1750MTime`` (#8139)
- Add Zigbee auto-responder for common attributes
### 8.3.1.1 20200518 ### 8.3.1.1 20200518

1
tasmota/i18n.h
View File

@ -528,6 +528,7 @@
#define D_CMND_ZIGBEE_SEND "Send" #define D_CMND_ZIGBEE_SEND "Send"
#define D_CMND_ZIGBEE_WRITE "Write" #define D_CMND_ZIGBEE_WRITE "Write"
#define D_CMND_ZIGBEE_REPORT "Report" #define D_CMND_ZIGBEE_REPORT "Report"
#define D_CMND_ZIGBEE_RESPONSE "Response"
#define D_JSON_ZIGBEE_ZCL_SENT "ZbZCLSent" #define D_JSON_ZIGBEE_ZCL_SENT "ZbZCLSent"
#define D_JSON_ZIGBEE_RECEIVED "ZbReceived" #define D_JSON_ZIGBEE_RECEIVED "ZbReceived"
#define D_CMND_ZIGBEE_BIND "Bind" #define D_CMND_ZIGBEE_BIND "Bind"

8
tasmota/support_json.ino
View File

@ -89,7 +89,7 @@ const JsonVariant &GetCaseInsensitive(const JsonObject &json, const char *needle
// key can be in PROGMEM // key can be in PROGMEM
// if needle == "?" then we return the first valid key // if needle == "?" then we return the first valid key
bool wildcard = strcmp_P("?", needle) == 0; bool wildcard = strcmp_P("?", needle) == 0;
if ((nullptr == &json) || (nullptr == needle) || (0 == pgm_read_byte(needle))) { if ((nullptr == &json) || (nullptr == needle) || (0 == pgm_read_byte(needle)) || (!json.success())) {
return *(JsonVariant*)nullptr; return *(JsonVariant*)nullptr;
} }
@ -104,3 +104,9 @@ const JsonVariant &GetCaseInsensitive(const JsonObject &json, const char *needle
// if not found // if not found
return *(JsonVariant*)nullptr; return *(JsonVariant*)nullptr;
} }
// This function returns true if the JsonObject contains the specified key
// It's just a wrapper to the previous function but it can be tricky to test nullptr on an object ref
bool HasKeyCaseInsensitive(const JsonObject &json, const char *needle) {
return &GetCaseInsensitive(json, needle) != nullptr;
}

4
tasmota/xdrv_04_light.ino
View File

@ -1429,6 +1429,10 @@ void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
light_state.getHSB(hue, sat, bri); light_state.getHSB(hue, sat, bri);
} }
void LightGetXY(float *X, float *Y) {
light_state.getXY(X, Y);
}
void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) { void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
light_state.HsToRgb(hue, sat, r_r, r_g, r_b); light_state.HsToRgb(hue, sat, r_r, r_g, r_b);
} }

1
tasmota/xdrv_23_zigbee_0_constants.ino
View File

@ -384,7 +384,6 @@ enum ZCL_Global_Commands {
ZCL_DEFAULT_RESPONSE = 0x0b, ZCL_DEFAULT_RESPONSE = 0x0b,
ZCL_DISCOVER_ATTRIBUTES = 0x0c, ZCL_DISCOVER_ATTRIBUTES = 0x0c,
ZCL_DISCOVER_ATTRIBUTES_RESPONSE = 0x0d ZCL_DISCOVER_ATTRIBUTES_RESPONSE = 0x0d
}; };
#define ZF(s) static const char ZS_ ## s[] PROGMEM = #s; #define ZF(s) static const char ZS_ ## s[] PROGMEM = #s;

2
tasmota/xdrv_23_zigbee_2_devices.ino
View File

@ -526,6 +526,8 @@ void Z_Devices::addEndpoint(uint16_t shortaddr, uint8_t endpoint) {
// Find the first endpoint of the device // Find the first endpoint of the device
uint8_t Z_Devices::findFirstEndpoint(uint16_t shortaddr) const { uint8_t Z_Devices::findFirstEndpoint(uint16_t shortaddr) const {
// When in router of end-device mode, the coordinator was not probed, in this case always talk to endpoint 1
if (0x0000 == shortaddr) { return 1; }
int32_t found = findShortAddr(shortaddr); int32_t found = findShortAddr(shortaddr);
if (found < 0) return 0; // avoid creating an entry if the device was never seen if (found < 0) return 0; // avoid creating an entry if the device was never seen
const Z_Device &device = devicesAt(found); const Z_Device &device = devicesAt(found);

705
tasmota/xdrv_23_zigbee_5_converters.ino
View File

@ -89,7 +89,9 @@ typedef struct Z_AttributeConverter {
uint8_t cluster_short; uint8_t cluster_short;
uint16_t attribute; uint16_t attribute;
const char * name; const char * name;
Z_AttrConverter func; int16_t multiplier; // multiplier for numerical value, (if > 0 multiply by x, if <0 device by x)
uint8_t cb; // callback func from Z_ConvOperators
// Z_AttrConverter func;
} Z_AttributeConverter; } Z_AttributeConverter;
// Cluster numbers are store in 8 bits format to save space, // Cluster numbers are store in 8 bits format to save space,
@ -118,6 +120,16 @@ uint16_t CxToCluster(uint8_t cx) {
return 0xFFFF; return 0xFFFF;
} }
enum Z_ConvOperators {
Z_Nop, // copy value
Z_AddPressureUnit, // add pressure unit attribute (non numerical)
Z_ManufKeep, // copy and record Manufacturer attribute
Z_ModelKeep, // copy and record ModelId attribute
Z_AqaraSensor, // decode prioprietary Aqara Sensor message
Z_AqaraVibration, // decode Aqara vibration modes
Z_AqaraCube, // decode Aqara cube
};
ZF(ZCLVersion) ZF(AppVersion) ZF(StackVersion) ZF(HWVersion) ZF(Manufacturer) ZF(ModelId) ZF(ZCLVersion) ZF(AppVersion) ZF(StackVersion) ZF(HWVersion) ZF(Manufacturer) ZF(ModelId)
ZF(DateCode) ZF(PowerSource) ZF(SWBuildID) ZF(Power) ZF(SwitchType) ZF(Dimmer) ZF(DateCode) ZF(PowerSource) ZF(SWBuildID) ZF(Power) ZF(SwitchType) ZF(Dimmer)
ZF(MainsVoltage) ZF(MainsFrequency) ZF(BatteryVoltage) ZF(BatteryPercentage) ZF(MainsVoltage) ZF(MainsFrequency) ZF(BatteryVoltage) ZF(BatteryPercentage)
@ -209,356 +221,356 @@ ZF(SoftwareRevision) ZF(POD) ZF(AvailablePower) ZF(PowerThreshold) ZF(ProductRev
ZF(NumberOfResets) ZF(PersistentMemoryWrites) ZF(LastMessageLQI) ZF(LastMessageRSSI) ZF(NumberOfResets) ZF(PersistentMemoryWrites) ZF(LastMessageLQI) ZF(LastMessageRSSI)
// list of post-processing directives // list of post-processing directives
const Z_AttributeConverter Z_PostProcess[] PROGMEM = { const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
{ Zuint8, Cx0000, 0x0000, Z(ZCLVersion), &Z_Copy }, { Zuint8, Cx0000, 0x0000, Z(ZCLVersion), 1, Z_Nop },
{ Zuint8, Cx0000, 0x0001, Z(AppVersion), &Z_Copy }, { Zuint8, Cx0000, 0x0001, Z(AppVersion), 1, Z_Nop },
{ Zuint8, Cx0000, 0x0002, Z(StackVersion), &Z_Copy }, { Zuint8, Cx0000, 0x0002, Z(StackVersion), 1, Z_Nop },
{ Zuint8, Cx0000, 0x0003, Z(HWVersion), &Z_Copy }, { Zuint8, Cx0000, 0x0003, Z(HWVersion), 1, Z_Nop },
{ Zstring, Cx0000, 0x0004, Z(Manufacturer), &Z_ManufKeep }, // record Manufacturer { Zstring, Cx0000, 0x0004, Z(Manufacturer), 1, Z_ManufKeep }, // record Manufacturer
{ Zstring, Cx0000, 0x0005, Z(ModelId), &Z_ModelKeep }, // record Model { Zstring, Cx0000, 0x0005, Z(ModelId), 1, Z_ModelKeep }, // record Model
{ Zstring, Cx0000, 0x0006, Z(DateCode), &Z_Copy }, { Zstring, Cx0000, 0x0006, Z(DateCode), 1, Z_Nop },
{ Zenum8, Cx0000, 0x0007, Z(PowerSource), &Z_Copy }, { Zenum8, Cx0000, 0x0007, Z(PowerSource), 1, Z_Nop },
{ Zstring, Cx0000, 0x4000, Z(SWBuildID), &Z_Copy }, { Zstring, Cx0000, 0x4000, Z(SWBuildID), 1, Z_Nop },
{ Zunk, Cx0000, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0000, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Cmd 0x0A - Cluster 0x0000, attribute 0xFF01 - proprietary // Cmd 0x0A - Cluster 0x0000, attribute 0xFF01 - proprietary
{ Zmap8, Cx0000, 0xFF01, nullptr, &Z_AqaraSensor }, // Occupancy (map8) { Zmap8, Cx0000, 0xFF01, nullptr, 0, Z_AqaraSensor }, // Occupancy (map8)
// Power Configuration cluster // Power Configuration cluster
{ Zuint16, Cx0001, 0x0000, Z(MainsVoltage), &Z_Copy }, { Zuint16, Cx0001, 0x0000, Z(MainsVoltage), 1, Z_Nop },
{ Zuint8, Cx0001, 0x0001, Z(MainsFrequency), &Z_Copy }, { Zuint8, Cx0001, 0x0001, Z(MainsFrequency), 1, Z_Nop },
{ Zuint8, Cx0001, 0x0020, Z(BatteryVoltage), &Z_FloatDiv10 }, { Zuint8, Cx0001, 0x0020, Z(BatteryVoltage), -10,Z_Nop }, // divide by 10
{ Zuint8, Cx0001, 0x0021, Z(BatteryPercentage), &Z_FloatDiv2 }, { Zuint8, Cx0001, 0x0021, Z(BatteryPercentage), -2, Z_Nop }, // divide by 2
// Device Temperature Configuration cluster // Device Temperature Configuration cluster
{ Zint16, Cx0002, 0x0000, Z(CurrentTemperature), &Z_Copy }, { Zint16, Cx0002, 0x0000, Z(CurrentTemperature), 1, Z_Nop },
{ Zint16, Cx0002, 0x0001, Z(MinTempExperienced), &Z_Copy }, { Zint16, Cx0002, 0x0001, Z(MinTempExperienced), 1, Z_Nop },
{ Zint16, Cx0002, 0x0002, Z(MaxTempExperienced), &Z_Copy }, { Zint16, Cx0002, 0x0002, Z(MaxTempExperienced), 1, Z_Nop },
{ Zuint16, Cx0002, 0x0003, Z(OverTempTotalDwell), &Z_Copy }, { Zuint16, Cx0002, 0x0003, Z(OverTempTotalDwell), 1, Z_Nop },
// Scenes cluster // Scenes cluster
{ Zuint8, Cx0005, 0x0000, Z(SceneCount), &Z_Copy }, { Zuint8, Cx0005, 0x0000, Z(SceneCount), 1, Z_Nop },
{ Zuint8, Cx0005, 0x0001, Z(CurrentScene), &Z_Copy }, { Zuint8, Cx0005, 0x0001, Z(CurrentScene), 1, Z_Nop },
{ Zuint16, Cx0005, 0x0002, Z(CurrentGroup), &Z_Copy }, { Zuint16, Cx0005, 0x0002, Z(CurrentGroup), 1, Z_Nop },
{ Zbool, Cx0005, 0x0003, Z(SceneValid), &Z_Copy }, { Zbool, Cx0005, 0x0003, Z(SceneValid), 1, Z_Nop },
//{ Zmap8, Cx0005, 0x0004, Z(NameSupport), &Z_Copy }, //{ Zmap8, Cx0005, 0x0004, Z(NameSupport), 1, Z_Nop },
// On/off cluster // On/off cluster
{ Zbool, Cx0006, 0x0000, Z(Power), &Z_Copy }, { Zbool, Cx0006, 0x0000, Z(Power), 1, Z_Nop },
{ Zbool, Cx0006, 0x8000, Z(Power), &Z_Copy }, // See 7280 { Zbool, Cx0006, 0x8000, Z(Power), 1, Z_Nop }, // See 7280
// On/Off Switch Configuration cluster // On/Off Switch Configuration cluster
{ Zenum8, Cx0007, 0x0000, Z(SwitchType), &Z_Copy }, { Zenum8, Cx0007, 0x0000, Z(SwitchType), 1, Z_Nop },
// Level Control cluster // Level Control cluster
{ Zuint8, Cx0008, 0x0000, Z(Dimmer), &Z_Copy }, { Zuint8, Cx0008, 0x0000, Z(Dimmer), 1, Z_Nop },
// { Zuint16, Cx0008, 0x0001, Z(RemainingTime", &Z_Copy }, // { Zuint16, Cx0008, 0x0001, Z(RemainingTime", 1, Z_Nop },
// { Zuint16, Cx0008, 0x0010, Z(OnOffTransitionTime", &Z_Copy }, // { Zuint16, Cx0008, 0x0010, Z(OnOffTransitionTime", 1, Z_Nop },
// { Zuint8, Cx0008, 0x0011, Z(OnLevel", &Z_Copy }, // { Zuint8, Cx0008, 0x0011, Z(OnLevel", 1, Z_Nop },
// { Zuint16, Cx0008, 0x0012, Z(OnTransitionTime", &Z_Copy }, // { Zuint16, Cx0008, 0x0012, Z(OnTransitionTime", 1, Z_Nop },
// { Zuint16, Cx0008, 0x0013, Z(OffTransitionTime", &Z_Copy }, // { Zuint16, Cx0008, 0x0013, Z(OffTransitionTime", 1, Z_Nop },
// { Zuint16, Cx0008, 0x0014, Z(DefaultMoveRate", &Z_Copy }, // { Zuint16, Cx0008, 0x0014, Z(DefaultMoveRate", 1, Z_Nop },
// Alarms cluster // Alarms cluster
{ Zuint16, Cx0009, 0x0000, Z(AlarmCount), &Z_Copy }, { Zuint16, Cx0009, 0x0000, Z(AlarmCount), 1, Z_Nop },
// Time cluster // Time cluster
{ ZUTC, Cx000A, 0x0000, Z(Time), &Z_Copy }, { ZUTC, Cx000A, 0x0000, Z(Time), 1, Z_Nop },
{ Zmap8, Cx000A, 0x0001, Z(TimeStatus), &Z_Copy }, { Zmap8, Cx000A, 0x0001, Z(TimeStatus), 1, Z_Nop },
{ Zint32, Cx000A, 0x0002, Z(TimeZone), &Z_Copy }, { Zint32, Cx000A, 0x0002, Z(TimeZone), 1, Z_Nop },
{ Zuint32, Cx000A, 0x0003, Z(DstStart), &Z_Copy }, { Zuint32, Cx000A, 0x0003, Z(DstStart), 1, Z_Nop },
{ Zuint32, Cx000A, 0x0004, Z(DstEnd), &Z_Copy }, { Zuint32, Cx000A, 0x0004, Z(DstEnd), 1, Z_Nop },
{ Zint32, Cx000A, 0x0005, Z(DstShift), &Z_Copy }, { Zint32, Cx000A, 0x0005, Z(DstShift), 1, Z_Nop },
{ Zuint32, Cx000A, 0x0006, Z(StandardTime), &Z_Copy }, { Zuint32, Cx000A, 0x0006, Z(StandardTime), 1, Z_Nop },
{ Zuint32, Cx000A, 0x0007, Z(LocalTime), &Z_Copy }, { Zuint32, Cx000A, 0x0007, Z(LocalTime), 1, Z_Nop },
{ ZUTC, Cx000A, 0x0008, Z(LastSetTime), &Z_Copy }, { ZUTC, Cx000A, 0x0008, Z(LastSetTime), 1, Z_Nop },
{ ZUTC, Cx000A, 0x0009, Z(ValidUntilTime), &Z_Copy }, { ZUTC, Cx000A, 0x0009, Z(ValidUntilTime), 1, Z_Nop },
// RSSI Location cluster // RSSI Location cluster
{ Zdata8, Cx000B, 0x0000, Z(LocationType), &Z_Copy }, { Zdata8, Cx000B, 0x0000, Z(LocationType), 1, Z_Nop },
{ Zenum8, Cx000B, 0x0001, Z(LocationMethod), &Z_Copy }, { Zenum8, Cx000B, 0x0001, Z(LocationMethod), 1, Z_Nop },
{ Zuint16, Cx000B, 0x0002, Z(LocationAge), &Z_Copy }, { Zuint16, Cx000B, 0x0002, Z(LocationAge), 1, Z_Nop },
{ Zuint8, Cx000B, 0x0003, Z(QualityMeasure), &Z_Copy }, { Zuint8, Cx000B, 0x0003, Z(QualityMeasure), 1, Z_Nop },
{ Zuint8, Cx000B, 0x0004, Z(NumberOfDevices), &Z_Copy }, { Zuint8, Cx000B, 0x0004, Z(NumberOfDevices), 1, Z_Nop },
// Analog Input cluster // Analog Input cluster
// { 0xFF, Cx000C, 0x0004, Z(AnalogInActiveText), &Z_Copy }, // { 0xFF, Cx000C, 0x0004, Z(AnalogInActiveText), 1, Z_Nop },
{ Zstring, Cx000C, 0x001C, Z(AnalogInDescription), &Z_Copy }, { Zstring, Cx000C, 0x001C, Z(AnalogInDescription), 1, Z_Nop },
// { 0xFF, Cx000C, 0x002E, Z(AnalogInInactiveText), &Z_Copy }, // { 0xFF, Cx000C, 0x002E, Z(AnalogInInactiveText), 1, Z_Nop },
{ Zsingle, Cx000C, 0x0041, Z(AnalogInMaxValue), &Z_Copy }, { Zsingle, Cx000C, 0x0041, Z(AnalogInMaxValue), 1, Z_Nop },
{ Zsingle, Cx000C, 0x0045, Z(AnalogInMinValue), &Z_Copy }, { Zsingle, Cx000C, 0x0045, Z(AnalogInMinValue), 1, Z_Nop },
{ Zbool, Cx000C, 0x0051, Z(AnalogInOutOfService), &Z_Copy }, { Zbool, Cx000C, 0x0051, Z(AnalogInOutOfService), 1, Z_Nop },
{ Zsingle, Cx000C, 0x0055, Z(AqaraRotate), &Z_Copy }, { Zsingle, Cx000C, 0x0055, Z(AqaraRotate), 1, Z_Nop },
// { 0xFF, Cx000C, 0x0057, Z(AnalogInPriorityArray),&Z_Copy }, // { 0xFF, Cx000C, 0x0057, Z(AnalogInPriorityArray),1, Z_Nop },
{ Zenum8, Cx000C, 0x0067, Z(AnalogInReliability), &Z_Copy }, { Zenum8, Cx000C, 0x0067, Z(AnalogInReliability), 1, Z_Nop },
// { 0xFF, Cx000C, 0x0068, Z(AnalogInRelinquishDefault),&Z_Copy }, // { 0xFF, Cx000C, 0x0068, Z(AnalogInRelinquishDefault),1, Z_Nop },
{ Zsingle, Cx000C, 0x006A, Z(AnalogInResolution), &Z_Copy }, { Zsingle, Cx000C, 0x006A, Z(AnalogInResolution), 1, Z_Nop },
{ Zmap8, Cx000C, 0x006F, Z(AnalogInStatusFlags), &Z_Copy }, { Zmap8, Cx000C, 0x006F, Z(AnalogInStatusFlags), 1, Z_Nop },
{ Zenum16, Cx000C, 0x0075, Z(AnalogInEngineeringUnits),&Z_Copy }, { Zenum16, Cx000C, 0x0075, Z(AnalogInEngineeringUnits),1, Z_Nop },
{ Zuint32, Cx000C, 0x0100, Z(AnalogInApplicationType),&Z_Copy }, { Zuint32, Cx000C, 0x0100, Z(AnalogInApplicationType),1, Z_Nop },
{ Zuint16, Cx000C, 0xFF05, Z(Aqara_FF05), &Z_Copy }, { Zuint16, Cx000C, 0xFF05, Z(Aqara_FF05), 1, Z_Nop },
// Analog Output cluster // Analog Output cluster
{ Zstring, Cx000D, 0x001C, Z(AnalogOutDescription), &Z_Copy }, { Zstring, Cx000D, 0x001C, Z(AnalogOutDescription), 1, Z_Nop },
{ Zsingle, Cx000D, 0x0041, Z(AnalogOutMaxValue), &Z_Copy }, { Zsingle, Cx000D, 0x0041, Z(AnalogOutMaxValue), 1, Z_Nop },
{ Zsingle, Cx000D, 0x0045, Z(AnalogOutMinValue), &Z_Copy }, { Zsingle, Cx000D, 0x0045, Z(AnalogOutMinValue), 1, Z_Nop },
{ Zbool, Cx000D, 0x0051, Z(AnalogOutOutOfService),&Z_Copy }, { Zbool, Cx000D, 0x0051, Z(AnalogOutOutOfService),1, Z_Nop },
{ Zsingle, Cx000D, 0x0055, Z(AnalogOutValue), &Z_Copy }, { Zsingle, Cx000D, 0x0055, Z(AnalogOutValue), 1, Z_Nop },
// { Zunk, Cx000D, 0x0057, Z(AnalogOutPriorityArray),&Z_Copy }, // { Zunk, Cx000D, 0x0057, Z(AnalogOutPriorityArray),1, Z_Nop },
{ Zenum8, Cx000D, 0x0067, Z(AnalogOutReliability), &Z_Copy }, { Zenum8, Cx000D, 0x0067, Z(AnalogOutReliability), 1, Z_Nop },
{ Zsingle, Cx000D, 0x0068, Z(AnalogOutRelinquishDefault),&Z_Copy }, { Zsingle, Cx000D, 0x0068, Z(AnalogOutRelinquishDefault),1, Z_Nop },
{ Zsingle, Cx000D, 0x006A, Z(AnalogOutResolution), &Z_Copy }, { Zsingle, Cx000D, 0x006A, Z(AnalogOutResolution), 1, Z_Nop },
{ Zmap8, Cx000D, 0x006F, Z(AnalogOutStatusFlags), &Z_Copy }, { Zmap8, Cx000D, 0x006F, Z(AnalogOutStatusFlags), 1, Z_Nop },
{ Zenum16, Cx000D, 0x0075, Z(AnalogOutEngineeringUnits),&Z_Copy }, { Zenum16, Cx000D, 0x0075, Z(AnalogOutEngineeringUnits),1, Z_Nop },
{ Zuint32, Cx000D, 0x0100, Z(AnalogOutApplicationType),&Z_Copy }, { Zuint32, Cx000D, 0x0100, Z(AnalogOutApplicationType),1, Z_Nop },
// Analog Value cluster // Analog Value cluster
{ Zstring, Cx000E, 0x001C, Z(AnalogDescription), &Z_Copy }, { Zstring, Cx000E, 0x001C, Z(AnalogDescription), 1, Z_Nop },
{ Zbool, Cx000E, 0x0051, Z(AnalogOutOfService), &Z_Copy }, { Zbool, Cx000E, 0x0051, Z(AnalogOutOfService), 1, Z_Nop },
{ Zsingle, Cx000E, 0x0055, Z(AnalogValue), &Z_Copy }, { Zsingle, Cx000E, 0x0055, Z(AnalogValue), 1, Z_Nop },
{ Zunk, Cx000E, 0x0057, Z(AnalogPriorityArray), &Z_Copy }, { Zunk, Cx000E, 0x0057, Z(AnalogPriorityArray), 1, Z_Nop },
{ Zenum8, Cx000E, 0x0067, Z(AnalogReliability), &Z_Copy }, { Zenum8, Cx000E, 0x0067, Z(AnalogReliability), 1, Z_Nop },
{ Zsingle, Cx000E, 0x0068, Z(AnalogRelinquishDefault),&Z_Copy }, { Zsingle, Cx000E, 0x0068, Z(AnalogRelinquishDefault),1, Z_Nop },
{ Zmap8, Cx000E, 0x006F, Z(AnalogStatusFlags), &Z_Copy }, { Zmap8, Cx000E, 0x006F, Z(AnalogStatusFlags), 1, Z_Nop },
{ Zenum16, Cx000E, 0x0075, Z(AnalogEngineeringUnits),&Z_Copy }, { Zenum16, Cx000E, 0x0075, Z(AnalogEngineeringUnits),1, Z_Nop },
{ Zuint32, Cx000E, 0x0100, Z(AnalogApplicationType),&Z_Copy }, { Zuint32, Cx000E, 0x0100, Z(AnalogApplicationType),1, Z_Nop },
// Binary Input cluster // Binary Input cluster
{ Zstring, Cx000F, 0x0004, Z(BinaryInActiveText), &Z_Copy }, { Zstring, Cx000F, 0x0004, Z(BinaryInActiveText), 1, Z_Nop },
{ Zstring, Cx000F, 0x001C, Z(BinaryInDescription), &Z_Copy }, { Zstring, Cx000F, 0x001C, Z(BinaryInDescription), 1, Z_Nop },
{ Zstring, Cx000F, 0x002E, Z(BinaryInInactiveText),&Z_Copy }, { Zstring, Cx000F, 0x002E, Z(BinaryInInactiveText),1, Z_Nop },
{ Zbool, Cx000F, 0x0051, Z(BinaryInOutOfService),&Z_Copy }, { Zbool, Cx000F, 0x0051, Z(BinaryInOutOfService),1, Z_Nop },
{ Zenum8, Cx000F, 0x0054, Z(BinaryInPolarity), &Z_Copy }, { Zenum8, Cx000F, 0x0054, Z(BinaryInPolarity), 1, Z_Nop },
{ Zstring, Cx000F, 0x0055, Z(BinaryInValue), &Z_Copy }, { Zstring, Cx000F, 0x0055, Z(BinaryInValue), 1, Z_Nop },
// { 0xFF, Cx000F, 0x0057, Z(BinaryInPriorityArray),&Z_Copy }, // { 0xFF, Cx000F, 0x0057, Z(BinaryInPriorityArray),1, Z_Nop },
{ Zenum8, Cx000F, 0x0067, Z(BinaryInReliability), &Z_Copy }, { Zenum8, Cx000F, 0x0067, Z(BinaryInReliability), 1, Z_Nop },
{ Zmap8, Cx000F, 0x006F, Z(BinaryInStatusFlags), &Z_Copy }, { Zmap8, Cx000F, 0x006F, Z(BinaryInStatusFlags), 1, Z_Nop },
{ Zuint32, Cx000F, 0x0100, Z(BinaryInApplicationType),&Z_Copy }, { Zuint32, Cx000F, 0x0100, Z(BinaryInApplicationType),1, Z_Nop },
// Binary Output cluster // Binary Output cluster
{ Zstring, Cx0010, 0x0004, Z(BinaryOutActiveText), &Z_Copy }, { Zstring, Cx0010, 0x0004, Z(BinaryOutActiveText), 1, Z_Nop },
{ Zstring, Cx0010, 0x001C, Z(BinaryOutDescription), &Z_Copy }, { Zstring, Cx0010, 0x001C, Z(BinaryOutDescription), 1, Z_Nop },
{ Zstring, Cx0010, 0x002E, Z(BinaryOutInactiveText),&Z_Copy }, { Zstring, Cx0010, 0x002E, Z(BinaryOutInactiveText),1, Z_Nop },
{ Zuint32, Cx0010, 0x0042, Z(BinaryOutMinimumOffTime),&Z_Copy }, { Zuint32, Cx0010, 0x0042, Z(BinaryOutMinimumOffTime),1, Z_Nop },
{ Zuint32, Cx0010, 0x0043, Z(BinaryOutMinimumOnTime),&Z_Copy }, { Zuint32, Cx0010, 0x0043, Z(BinaryOutMinimumOnTime),1, Z_Nop },
{ Zbool, Cx0010, 0x0051, Z(BinaryOutOutOfService),&Z_Copy }, { Zbool, Cx0010, 0x0051, Z(BinaryOutOutOfService),1, Z_Nop },
{ Zenum8, Cx0010, 0x0054, Z(BinaryOutPolarity), &Z_Copy }, { Zenum8, Cx0010, 0x0054, Z(BinaryOutPolarity), 1, Z_Nop },
{ Zbool, Cx0010, 0x0055, Z(BinaryOutValue), &Z_Copy }, { Zbool, Cx0010, 0x0055, Z(BinaryOutValue), 1, Z_Nop },
// { Zunk, Cx0010, 0x0057, Z(BinaryOutPriorityArray),&Z_Copy }, // { Zunk, Cx0010, 0x0057, Z(BinaryOutPriorityArray),1, Z_Nop },
{ Zenum8, Cx0010, 0x0067, Z(BinaryOutReliability), &Z_Copy }, { Zenum8, Cx0010, 0x0067, Z(BinaryOutReliability), 1, Z_Nop },
{ Zbool, Cx0010, 0x0068, Z(BinaryOutRelinquishDefault),&Z_Copy }, { Zbool, Cx0010, 0x0068, Z(BinaryOutRelinquishDefault),1, Z_Nop },
{ Zmap8, Cx0010, 0x006F, Z(BinaryOutStatusFlags), &Z_Copy }, { Zmap8, Cx0010, 0x006F, Z(BinaryOutStatusFlags), 1, Z_Nop },
{ Zuint32, Cx0010, 0x0100, Z(BinaryOutApplicationType),&Z_Copy }, { Zuint32, Cx0010, 0x0100, Z(BinaryOutApplicationType),1, Z_Nop },
// Binary Value cluster // Binary Value cluster
{ Zstring, Cx0011, 0x0004, Z(BinaryActiveText), &Z_Copy }, { Zstring, Cx0011, 0x0004, Z(BinaryActiveText), 1, Z_Nop },
{ Zstring, Cx0011, 0x001C, Z(BinaryDescription), &Z_Copy }, { Zstring, Cx0011, 0x001C, Z(BinaryDescription), 1, Z_Nop },
{ Zstring, Cx0011, 0x002E, Z(BinaryInactiveText), &Z_Copy }, { Zstring, Cx0011, 0x002E, Z(BinaryInactiveText), 1, Z_Nop },
{ Zuint32, Cx0011, 0x0042, Z(BinaryMinimumOffTime), &Z_Copy }, { Zuint32, Cx0011, 0x0042, Z(BinaryMinimumOffTime), 1, Z_Nop },
{ Zuint32, Cx0011, 0x0043, Z(BinaryMinimumOnTime), &Z_Copy }, { Zuint32, Cx0011, 0x0043, Z(BinaryMinimumOnTime), 1, Z_Nop },
{ Zbool, Cx0011, 0x0051, Z(BinaryOutOfService), &Z_Copy }, { Zbool, Cx0011, 0x0051, Z(BinaryOutOfService), 1, Z_Nop },
{ Zbool, Cx0011, 0x0055, Z(BinaryValue), &Z_Copy }, { Zbool, Cx0011, 0x0055, Z(BinaryValue), 1, Z_Nop },
// { Zunk, Cx0011, 0x0057, Z(BinaryPriorityArray), &Z_Copy }, // { Zunk, Cx0011, 0x0057, Z(BinaryPriorityArray), 1, Z_Nop },
{ Zenum8, Cx0011, 0x0067, Z(BinaryReliability), &Z_Copy }, { Zenum8, Cx0011, 0x0067, Z(BinaryReliability), 1, Z_Nop },
{ Zbool, Cx0011, 0x0068, Z(BinaryRelinquishDefault),&Z_Copy }, { Zbool, Cx0011, 0x0068, Z(BinaryRelinquishDefault),1, Z_Nop },
{ Zmap8, Cx0011, 0x006F, Z(BinaryStatusFlags), &Z_Copy }, { Zmap8, Cx0011, 0x006F, Z(BinaryStatusFlags), 1, Z_Nop },
{ Zuint32, Cx0011, 0x0100, Z(BinaryApplicationType),&Z_Copy }, { Zuint32, Cx0011, 0x0100, Z(BinaryApplicationType),1, Z_Nop },
// Multistate Input cluster // Multistate Input cluster
// { Zunk, Cx0012, 0x000E, Z(MultiInStateText), &Z_Copy }, // { Zunk, Cx0012, 0x000E, Z(MultiInStateText), 1, Z_Nop },
{ Zstring, Cx0012, 0x001C, Z(MultiInDescription), &Z_Copy }, { Zstring, Cx0012, 0x001C, Z(MultiInDescription), 1, Z_Nop },
{ Zuint16, Cx0012, 0x004A, Z(MultiInNumberOfStates),&Z_Copy }, { Zuint16, Cx0012, 0x004A, Z(MultiInNumberOfStates),1, Z_Nop },
{ Zbool, Cx0012, 0x0051, Z(MultiInOutOfService), &Z_Copy }, { Zbool, Cx0012, 0x0051, Z(MultiInOutOfService), 1, Z_Nop },
{ Zuint16, Cx0012, 0x0055, Z(MultiInValue), &Z_AqaraCube }, { Zuint16, Cx0012, 0x0055, Z(MultiInValue), 0, Z_AqaraCube },
{ Zenum8, Cx0012, 0x0067, Z(MultiInReliability), &Z_Copy }, { Zenum8, Cx0012, 0x0067, Z(MultiInReliability), 1, Z_Nop },
{ Zmap8, Cx0012, 0x006F, Z(MultiInStatusFlags), &Z_Copy }, { Zmap8, Cx0012, 0x006F, Z(MultiInStatusFlags), 1, Z_Nop },
{ Zuint32, Cx0012, 0x0100, Z(MultiInApplicationType),&Z_Copy }, { Zuint32, Cx0012, 0x0100, Z(MultiInApplicationType),1, Z_Nop },
// Multistate output // Multistate output
// { Zunk, Cx0013, 0x000E, Z(MultiOutStateText), &Z_Copy }, // { Zunk, Cx0013, 0x000E, Z(MultiOutStateText), 1, Z_Nop },
{ Zstring, Cx0013, 0x001C, Z(MultiOutDescription), &Z_Copy }, { Zstring, Cx0013, 0x001C, Z(MultiOutDescription), 1, Z_Nop },
{ Zuint16, Cx0013, 0x004A, Z(MultiOutNumberOfStates),&Z_Copy }, { Zuint16, Cx0013, 0x004A, Z(MultiOutNumberOfStates),1, Z_Nop },
{ Zbool, Cx0013, 0x0051, Z(MultiOutOutOfService), &Z_Copy }, { Zbool, Cx0013, 0x0051, Z(MultiOutOutOfService), 1, Z_Nop },
{ Zuint16, Cx0013, 0x0055, Z(MultiOutValue), &Z_Copy }, { Zuint16, Cx0013, 0x0055, Z(MultiOutValue), 1, Z_Nop },
// { Zunk, Cx0013, 0x0057, Z(MultiOutPriorityArray),&Z_Copy }, // { Zunk, Cx0013, 0x0057, Z(MultiOutPriorityArray),1, Z_Nop },
{ Zenum8, Cx0013, 0x0067, Z(MultiOutReliability), &Z_Copy }, { Zenum8, Cx0013, 0x0067, Z(MultiOutReliability), 1, Z_Nop },
{ Zuint16, Cx0013, 0x0068, Z(MultiOutRelinquishDefault),&Z_Copy }, { Zuint16, Cx0013, 0x0068, Z(MultiOutRelinquishDefault),1, Z_Nop },
{ Zmap8, Cx0013, 0x006F, Z(MultiOutStatusFlags), &Z_Copy }, { Zmap8, Cx0013, 0x006F, Z(MultiOutStatusFlags), 1, Z_Nop },
{ Zuint32, Cx0013, 0x0100, Z(MultiOutApplicationType),&Z_Copy }, { Zuint32, Cx0013, 0x0100, Z(MultiOutApplicationType),1, Z_Nop },
// Multistate Value cluster // Multistate Value cluster
// { Zunk, Cx0014, 0x000E, Z(MultiStateText), &Z_Copy }, // { Zunk, Cx0014, 0x000E, Z(MultiStateText), 1, Z_Nop },
{ Zstring, Cx0014, 0x001C, Z(MultiDescription), &Z_Copy }, { Zstring, Cx0014, 0x001C, Z(MultiDescription), 1, Z_Nop },
{ Zuint16, Cx0014, 0x004A, Z(MultiNumberOfStates), &Z_Copy }, { Zuint16, Cx0014, 0x004A, Z(MultiNumberOfStates), 1, Z_Nop },
{ Zbool, Cx0014, 0x0051, Z(MultiOutOfService), &Z_Copy }, { Zbool, Cx0014, 0x0051, Z(MultiOutOfService), 1, Z_Nop },
{ Zuint16, Cx0014, 0x0055, Z(MultiValue), &Z_Copy }, { Zuint16, Cx0014, 0x0055, Z(MultiValue), 1, Z_Nop },
{ Zenum8, Cx0014, 0x0067, Z(MultiReliability), &Z_Copy }, { Zenum8, Cx0014, 0x0067, Z(MultiReliability), 1, Z_Nop },
{ Zuint16, Cx0014, 0x0068, Z(MultiRelinquishDefault),&Z_Copy }, { Zuint16, Cx0014, 0x0068, Z(MultiRelinquishDefault),1, Z_Nop },
{ Zmap8, Cx0014, 0x006F, Z(MultiStatusFlags), &Z_Copy }, { Zmap8, Cx0014, 0x006F, Z(MultiStatusFlags), 1, Z_Nop },
{ Zuint32, Cx0014, 0x0100, Z(MultiApplicationType), &Z_Copy }, { Zuint32, Cx0014, 0x0100, Z(MultiApplicationType), 1, Z_Nop },
// Power Profile cluster // Power Profile cluster
{ Zuint8, Cx001A, 0x0000, Z(TotalProfileNum), &Z_Copy }, { Zuint8, Cx001A, 0x0000, Z(TotalProfileNum), 1, Z_Nop },
{ Zbool, Cx001A, 0x0001, Z(MultipleScheduling), &Z_Copy }, { Zbool, Cx001A, 0x0001, Z(MultipleScheduling), 1, Z_Nop },
{ Zmap8, Cx001A, 0x0002, Z(EnergyFormatting), &Z_Copy }, { Zmap8, Cx001A, 0x0002, Z(EnergyFormatting), 1, Z_Nop },
{ Zbool, Cx001A, 0x0003, Z(EnergyRemote), &Z_Copy }, { Zbool, Cx001A, 0x0003, Z(EnergyRemote), 1, Z_Nop },
{ Zmap8, Cx001A, 0x0004, Z(ScheduleMode), &Z_Copy }, { Zmap8, Cx001A, 0x0004, Z(ScheduleMode), 1, Z_Nop },
// Poll Control cluster // Poll Control cluster
{ Zuint32, Cx0020, 0x0000, Z(CheckinInterval), &Z_Copy }, { Zuint32, Cx0020, 0x0000, Z(CheckinInterval), 1, Z_Nop },
{ Zuint32, Cx0020, 0x0001, Z(LongPollInterval), &Z_Copy }, { Zuint32, Cx0020, 0x0001, Z(LongPollInterval), 1, Z_Nop },
{ Zuint16, Cx0020, 0x0002, Z(ShortPollInterval), &Z_Copy }, { Zuint16, Cx0020, 0x0002, Z(ShortPollInterval), 1, Z_Nop },
{ Zuint16, Cx0020, 0x0003, Z(FastPollTimeout), &Z_Copy }, { Zuint16, Cx0020, 0x0003, Z(FastPollTimeout), 1, Z_Nop },
{ Zuint32, Cx0020, 0x0004, Z(CheckinIntervalMin), &Z_Copy }, { Zuint32, Cx0020, 0x0004, Z(CheckinIntervalMin), 1, Z_Nop },
{ Zuint32, Cx0020, 0x0005, Z(LongPollIntervalMin), &Z_Copy }, { Zuint32, Cx0020, 0x0005, Z(LongPollIntervalMin), 1, Z_Nop },
{ Zuint16, Cx0020, 0x0006, Z(FastPollTimeoutMax), &Z_Copy }, { Zuint16, Cx0020, 0x0006, Z(FastPollTimeoutMax), 1, Z_Nop },
// Shade Configuration cluster // Shade Configuration cluster
{ Zuint16, Cx0100, 0x0000, Z(PhysicalClosedLimit), &Z_Copy }, { Zuint16, Cx0100, 0x0000, Z(PhysicalClosedLimit), 1, Z_Nop },
{ Zuint8, Cx0100, 0x0001, Z(MotorStepSize), &Z_Copy }, { Zuint8, Cx0100, 0x0001, Z(MotorStepSize), 1, Z_Nop },
{ Zmap8, Cx0100, 0x0002, Z(Status), &Z_Copy }, { Zmap8, Cx0100, 0x0002, Z(Status), 1, Z_Nop },
{ Zuint16, Cx0100, 0x0010, Z(ClosedLimit), &Z_Copy }, { Zuint16, Cx0100, 0x0010, Z(ClosedLimit), 1, Z_Nop },
{ Zenum8, Cx0100, 0x0011, Z(Mode), &Z_Copy }, { Zenum8, Cx0100, 0x0011, Z(Mode), 1, Z_Nop },
// Door Lock cluster // Door Lock cluster
{ Zenum8, Cx0101, 0x0000, Z(LockState), &Z_Copy }, { Zenum8, Cx0101, 0x0000, Z(LockState), 1, Z_Nop },
{ Zenum8, Cx0101, 0x0001, Z(LockType), &Z_Copy }, { Zenum8, Cx0101, 0x0001, Z(LockType), 1, Z_Nop },
{ Zbool, Cx0101, 0x0002, Z(ActuatorEnabled), &Z_Copy }, { Zbool, Cx0101, 0x0002, Z(ActuatorEnabled), 1, Z_Nop },
{ Zenum8, Cx0101, 0x0003, Z(DoorState), &Z_Copy }, { Zenum8, Cx0101, 0x0003, Z(DoorState), 1, Z_Nop },
{ Zuint32, Cx0101, 0x0004, Z(DoorOpenEvents), &Z_Copy }, { Zuint32, Cx0101, 0x0004, Z(DoorOpenEvents), 1, Z_Nop },
{ Zuint32, Cx0101, 0x0005, Z(DoorClosedEvents), &Z_Copy }, { Zuint32, Cx0101, 0x0005, Z(DoorClosedEvents), 1, Z_Nop },
{ Zuint16, Cx0101, 0x0006, Z(OpenPeriod), &Z_Copy }, { Zuint16, Cx0101, 0x0006, Z(OpenPeriod), 1, Z_Nop },
// Aqara Lumi Vibration Sensor // Aqara Lumi Vibration Sensor
{ Zuint16, Cx0101, 0x0055, Z(AqaraVibrationMode), &Z_AqaraVibration }, { Zuint16, Cx0101, 0x0055, Z(AqaraVibrationMode), 0, Z_AqaraVibration },
{ Zuint16, Cx0101, 0x0503, Z(AqaraVibrationsOrAngle), &Z_Copy }, { Zuint16, Cx0101, 0x0503, Z(AqaraVibrationsOrAngle), 1, Z_Nop },
{ Zuint32, Cx0101, 0x0505, Z(AqaraVibration505), &Z_Copy }, { Zuint32, Cx0101, 0x0505, Z(AqaraVibration505), 1, Z_Nop },
{ Zuint48, Cx0101, 0x0508, Z(AqaraAccelerometer), &Z_AqaraVibration }, { Zuint48, Cx0101, 0x0508, Z(AqaraAccelerometer), 0, Z_AqaraVibration },
// Window Covering cluster // Window Covering cluster
{ Zenum8, Cx0102, 0x0000, Z(WindowCoveringType), &Z_Copy }, { Zenum8, Cx0102, 0x0000, Z(WindowCoveringType), 1, Z_Nop },
{ Zuint16, Cx0102, 0x0001, Z(PhysicalClosedLimitLift),&Z_Copy }, { Zuint16, Cx0102, 0x0001, Z(PhysicalClosedLimitLift),1, Z_Nop },
{ Zuint16, Cx0102, 0x0002, Z(PhysicalClosedLimitTilt),&Z_Copy }, { Zuint16, Cx0102, 0x0002, Z(PhysicalClosedLimitTilt),1, Z_Nop },
{ Zuint16, Cx0102, 0x0003, Z(CurrentPositionLift), &Z_Copy }, { Zuint16, Cx0102, 0x0003, Z(CurrentPositionLift), 1, Z_Nop },
{ Zuint16, Cx0102, 0x0004, Z(CurrentPositionTilt), &Z_Copy }, { Zuint16, Cx0102, 0x0004, Z(CurrentPositionTilt), 1, Z_Nop },
{ Zuint16, Cx0102, 0x0005, Z(NumberofActuationsLift),&Z_Copy }, { Zuint16, Cx0102, 0x0005, Z(NumberofActuationsLift),1, Z_Nop },
{ Zuint16, Cx0102, 0x0006, Z(NumberofActuationsTilt),&Z_Copy }, { Zuint16, Cx0102, 0x0006, Z(NumberofActuationsTilt),1, Z_Nop },
{ Zmap8, Cx0102, 0x0007, Z(ConfigStatus), &Z_Copy }, { Zmap8, Cx0102, 0x0007, Z(ConfigStatus), 1, Z_Nop },
{ Zuint8, Cx0102, 0x0008, Z(CurrentPositionLiftPercentage),&Z_Copy }, { Zuint8, Cx0102, 0x0008, Z(CurrentPositionLiftPercentage),1, Z_Nop },
{ Zuint8, Cx0102, 0x0009, Z(CurrentPositionTiltPercentage),&Z_Copy }, { Zuint8, Cx0102, 0x0009, Z(CurrentPositionTiltPercentage),1, Z_Nop },
{ Zuint16, Cx0102, 0x0010, Z(InstalledOpenLimitLift),&Z_Copy }, { Zuint16, Cx0102, 0x0010, Z(InstalledOpenLimitLift),1, Z_Nop },
{ Zuint16, Cx0102, 0x0011, Z(InstalledClosedLimitLift),&Z_Copy }, { Zuint16, Cx0102, 0x0011, Z(InstalledClosedLimitLift),1, Z_Nop },
{ Zuint16, Cx0102, 0x0012, Z(InstalledOpenLimitTilt),&Z_Copy }, { Zuint16, Cx0102, 0x0012, Z(InstalledOpenLimitTilt),1, Z_Nop },
{ Zuint16, Cx0102, 0x0013, Z(InstalledClosedLimitTilt),&Z_Copy }, { Zuint16, Cx0102, 0x0013, Z(InstalledClosedLimitTilt),1, Z_Nop },
{ Zuint16, Cx0102, 0x0014, Z(VelocityLift), &Z_Copy }, { Zuint16, Cx0102, 0x0014, Z(VelocityLift), 1, Z_Nop },
{ Zuint16, Cx0102, 0x0015, Z(AccelerationTimeLift),&Z_Copy }, { Zuint16, Cx0102, 0x0015, Z(AccelerationTimeLift),1, Z_Nop },
{ Zuint16, Cx0102, 0x0016, Z(DecelerationTimeLift), &Z_Copy }, { Zuint16, Cx0102, 0x0016, Z(DecelerationTimeLift), 1, Z_Nop },
{ Zmap8, Cx0102, 0x0017, Z(Mode), &Z_Copy }, { Zmap8, Cx0102, 0x0017, Z(Mode), 1, Z_Nop },
{ Zoctstr, Cx0102, 0x0018, Z(IntermediateSetpointsLift),&Z_Copy }, { Zoctstr, Cx0102, 0x0018, Z(IntermediateSetpointsLift),1, Z_Nop },
{ Zoctstr, Cx0102, 0x0019, Z(IntermediateSetpointsTilt),&Z_Copy }, { Zoctstr, Cx0102, 0x0019, Z(IntermediateSetpointsTilt),1, Z_Nop },
// Color Control cluster // Color Control cluster
{ Zuint8, Cx0300, 0x0000, Z(Hue), &Z_Copy }, { Zuint8, Cx0300, 0x0000, Z(Hue), 1, Z_Nop },
{ Zuint8, Cx0300, 0x0001, Z(Sat), &Z_Copy }, { Zuint8, Cx0300, 0x0001, Z(Sat), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0002, Z(RemainingTime), &Z_Copy }, { Zuint16, Cx0300, 0x0002, Z(RemainingTime), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0003, Z(X), &Z_Copy }, { Zuint16, Cx0300, 0x0003, Z(X), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0004, Z(Y), &Z_Copy }, { Zuint16, Cx0300, 0x0004, Z(Y), 1, Z_Nop },
{ Zenum8, Cx0300, 0x0005, Z(DriftCompensation), &Z_Copy }, { Zenum8, Cx0300, 0x0005, Z(DriftCompensation), 1, Z_Nop },
{ Zstring, Cx0300, 0x0006, Z(CompensationText), &Z_Copy }, { Zstring, Cx0300, 0x0006, Z(CompensationText), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0007, Z(CT), &Z_Copy }, { Zuint16, Cx0300, 0x0007, Z(CT), 1, Z_Nop },
{ Zenum8, Cx0300, 0x0008, Z(ColorMode), &Z_Copy }, { Zenum8, Cx0300, 0x0008, Z(ColorMode), 1, Z_Nop },
{ Zuint8, Cx0300, 0x0010, Z(NumberOfPrimaries), &Z_Copy }, { Zuint8, Cx0300, 0x0010, Z(NumberOfPrimaries), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0011, Z(Primary1X), &Z_Copy }, { Zuint16, Cx0300, 0x0011, Z(Primary1X), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0012, Z(Primary1Y), &Z_Copy }, { Zuint16, Cx0300, 0x0012, Z(Primary1Y), 1, Z_Nop },
{ Zuint8, Cx0300, 0x0013, Z(Primary1Intensity), &Z_Copy }, { Zuint8, Cx0300, 0x0013, Z(Primary1Intensity), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0015, Z(Primary2X), &Z_Copy }, { Zuint16, Cx0300, 0x0015, Z(Primary2X), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0016, Z(Primary2Y), &Z_Copy }, { Zuint16, Cx0300, 0x0016, Z(Primary2Y), 1, Z_Nop },
{ Zuint8, Cx0300, 0x0017, Z(Primary2Intensity), &Z_Copy }, { Zuint8, Cx0300, 0x0017, Z(Primary2Intensity), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0019, Z(Primary3X), &Z_Copy }, { Zuint16, Cx0300, 0x0019, Z(Primary3X), 1, Z_Nop },
{ Zuint16, Cx0300, 0x001A, Z(Primary3Y), &Z_Copy }, { Zuint16, Cx0300, 0x001A, Z(Primary3Y), 1, Z_Nop },
{ Zuint8, Cx0300, 0x001B, Z(Primary3Intensity), &Z_Copy }, { Zuint8, Cx0300, 0x001B, Z(Primary3Intensity), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0030, Z(WhitePointX), &Z_Copy }, { Zuint16, Cx0300, 0x0030, Z(WhitePointX), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0031, Z(WhitePointY), &Z_Copy }, { Zuint16, Cx0300, 0x0031, Z(WhitePointY), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0032, Z(ColorPointRX), &Z_Copy }, { Zuint16, Cx0300, 0x0032, Z(ColorPointRX), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0033, Z(ColorPointRY), &Z_Copy }, { Zuint16, Cx0300, 0x0033, Z(ColorPointRY), 1, Z_Nop },
{ Zuint8, Cx0300, 0x0034, Z(ColorPointRIntensity), &Z_Copy }, { Zuint8, Cx0300, 0x0034, Z(ColorPointRIntensity), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0036, Z(ColorPointGX), &Z_Copy }, { Zuint16, Cx0300, 0x0036, Z(ColorPointGX), 1, Z_Nop },
{ Zuint16, Cx0300, 0x0037, Z(ColorPointGY), &Z_Copy }, { Zuint16, Cx0300, 0x0037, Z(ColorPointGY), 1, Z_Nop },
{ Zuint8, Cx0300, 0x0038, Z(ColorPointGIntensity), &Z_Copy }, { Zuint8, Cx0300, 0x0038, Z(ColorPointGIntensity), 1, Z_Nop },
{ Zuint16, Cx0300, 0x003A, Z(ColorPointBX), &Z_Copy }, { Zuint16, Cx0300, 0x003A, Z(ColorPointBX), 1, Z_Nop },
{ Zuint16, Cx0300, 0x003B, Z(ColorPointBY), &Z_Copy }, { Zuint16, Cx0300, 0x003B, Z(ColorPointBY), 1, Z_Nop },
{ Zuint8, Cx0300, 0x003C, Z(ColorPointBIntensity), &Z_Copy }, { Zuint8, Cx0300, 0x003C, Z(ColorPointBIntensity), 1, Z_Nop },
// Illuminance Measurement cluster // Illuminance Measurement cluster
{ Zuint16, Cx0400, 0x0000, Z(Illuminance), &Z_Copy }, // Illuminance (in Lux) { Zuint16, Cx0400, 0x0000, Z(Illuminance), 1, Z_Nop }, // Illuminance (in Lux)
{ Zuint16, Cx0400, 0x0001, Z(IlluminanceMinMeasuredValue), &Z_Copy }, // { Zuint16, Cx0400, 0x0001, Z(IlluminanceMinMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0400, 0x0002, Z(IlluminanceMaxMeasuredValue), &Z_Copy }, // { Zuint16, Cx0400, 0x0002, Z(IlluminanceMaxMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0400, 0x0003, Z(IlluminanceTolerance), &Z_Copy }, // { Zuint16, Cx0400, 0x0003, Z(IlluminanceTolerance), 1, Z_Nop }, //
{ Zenum8, Cx0400, 0x0004, Z(IlluminanceLightSensorType), &Z_Copy }, // { Zenum8, Cx0400, 0x0004, Z(IlluminanceLightSensorType), 1, Z_Nop }, //
{ Zunk, Cx0400, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0400, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Illuminance Level Sensing cluster // Illuminance Level Sensing cluster
{ Zenum8, Cx0401, 0x0000, Z(IlluminanceLevelStatus), &Z_Copy }, // Illuminance (in Lux) { Zenum8, Cx0401, 0x0000, Z(IlluminanceLevelStatus), 1, Z_Nop }, // Illuminance (in Lux)
{ Zenum8, Cx0401, 0x0001, Z(IlluminanceLightSensorType), &Z_Copy }, // LightSensorType { Zenum8, Cx0401, 0x0001, Z(IlluminanceLightSensorType), 1, Z_Nop }, // LightSensorType
{ Zuint16, Cx0401, 0x0010, Z(IlluminanceTargetLevel), &Z_Copy }, // { Zuint16, Cx0401, 0x0010, Z(IlluminanceTargetLevel), 1, Z_Nop }, //
{ Zunk, Cx0401, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0401, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Temperature Measurement cluster // Temperature Measurement cluster
{ Zint16, Cx0402, 0x0000, Z(Temperature), &Z_FloatDiv100 }, // Temperature { Zint16, Cx0402, 0x0000, Z(Temperature), -100, Z_Nop }, // divide by 100
{ Zint16, Cx0402, 0x0001, Z(TemperatureMinMeasuredValue), &Z_FloatDiv100 }, // { Zint16, Cx0402, 0x0001, Z(TemperatureMinMeasuredValue), -100, Z_Nop }, //
{ Zint16, Cx0402, 0x0002, Z(TemperatureMaxMeasuredValue), &Z_FloatDiv100 }, // { Zint16, Cx0402, 0x0002, Z(TemperatureMaxMeasuredValue), -100, Z_Nop }, //
{ Zuint16, Cx0402, 0x0003, Z(TemperatureTolerance), &Z_FloatDiv100 }, // { Zuint16, Cx0402, 0x0003, Z(TemperatureTolerance), -100, Z_Nop }, //
{ Zunk, Cx0402, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0402, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Pressure Measurement cluster // Pressure Measurement cluster
{ Zunk, Cx0403, 0x0000, Z(PressureUnit), &Z_AddPressureUnit }, // Pressure Unit { Zunk, Cx0403, 0x0000, Z(PressureUnit), 0, Z_AddPressureUnit }, // Pressure Unit
{ Zint16, Cx0403, 0x0000, Z(Pressure), &Z_Copy }, // Pressure { Zint16, Cx0403, 0x0000, Z(Pressure), 1, Z_Nop }, // Pressure
{ Zint16, Cx0403, 0x0001, Z(PressureMinMeasuredValue), &Z_Copy }, // { Zint16, Cx0403, 0x0001, Z(PressureMinMeasuredValue), 1, Z_Nop }, //
{ Zint16, Cx0403, 0x0002, Z(PressureMaxMeasuredValue), &Z_Copy }, // { Zint16, Cx0403, 0x0002, Z(PressureMaxMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0403, 0x0003, Z(PressureTolerance), &Z_Copy }, // { Zuint16, Cx0403, 0x0003, Z(PressureTolerance), 1, Z_Nop }, //
{ Zint16, Cx0403, 0x0010, Z(PressureScaledValue), &Z_Copy }, // { Zint16, Cx0403, 0x0010, Z(PressureScaledValue), 1, Z_Nop }, //
{ Zint16, Cx0403, 0x0011, Z(PressureMinScaledValue), &Z_Copy }, // { Zint16, Cx0403, 0x0011, Z(PressureMinScaledValue), 1, Z_Nop }, //
{ Zint16, Cx0403, 0x0012, Z(PressureMaxScaledValue), &Z_Copy }, // { Zint16, Cx0403, 0x0012, Z(PressureMaxScaledValue), 1, Z_Nop }, //
{ Zuint16, Cx0403, 0x0013, Z(PressureScaledTolerance), &Z_Copy }, // { Zuint16, Cx0403, 0x0013, Z(PressureScaledTolerance), 1, Z_Nop }, //
{ Zint8, Cx0403, 0x0014, Z(PressureScale), &Z_Copy }, // { Zint8, Cx0403, 0x0014, Z(PressureScale), 1, Z_Nop }, //
{ Zunk, Cx0403, 0xFFFF, nullptr, &Z_Remove }, // Remove all other Pressure values { Zunk, Cx0403, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other Pressure values
// Flow Measurement cluster // Flow Measurement cluster
{ Zuint16, Cx0404, 0x0000, Z(FlowRate), &Z_FloatDiv10 }, // Flow (in m3/h) { Zuint16, Cx0404, 0x0000, Z(FlowRate), -10, Z_Nop }, // Flow (in m3/h)
{ Zuint16, Cx0404, 0x0001, Z(FlowMinMeasuredValue), &Z_Copy }, // { Zuint16, Cx0404, 0x0001, Z(FlowMinMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0404, 0x0002, Z(FlowMaxMeasuredValue), &Z_Copy }, // { Zuint16, Cx0404, 0x0002, Z(FlowMaxMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0404, 0x0003, Z(FlowTolerance), &Z_Copy }, // { Zuint16, Cx0404, 0x0003, Z(FlowTolerance), 1, Z_Nop }, //
{ Zunk, Cx0404, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0404, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Relative Humidity Measurement cluster // Relative Humidity Measurement cluster
{ Zuint16, Cx0405, 0x0000, Z(Humidity), &Z_FloatDiv100 }, // Humidity { Zuint16, Cx0405, 0x0000, Z(Humidity), -100, Z_Nop }, // Humidity
{ Zuint16, Cx0405, 0x0001, Z(HumidityMinMeasuredValue), &Z_Copy }, // { Zuint16, Cx0405, 0x0001, Z(HumidityMinMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0405, 0x0002, Z(HumidityMaxMeasuredValue), &Z_Copy }, // { Zuint16, Cx0405, 0x0002, Z(HumidityMaxMeasuredValue), 1, Z_Nop }, //
{ Zuint16, Cx0405, 0x0003, Z(HumidityTolerance), &Z_Copy }, // { Zuint16, Cx0405, 0x0003, Z(HumidityTolerance), 1, Z_Nop }, //
{ Zunk, Cx0405, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0405, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Occupancy Sensing cluster // Occupancy Sensing cluster
{ Zmap8, Cx0406, 0x0000, Z(Occupancy), &Z_Copy }, // Occupancy (map8) { Zmap8, Cx0406, 0x0000, Z(Occupancy), 1, Z_Nop }, // Occupancy (map8)
{ Zenum8, Cx0406, 0x0001, Z(OccupancySensorType), &Z_Copy }, // OccupancySensorType { Zenum8, Cx0406, 0x0001, Z(OccupancySensorType), 1, Z_Nop }, // OccupancySensorType
{ Zunk, Cx0406, 0xFFFF, nullptr, &Z_Remove }, // Remove all other values { Zunk, Cx0406, 0xFFFF, nullptr, 0, Z_Nop }, // Remove all other values
// Meter Identification cluster // Meter Identification cluster
{ Zstring, Cx0B01, 0x0000, Z(CompanyName), &Z_Copy }, { Zstring, Cx0B01, 0x0000, Z(CompanyName), 1, Z_Nop },
{ Zuint16, Cx0B01, 0x0001, Z(MeterTypeID), &Z_Copy }, { Zuint16, Cx0B01, 0x0001, Z(MeterTypeID), 1, Z_Nop },
{ Zuint16, Cx0B01, 0x0004, Z(DataQualityID), &Z_Copy }, { Zuint16, Cx0B01, 0x0004, Z(DataQualityID), 1, Z_Nop },
{ Zstring, Cx0B01, 0x0005, Z(CustomerName), &Z_Copy }, { Zstring, Cx0B01, 0x0005, Z(CustomerName), 1, Z_Nop },
{ Zoctstr, Cx0B01, 0x0006, Z(Model), &Z_Copy }, { Zoctstr, Cx0B01, 0x0006, Z(Model), 1, Z_Nop },
{ Zoctstr, Cx0B01, 0x0007, Z(PartNumber), &Z_Copy }, { Zoctstr, Cx0B01, 0x0007, Z(PartNumber), 1, Z_Nop },
{ Zoctstr, Cx0B01, 0x0008, Z(ProductRevision), &Z_Copy }, { Zoctstr, Cx0B01, 0x0008, Z(ProductRevision), 1, Z_Nop },
{ Zoctstr, Cx0B01, 0x000A, Z(SoftwareRevision), &Z_Copy }, { Zoctstr, Cx0B01, 0x000A, Z(SoftwareRevision), 1, Z_Nop },
{ Zstring, Cx0B01, 0x000B, Z(UtilityName), &Z_Copy }, { Zstring, Cx0B01, 0x000B, Z(UtilityName), 1, Z_Nop },
{ Zstring, Cx0B01, 0x000C, Z(POD), &Z_Copy }, { Zstring, Cx0B01, 0x000C, Z(POD), 1, Z_Nop },
{ Zint24, Cx0B01, 0x000D, Z(AvailablePower), &Z_Copy }, { Zint24, Cx0B01, 0x000D, Z(AvailablePower), 1, Z_Nop },
{ Zint24, Cx0B01, 0x000E, Z(PowerThreshold), &Z_Copy }, { Zint24, Cx0B01, 0x000E, Z(PowerThreshold), 1, Z_Nop },
// Diagnostics cluster // Diagnostics cluster
{ Zuint16, Cx0B05, 0x0000, Z(NumberOfResets), &Z_Copy }, { Zuint16, Cx0B05, 0x0000, Z(NumberOfResets), 1, Z_Nop },
{ Zuint16, Cx0B05, 0x0001, Z(PersistentMemoryWrites),&Z_Copy }, { Zuint16, Cx0B05, 0x0001, Z(PersistentMemoryWrites),1, Z_Nop },
{ Zuint8, Cx0B05, 0x011C, Z(LastMessageLQI), &Z_Copy }, { Zuint8, Cx0B05, 0x011C, Z(LastMessageLQI), 1, Z_Nop },
{ Zuint8, Cx0B05, 0x011D, Z(LastMessageRSSI), &Z_Copy }, { Zuint8, Cx0B05, 0x011D, Z(LastMessageRSSI), 1, Z_Nop },
}; };
@ -650,7 +662,7 @@ public:
} }
static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len); static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len);
void parseRawAttributes(JsonObject& json, uint8_t offset = 0); void parseReportAttributes(JsonObject& json, uint8_t offset = 0);
void parseReadAttributes(JsonObject& json, uint8_t offset = 0); void parseReadAttributes(JsonObject& json, uint8_t offset = 0);
void parseReadAttributesResponse(JsonObject& json, uint8_t offset = 0); void parseReadAttributesResponse(JsonObject& json, uint8_t offset = 0);
void parseResponse(void); void parseResponse(void);
@ -734,36 +746,50 @@ uint8_t toPercentageCR2032(uint32_t voltage) {
// - 1 byte: attribute type // - 1 byte: attribute type
// - n bytes: value (typically between 1 and 4 bytes, or bigger for strings) // - n bytes: value (typically between 1 and 4 bytes, or bigger for strings)
// returns number of bytes of attribute, or <0 if error // returns number of bytes of attribute, or <0 if error
int32_t encodeSingleAttribute(class SBuffer &buf, const JsonVariant &val, uint16_t attr, uint8_t attrtype) { // status: shall we insert a status OK (0x00) as required by ReadResponse
int32_t encodeSingleAttribute(class SBuffer &buf, const JsonVariant &val, float val_f, uint16_t attr, uint8_t attrtype, bool status = false) {
uint32_t len = Z_getDatatypeLen(attrtype); // pre-compute lenght, overloaded for variable length attributes uint32_t len = Z_getDatatypeLen(attrtype); // pre-compute lenght, overloaded for variable length attributes
uint32_t u32;
int32_t i32;
float f32;
uint32_t u32 = val.as<uint32_t>(); if (&val) {
int32_t i32 = val.as<int32_t>(); u32 = val.as<uint32_t>();
float f32 = val.as<float>(); i32 = val.as<int32_t>();
f32 = val.as<float>();
} else {
u32 = val_f;
i32 = val_f;
f32 = val_f;
}
buf.add16(attr); // prepend with attribute identifier buf.add16(attr); // prepend with attribute identifier
if (status) {
buf.add8(Z_SUCCESS); // status OK = 0x00
}
buf.add8(attrtype); // prepend with attribute type buf.add8(attrtype); // prepend with attribute type
switch (attrtype) { switch (attrtype) {
// unsigned 8 // unsigned 8
case Zbool: // bool case Zbool: // bool
case Zuint8: // uint8 case Zuint8: // uint8
case Zenum8: // enum8 case Zenum8: // enum8
case Zdata8: // data8 case Zdata8: // data8
case Zmap8: // map8 case Zmap8: // map8
buf.add8(u32); buf.add8(u32);
break; break;
// unsigned 16 // unsigned 16
case Zuint16: // uint16 case Zuint16: // uint16
case Zenum16: // enum16 case Zenum16: // enum16
case Zdata16: // data16 case Zdata16: // data16
case Zmap16: // map16 case Zmap16: // map16
buf.add16(u32); buf.add16(u32);
break; break;
// unisgned 32 // unisgned 32
case Zuint32: // uint32 case Zuint32: // uint32
case Zdata32: // data32 case Zdata32: // data32
case Zmap32: // map32 case Zmap32: // map32
case ZUTC: // UTC - epoch 32 bits, seconds since 1-Jan-2000
buf.add32(u32); buf.add32(u32);
break; break;
@ -786,7 +812,7 @@ int32_t encodeSingleAttribute(class SBuffer &buf, const JsonVariant &val, uint16
case Zstring: case Zstring:
case Zstring16: case Zstring16:
{ {
const char * val_str = val.as<const char*>(); const char * val_str = (&val) ? val.as<const char*>() : ""; // avoid crash if &val is null
if (nullptr == val_str) { return -2; } if (nullptr == val_str) { return -2; }
size_t val_len = strlen(val_str); size_t val_len = strlen(val_str);
if (val_len > 32) { val_len = 32; } if (val_len > 32) { val_len = 32; }
@ -804,10 +830,10 @@ int32_t encodeSingleAttribute(class SBuffer &buf, const JsonVariant &val, uint16
default: default:
// remove the attribute type we just added // remove the attribute type we just added
buf.setLen(buf.len() - 3); buf.setLen(buf.len() - (status ? 4 : 3));
return -1; return -1;
} }
return len + 3; return len + (status ? 4 : 3);
} }
uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf, uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
@ -848,6 +874,7 @@ uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer
} }
break; break;
case Zuint32: // uint32 case Zuint32: // uint32
case ZUTC: // UTC
{ {
uint32_t uint32_val = buf.get32(i); uint32_t uint32_val = buf.get32(i);
// i += 4; // i += 4;
@ -974,7 +1001,6 @@ uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer
// TODO // TODO
case ZToD: // ToD case ZToD: // ToD
case Zdate: // date case Zdate: // date
case ZUTC: // UTC
case ZclusterId: // clusterId case ZclusterId: // clusterId
case ZattribId: // attribId case ZattribId: // attribId
case ZbacOID: // bacOID case ZbacOID: // bacOID
@ -1028,7 +1054,7 @@ void ZCLFrame::generateAttributeName(const JsonObject& json, uint16_t cluster, u
} }
// First pass, parse all attributes in their native format // First pass, parse all attributes in their native format
void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) { void ZCLFrame::parseReportAttributes(JsonObject& json, uint8_t offset) {
uint32_t i = offset; uint32_t i = offset;
uint32_t len = _payload.len(); uint32_t len = _payload.len();
@ -1083,7 +1109,7 @@ void ZCLFrame::parseReadAttributesResponse(JsonObject& json, uint8_t offset) {
uint32_t i = offset; uint32_t i = offset;
uint32_t len = _payload.len(); uint32_t len = _payload.len();
while (len >= 4 + i) { while (len >= i + 4) {
uint16_t attrid = _payload.get16(i); uint16_t attrid = _payload.get16(i);
i += 2; i += 2;
uint8_t status = _payload.get8(i++); uint8_t status = _payload.get8(i++);
@ -1148,48 +1174,36 @@ void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
// ====================================================================== // ======================================================================
// Record Manuf // Record Manuf
int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_ManufKeepFunc(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = value; json[new_name] = value;
zigbee_devices.setManufId(shortaddr, value.as<const char*>()); zigbee_devices.setManufId(shortaddr, value.as<const char*>());
return 1; return 1;
} }
// //
int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_ModelKeepFunc(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = value; json[new_name] = value;
zigbee_devices.setModelId(shortaddr, value.as<const char*>()); zigbee_devices.setModelId(shortaddr, value.as<const char*>());
return 1; return 1;
} }
// ======================================================================
// Remove attribute
int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
return 1; // remove original key
}
// Copy value as-is
int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = value;
return 1; // remove original key
}
// Add pressure unit // Add pressure unit
int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_AddPressureUnitFunc(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = F(D_UNIT_PRESSURE); json[new_name] = F(D_UNIT_PRESSURE);
return 0; // keep original key return 0; // keep original key
} }
// Convert int to float and divide by 100 // Convert int to float and divide by 100
int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_FloatDiv100Func(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = ((float)value) / 100.0f; json[new_name] = ((float)value) / 100.0f;
return 1; // remove original key return 1; // remove original key
} }
// Convert int to float and divide by 10 // Convert int to float and divide by 10
int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_FloatDiv10Func(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = ((float)value) / 10.0f; json[new_name] = ((float)value) / 10.0f;
return 1; // remove original key return 1; // remove original key
} }
// Convert int to float and divide by 10 // Convert int to float and divide by 10
int32_t Z_FloatDiv2(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_FloatDiv2Func(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = ((float)value) / 2.0f; json[new_name] = ((float)value) / 2.0f;
return 1; // remove original key return 1; // remove original key
} }
@ -1203,7 +1217,7 @@ int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t groupaddr, uint16_t clu
} }
// Aqara Cube // Aqara Cube
int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_AqaraCubeFunc(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
json[new_name] = value; // copy the original value json[new_name] = value; // copy the original value
int32_t val = value; int32_t val = value;
const __FlashStringHelper *aqara_cube = F("AqaraCube"); const __FlashStringHelper *aqara_cube = F("AqaraCube");
@ -1262,7 +1276,7 @@ int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& j
} }
// Aqara Vibration Sensor - special proprietary attributes // Aqara Vibration Sensor - special proprietary attributes
int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_AqaraVibrationFunc(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
//json[new_name] = value; //json[new_name] = value;
switch (attr) { switch (attr) {
case 0x0055: case 0x0055:
@ -1313,7 +1327,7 @@ int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObje
return 1; // remove original key return 1; // remove original key
} }
int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) { int32_t Z_AqaraSensorFunc(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
String hex = value; String hex = value;
SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length()); SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
uint32_t i = 0; uint32_t i = 0;
@ -1373,6 +1387,50 @@ int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject&
} }
// ====================================================================== // ======================================================================
// apply the transformation from the converter
int32_t Z_ApplyConverter(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name,
uint16_t cluster, uint16_t attr, int16_t multiplier, uint16_t cb) {
// apply multiplier if needed
if (1 == multiplier) { // copy unchanged
json[new_name] = value;
} else if (0 != multiplier) {
if (multiplier > 0) {
json[new_name] = ((float)value) * multiplier;
} else {
json[new_name] = ((float)value) / multiplier;
}
}
// apply callback if needed
Z_AttrConverter func = nullptr;
switch (cb) {
case Z_Nop:
return 1; // drop original key
case Z_AddPressureUnit:
func = &Z_AddPressureUnitFunc;
break;
case Z_ManufKeep:
func = &Z_ManufKeepFunc;
break;
case Z_ModelKeep:
func = &Z_ModelKeepFunc;
break;
case Z_AqaraSensor:
func = &Z_AqaraSensorFunc;
break;
case Z_AqaraVibration:
func = &Z_AqaraVibrationFunc;
break;
case Z_AqaraCube:
func = &Z_AqaraCubeFunc;
break;
};
if (func) {
return (*func)(zcl, shortaddr, json, name, value, new_name, cluster, attr);
}
}
void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) { void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) {
// iterate on json elements // iterate on json elements
for (auto kv : json) { for (auto kv : json) {
@ -1434,12 +1492,15 @@ void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) {
const Z_AttributeConverter *converter = &Z_PostProcess[i]; const Z_AttributeConverter *converter = &Z_PostProcess[i];
uint16_t conv_cluster = CxToCluster(pgm_read_byte(&converter->cluster_short)); uint16_t conv_cluster = CxToCluster(pgm_read_byte(&converter->cluster_short));
uint16_t conv_attribute = pgm_read_word(&converter->attribute); uint16_t conv_attribute = pgm_read_word(&converter->attribute);
int16_t conv_multiplier = pgm_read_word(&converter->multiplier);
uint16_t conv_cb = pgm_read_word(&converter->cb); // callback id
if ((conv_cluster == cluster) && if ((conv_cluster == cluster) &&
((conv_attribute == attribute) || (conv_attribute == 0xFFFF)) ) { ((conv_attribute == attribute) || (conv_attribute == 0xFFFF)) ) {
String new_name_str = (const __FlashStringHelper*) converter->name; String new_name_str = (const __FlashStringHelper*) converter->name;
if (suffix > 1) { new_name_str += suffix; } // append suffix number if (suffix > 1) { new_name_str += suffix; } // append suffix number
int32_t drop = (*converter->func)(this, shortaddr, json, key, value, new_name_str, conv_cluster, conv_attribute); // apply the transformation
int32_t drop = Z_ApplyConverter(this, shortaddr, json, key, value, new_name_str, conv_cluster, conv_attribute, conv_multiplier, conv_cb);
if (drop) { if (drop) {
json.remove(key); json.remove(key);
} }

88
tasmota/xdrv_23_zigbee_8_parsers.ino
View File

@ -657,21 +657,24 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
} else { } else {
// Build the ZbReceive json // Build the ZbReceive json
if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) { if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
zcl_received.parseRawAttributes(json); // Zigbee report attributes from sensors zcl_received.parseReportAttributes(json); // Zigbee report attributes from sensors
if (clusterid) { defer_attributes = true; } // don't defer system Cluster=0 messages if (clusterid) { defer_attributes = true; } // don't defer system Cluster=0 messages
} else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) { } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
zcl_received.parseReadAttributesResponse(json); zcl_received.parseReadAttributesResponse(json);
if (clusterid) { defer_attributes = true; } // don't defer system Cluster=0 messages if (clusterid) { defer_attributes = true; } // don't defer system Cluster=0 messages
} else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES == zcl_received.getCmdId())) { } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES == zcl_received.getCmdId())) {
zcl_received.parseReadAttributes(json); zcl_received.parseReadAttributes(json);
if (clusterid) { defer_attributes = true; } // don't defer system Cluster=0 messages // never defer read_attributes, so the auto-responder can send response back on a per cluster basis
} else if (zcl_received.isClusterSpecificCommand()) { } else if (zcl_received.isClusterSpecificCommand()) {
zcl_received.parseClusterSpecificCommand(json); zcl_received.parseClusterSpecificCommand(json);
} }
String msg("");
msg.reserve(100); { // fence to force early de-allocation of msg
json.printTo(msg); String msg("");
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str()); msg.reserve(100);
json.printTo(msg);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
}
zcl_received.postProcessAttributes(srcaddr, json); zcl_received.postProcessAttributes(srcaddr, json);
// Add Endpoint // Add Endpoint
@ -701,6 +704,9 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
} else { } else {
// Publish immediately // Publish immediately
zigbee_devices.jsonPublishNow(srcaddr, json); zigbee_devices.jsonPublishNow(srcaddr, json);
// Add auto-responder here
Z_AutoResponder(srcaddr, clusterid, srcendpoint, json[F("ReadNames")]);
} }
} }
return -1; return -1;
@ -817,4 +823,74 @@ int32_t Z_State_Ready(uint8_t value) {
return 0; // continue return 0; // continue
} }
//
// Auto-responder for Read request from extenal devices.
//
// Mostly used for routers/end-devices
// json: holds the attributes in JSON format
void Z_AutoResponder(uint16_t srcaddr, uint16_t cluster, uint8_t endpoint, const JsonObject &json) {
DynamicJsonBuffer jsonBuffer;
JsonObject& json_out = jsonBuffer.createObject();
// responder
switch (cluster) {
case 0x0000:
if (HasKeyCaseInsensitive(json, PSTR("ModelId"))) { json_out[F("ModelId")] = F("Tasmota Z2T"); }
if (HasKeyCaseInsensitive(json, PSTR("Manufacturer"))) { json_out[F("Manufacturer")] = F("Tasmota"); }
break;
#ifdef USE_LIGHT
case 0x0006:
if (HasKeyCaseInsensitive(json, PSTR("Power"))) { json_out[F("Power")] = Light.power ? 1 : 0; }
break;
case 0x0008:
if (HasKeyCaseInsensitive(json, PSTR("Dimmer"))) { json_out[F("Dimmer")] = LightGetDimmer(0); }
break;
case 0x0300:
{
uint16_t hue;
uint8_t sat;
float XY[2];
LightGetHSB(&hue, &sat, nullptr);
LightGetXY(&XY[0], &XY[1]);
uint16_t uxy[2];
for (uint32_t i = 0; i < ARRAY_SIZE(XY); i++) {
uxy[i] = XY[i] * 65536.0f;
uxy[i] = (uxy[i] > 0xFEFF) ? uxy[i] : 0xFEFF;
}
if (HasKeyCaseInsensitive(json, PSTR("Hue"))) { json_out[F("Hue")] = changeUIntScale(hue, 0, 360, 0, 254); }
if (HasKeyCaseInsensitive(json, PSTR("Sat"))) { json_out[F("Sat")] = changeUIntScale(sat, 0, 255, 0, 254); }
if (HasKeyCaseInsensitive(json, PSTR("CT"))) { json_out[F("CT")] = LightGetColorTemp(); }
if (HasKeyCaseInsensitive(json, PSTR("X"))) { json_out[F("X")] = uxy[0]; }
if (HasKeyCaseInsensitive(json, PSTR("Y"))) { json_out[F("Y")] = uxy[1]; }
}
break;
#endif
case 0x000A: // Time
if (HasKeyCaseInsensitive(json, PSTR("Time"))) { json_out[F("Time")] = Rtc.utc_time; }
if (HasKeyCaseInsensitive(json, PSTR("TimeStatus"))) { json_out[F("TimeStatus")] = (Rtc.utc_time > (60 * 60 * 24 * 365 * 10)) ? 0x02 : 0x00; } // if time is beyond 2010 then we are synchronized
if (HasKeyCaseInsensitive(json, PSTR("TimeZone"))) { json_out[F("TimeZone")] = Settings.toffset[0] * 60; } // seconds
break;
}
if (json_out.size() > 0) {
// we have a non-empty output
// log first
String msg("");
msg.reserve(100);
json_out.printTo(msg);
AddLog_P2(LOG_LEVEL_INFO, PSTR("ZIG: Auto-responder: ZbSend {\"Device\":\"0x%04X\""
",\"Cluster\":\"0x%04X\""
",\"Endpoint\":%d"
",\"Response\":%s}"
),
srcaddr, cluster, endpoint,
msg.c_str());
// send
const JsonVariant &json_out_v = json_out;
ZbSendReportWrite(json_out_v, srcaddr, 0 /* group */,cluster, endpoint, 0 /* manuf */, ZCL_READ_ATTRIBUTES_RESPONSE);
}
}
#endif // USE_ZIGBEE #endif // USE_ZIGBEE

100
tasmota/xdrv_23_zigbee_9_impl.ino
View File

@ -393,19 +393,25 @@ void zigbeeZCLSendStr(uint16_t shortaddr, uint16_t groupaddr, uint8_t endpoint,
} }
} }
// Parse "Report" or "Write" attribute // Parse "Report", "Write" or "Response" attribute
void ZbSendReportWrite(const JsonVariant &val_pubwrite, uint16_t device, uint16_t groupaddr, uint16_t cluster, uint8_t endpoint, uint16_t manuf, bool write) { // Operation is one of: ZCL_REPORT_ATTRIBUTES (0x0A), ZCL_WRITE_ATTRIBUTES (0x02) or ZCL_READ_ATTRIBUTES_RESPONSE (0x01)
void ZbSendReportWrite(const JsonObject &val_pubwrite, uint16_t device, uint16_t groupaddr, uint16_t cluster, uint8_t endpoint, uint16_t manuf, uint32_t operation) {
SBuffer buf(200); // buffer to store the binary output of attibutes SBuffer buf(200); // buffer to store the binary output of attibutes
const JsonObject &attrs = val_pubwrite.as<const JsonObject&>(); if (nullptr == XdrvMailbox.command) {
XdrvMailbox.command = (char*) ""; // prevent a crash when calling ReponseCmndChar and there was no previous command
}
// iterate on keys // iterate on keys
for (JsonObject::const_iterator it=attrs.begin(); it!=attrs.end(); ++it) { for (JsonObject::const_iterator it=val_pubwrite.begin(); it!=val_pubwrite.end(); ++it) {
const char *key = it->key; const char *key = it->key;
const JsonVariant &value = it->value; const JsonVariant &value = it->value;
uint16_t attr_id = 0xFFFF; uint16_t attr_id = 0xFFFF;
uint16_t cluster_id = 0xFFFF; uint16_t cluster_id = 0xFFFF;
uint8_t type_id = Znodata; uint8_t type_id = Znodata;
int16_t multiplier = 1; // multiplier to adjust the key value
float val_f = 0.0f; // alternative value if multiplier is used
// check if the name has the format "XXXX/YYYY" where XXXX is the cluster, YYYY the attribute id // check if the name has the format "XXXX/YYYY" where XXXX is the cluster, YYYY the attribute id
// alternative "XXXX/YYYY%ZZ" where ZZ is the type (for unregistered attributes) // alternative "XXXX/YYYY%ZZ" where ZZ is the type (for unregistered attributes)
@ -431,6 +437,7 @@ void ZbSendReportWrite(const JsonVariant &val_pubwrite, uint16_t device, uint16_
uint16_t local_attr_id = pgm_read_word(&converter->attribute); uint16_t local_attr_id = pgm_read_word(&converter->attribute);
uint16_t local_cluster_id = CxToCluster(pgm_read_byte(&converter->cluster_short)); uint16_t local_cluster_id = CxToCluster(pgm_read_byte(&converter->cluster_short));
uint8_t local_type_id = pgm_read_byte(&converter->type); uint8_t local_type_id = pgm_read_byte(&converter->type);
int16_t local_multiplier = pgm_read_word(&converter->multiplier);
// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Try cluster = 0x%04X, attr = 0x%04X, type_id = 0x%02X"), local_cluster_id, local_attr_id, local_type_id); // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Try cluster = 0x%04X, attr = 0x%04X, type_id = 0x%02X"), local_cluster_id, local_attr_id, local_type_id);
if (delimiter) { if (delimiter) {
@ -445,12 +452,14 @@ void ZbSendReportWrite(const JsonVariant &val_pubwrite, uint16_t device, uint16_
cluster_id = local_cluster_id; cluster_id = local_cluster_id;
attr_id = local_attr_id; attr_id = local_attr_id;
type_id = local_type_id; type_id = local_type_id;
multiplier = local_multiplier;
break; break;
} }
} }
} }
} }
// Buffer ready, do some sanity checks
// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("cluster_id = 0x%04X, attr_id = 0x%04X, type_id = 0x%02X"), cluster_id, attr_id, type_id); // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("cluster_id = 0x%04X, attr_id = 0x%04X, type_id = 0x%02X"), cluster_id, attr_id, type_id);
if ((0xFFFF == attr_id) || (0xFFFF == cluster_id)) { if ((0xFFFF == attr_id) || (0xFFFF == cluster_id)) {
Response_P(PSTR("{\"%s\":\"%s'%s'\"}"), XdrvMailbox.command, PSTR("Unknown attribute "), key); Response_P(PSTR("{\"%s\":\"%s'%s'\"}"), XdrvMailbox.command, PSTR("Unknown attribute "), key);
@ -467,8 +476,19 @@ void ZbSendReportWrite(const JsonVariant &val_pubwrite, uint16_t device, uint16_
ResponseCmndChar_P(PSTR("No more than one cluster id per command")); ResponseCmndChar_P(PSTR("No more than one cluster id per command"));
return; return;
} }
// apply multiplier if needed
bool use_val = true;
if ((0 != multiplier) && (1 != multiplier)) {
val_f = value;
if (multiplier > 0) { // inverse of decoding
val_f = val_f / multiplier;
} else {
val_f = val_f * multiplier;
}
use_val = false;
}
// push the value in the buffer // push the value in the buffer
int32_t res = encodeSingleAttribute(buf, value, attr_id, type_id); int32_t res = encodeSingleAttribute(buf, use_val ? value : *(const JsonVariant*)nullptr, val_f, attr_id, type_id, operation == ZCL_READ_ATTRIBUTES_RESPONSE); // force status if Reponse
if (res < 0) { if (res < 0) {
Response_P(PSTR("{\"%s\":\"%s'%s' 0x%02X\"}"), XdrvMailbox.command, PSTR("Unsupported attribute type "), key, type_id); Response_P(PSTR("{\"%s\":\"%s'%s' 0x%02X\"}"), XdrvMailbox.command, PSTR("Unsupported attribute type "), key, type_id);
return; return;
@ -482,7 +502,7 @@ void ZbSendReportWrite(const JsonVariant &val_pubwrite, uint16_t device, uint16_
} }
// all good, send the packet // all good, send the packet
ZigbeeZCLSend_Raw(device, groupaddr, cluster, endpoint, write ? ZCL_WRITE_ATTRIBUTES : ZCL_REPORT_ATTRIBUTES, false /* not cluster specific */, manuf, buf.getBuffer(), buf.len(), false /* noresponse */, zigbee_devices.getNextSeqNumber(device)); ZigbeeZCLSend_Raw(device, groupaddr, cluster, endpoint, operation, false /* not cluster specific */, manuf, buf.getBuffer(), buf.len(), false /* noresponse */, zigbee_devices.getNextSeqNumber(device));
ResponseCmndDone(); ResponseCmndDone();
} }
@ -511,14 +531,22 @@ void ZbSendSend(const JsonVariant &val_cmd, uint16_t device, uint16_t groupaddr,
const JsonVariant& value = it->value; const JsonVariant& value = it->value;
uint32_t x = 0, y = 0, z = 0; uint32_t x = 0, y = 0, z = 0;
uint16_t cmd_var; uint16_t cmd_var;
uint16_t local_cluster_id;
const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str(), &cluster, &cmd_var); const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str(), &local_cluster_id, &cmd_var);
if (tasmota_cmd) { if (tasmota_cmd) {
cmd_str = tasmota_cmd; cmd_str = tasmota_cmd;
} else { } else {
Response_P(PSTR("Unrecognized zigbee command: %s"), key.c_str()); Response_P(PSTR("Unrecognized zigbee command: %s"), key.c_str());
return; return;
} }
// check cluster
if (0xFFFF == cluster) {
cluster = local_cluster_id;
} else if (cluster != local_cluster_id) {
ResponseCmndChar_P(PSTR("No more than one cluster id per command"));
return;
}
// parse the JSON value, depending on its type fill in x,y,z // parse the JSON value, depending on its type fill in x,y,z
if (value.is<bool>()) { if (value.is<bool>()) {
@ -570,7 +598,15 @@ void ZbSendSend(const JsonVariant &val_cmd, uint16_t device, uint16_t groupaddr,
// where AA is the cluster number, BBBB the command number, CCCC... the payload // where AA is the cluster number, BBBB the command number, CCCC... the payload
// First delimiter is '_' for a global command, or '!' for a cluster specific command // First delimiter is '_' for a global command, or '!' for a cluster specific command
const char * data = cmd_str.c_str(); const char * data = cmd_str.c_str();
cluster = parseHex(&data, 4); uint16_t local_cluster_id = parseHex(&data, 4);
// check cluster
if (0xFFFF == cluster) {
cluster = local_cluster_id;
} else if (cluster != local_cluster_id) {
ResponseCmndChar_P(PSTR("No more than one cluster id per command"));
return;
}
// delimiter // delimiter
if (('_' == *data) || ('!' == *data)) { if (('_' == *data) || ('!' == *data)) {
@ -650,6 +686,14 @@ void ZbSendRead(const JsonVariant &val_attr, uint16_t device, uint16_t groupaddr
attrs[actual_attr_len++] = local_attr_id & 0xFF; attrs[actual_attr_len++] = local_attr_id & 0xFF;
attrs[actual_attr_len++] = local_attr_id >> 8; attrs[actual_attr_len++] = local_attr_id >> 8;
found = true; found = true;
// check cluster
if (0xFFFF == cluster) {
cluster = local_cluster_id;
} else if (cluster != local_cluster_id) {
ResponseCmndChar_P(PSTR("No more than one cluster id per command"));
if (attrs) { delete[] attrs; }
return;
}
break; // found, exit loop break; // found, exit loop
} }
} }
@ -728,6 +772,8 @@ void CmndZbSend(void) {
return; return;
} }
} }
// from here, either device has a device shortaddr, or if BAD_SHORTADDR then use group address
// Note: groupaddr == 0 is valid
// read other parameters // read other parameters
const JsonVariant &val_cluster = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_CLUSTER)); const JsonVariant &val_cluster = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_CLUSTER));
@ -739,44 +785,64 @@ void CmndZbSend(void) {
// infer endpoint // infer endpoint
if (BAD_SHORTADDR == device) { if (BAD_SHORTADDR == device) {
endpoint = 0xFF; // endpoint not used for group addresses endpoint = 0xFF; // endpoint not used for group addresses, so use a dummy broadcast endpoint
} else if (0 == endpoint) { } else if (0 == endpoint) { // if it was not already specified, try to guess it
endpoint = zigbee_devices.findFirstEndpoint(device); endpoint = zigbee_devices.findFirstEndpoint(device);
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZIG: guessing endpoint %d"), endpoint); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZIG: guessing endpoint %d"), endpoint);
} }
if (0 == endpoint) { // after this, if it is still zero, then it's an error
ResponseCmndChar_P(PSTR("Missing endpoint"));
return;
}
// from here endpoint is valid and non-zero
// cluster may be already specified or 0xFFFF
const JsonVariant &val_cmd = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_SEND)); const JsonVariant &val_cmd = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_SEND));
const JsonVariant &val_read = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_READ)); const JsonVariant &val_read = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_READ));
const JsonVariant &val_write = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_WRITE)); const JsonVariant &val_write = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_WRITE));
const JsonVariant &val_publish = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_REPORT)); const JsonVariant &val_publish = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_REPORT));
uint32_t multi_cmd = (nullptr != &val_cmd) + (nullptr != &val_read) + (nullptr != &val_write) + (nullptr != &val_publish); const JsonVariant &val_response = GetCaseInsensitive(json, PSTR(D_CMND_ZIGBEE_RESPONSE));
uint32_t multi_cmd = (nullptr != &val_cmd) + (nullptr != &val_read) + (nullptr != &val_write) + (nullptr != &val_publish)+ (nullptr != &val_response);
if (multi_cmd > 1) { if (multi_cmd > 1) {
ResponseCmndChar_P(PSTR("Can only have one of: 'Send', 'Read', 'Write' or 'Report'")); ResponseCmndChar_P(PSTR("Can only have one of: 'Send', 'Read', 'Write', 'Report' or 'Reponse'"));
return; return;
} }
// from here we have one and only one command
if (nullptr != &val_cmd) { if (nullptr != &val_cmd) {
// "Send":{...commands...} // "Send":{...commands...}
// we accept either a string or a JSON object
ZbSendSend(val_cmd, device, groupaddr, cluster, endpoint, manuf); ZbSendSend(val_cmd, device, groupaddr, cluster, endpoint, manuf);
} else if (nullptr != &val_read) { } else if (nullptr != &val_read) {
// "Read":{...attributes...}, "Read":attribute or "Read":[...attributes...] // "Read":{...attributes...}, "Read":attribute or "Read":[...attributes...]
// we accept eitehr a number, a string, an array of numbers/strings, or a JSON object
ZbSendRead(val_read, device, groupaddr, cluster, endpoint, manuf); ZbSendRead(val_read, device, groupaddr, cluster, endpoint, manuf);
} else if (nullptr != &val_write) { } else if (nullptr != &val_write) {
if ((0 == endpoint) || (!val_write.is<JsonObject>())) { // only KSON object
if (!val_write.is<JsonObject>()) {
ResponseCmndChar_P(PSTR("Missing parameters")); ResponseCmndChar_P(PSTR("Missing parameters"));
return; return;
} }
// "Write":{...attributes...} // "Write":{...attributes...}
ZbSendReportWrite(val_write, device, groupaddr, cluster, endpoint, manuf, true /* write */); ZbSendReportWrite(val_write, device, groupaddr, cluster, endpoint, manuf, ZCL_WRITE_ATTRIBUTES);
} else if (nullptr != &val_publish) { } else if (nullptr != &val_publish) {
if ((0 == endpoint) || (!val_publish.is<JsonObject>())) { // "Report":{...attributes...}
// only KSON object
if (!val_publish.is<JsonObject>()) {
ResponseCmndChar_P(PSTR("Missing parameters")); ResponseCmndChar_P(PSTR("Missing parameters"));
return; return;
} }
ZbSendReportWrite(val_publish, device, groupaddr, cluster, endpoint, manuf, ZCL_REPORT_ATTRIBUTES);
} else if (nullptr != &val_response) {
// "Report":{...attributes...} // "Report":{...attributes...}
ZbSendReportWrite(val_publish, device, groupaddr, cluster, endpoint, manuf, false /* report */); // only KSON object
if (!val_response.is<JsonObject>()) {
ResponseCmndChar_P(PSTR("Missing parameters"));
return;
}
ZbSendReportWrite(val_response, device, groupaddr, cluster, endpoint, manuf, ZCL_READ_ATTRIBUTES_RESPONSE);
} else { } else {
Response_P(PSTR("Missing zigbee 'Send', 'Write' or 'Report'")); Response_P(PSTR("Missing zigbee 'Send', 'Write', 'Report' or 'Response'"));
return; return;
} }
} }