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

Moved to uint16_t

This commit is contained in:
Stephan Hadinger 2022-11-20 18:32:37 +01:00
parent 923ef8202e
commit e4bae0cca6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino
View File

@ -318,8 +318,8 @@ public:
} }
uint8_t type; // zigbee type, Zunk by default uint8_t type; // zigbee type, Zunk by default
int16_t multiplier; // multiply by x (ignore if 0 or 1) uint16_t multiplier; // multiply by x (ignore if 0 or 1)
int16_t divider; // divide by x (ignore if 0 or 1) uint16_t divider; // divide by x (ignore if 0 or 1)
int16_t base; // add x (ignore if 0) int16_t base; // add x (ignore if 0)
uint16_t cluster; // cluster number uint16_t cluster; // cluster number
uint16_t attribute; // attribute number uint16_t attribute; // attribute number
@ -354,8 +354,8 @@ public:
uint16_t attribute; // attribute to match uint16_t attribute; // attribute to match
uint16_t new_cluster; // replace with this cluster uint16_t new_cluster; // replace with this cluster
uint16_t new_attribute; // replace with this attribute uint16_t new_attribute; // replace with this attribute
int16_t multiplier; // multiply by x (ignore if 0 or 1) uint16_t multiplier; // multiply by x (ignore if 0 or 1)
int16_t divider; // divide by x (ignore if 0 or 1) uint16_t divider; // divide by x (ignore if 0 or 1)
int16_t base; // add x (ignore if 0) int16_t base; // add x (ignore if 0)
}; };

4
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_2_converters.ino
View File

@ -1000,8 +1000,8 @@ void ZCLFrame::parseReadConfigAttributes(uint16_t shortaddr, Z_attribute_list& a
} }
// find the multiplier // find the multiplier
int16_t multiplier = 1; uint16_t multiplier = 1;
int16_t divider = 1; uint16_t divider = 1;
int16_t base = 0; int16_t base = 0;
Z_attribute_match matched_attr = Z_findAttributeMatcherById(shortaddr, cluster, attrid, false); Z_attribute_match matched_attr = Z_findAttributeMatcherById(shortaddr, cluster, attrid, false);
if (matched_attr.found()) { if (matched_attr.found()) {