mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-28 05:06:32 +00:00
Fix compilation of Zigbee for Core3 (#20464)
This commit is contained in:
parent
20c70d578e
commit
20c54a3647
@ -795,7 +795,7 @@ void Z_Device::jsonAddEndpoints(Z_attribute_list & attr_list) const {
|
|||||||
for (uint32_t i = 0; i < endpoints_max; i++) {
|
for (uint32_t i = 0; i < endpoints_max; i++) {
|
||||||
uint8_t endpoint = endpoints[i];
|
uint8_t endpoint = endpoints[i];
|
||||||
if (0x00 == endpoint) { break; }
|
if (0x00 == endpoint) { break; }
|
||||||
arr_ep.add(endpoint);
|
arr_ep.add((uint32_t)endpoint);
|
||||||
}
|
}
|
||||||
attr_list.addAttributePMEM(PSTR("Endpoints")).setStrRaw(arr_ep.toString().c_str());
|
attr_list.addAttributePMEM(PSTR("Endpoints")).setStrRaw(arr_ep.toString().c_str());
|
||||||
}
|
}
|
||||||
|
@ -931,7 +931,7 @@ void ZCLFrame::parseReadAttributes(uint16_t shortaddr, Z_attribute_list& attr_li
|
|||||||
Z_attribute_list attr_names;
|
Z_attribute_list attr_names;
|
||||||
while (len >= 2 + i) {
|
while (len >= 2 + i) {
|
||||||
uint16_t attrid = payload.get16(i);
|
uint16_t attrid = payload.get16(i);
|
||||||
attr_numbers.add(attrid);
|
attr_numbers.add((uint32_t)attrid);
|
||||||
read_attr_ids[i/2] = attrid;
|
read_attr_ids[i/2] = attrid;
|
||||||
|
|
||||||
// find the attribute name
|
// find the attribute name
|
||||||
|
@ -454,7 +454,7 @@ void convertClusterSpecific(class Z_attribute_list &attr_list, uint16_t cluster,
|
|||||||
|
|
||||||
JsonGeneratorArray group_list;
|
JsonGeneratorArray group_list;
|
||||||
for (uint32_t i = 0; i < xyz.y; i++) {
|
for (uint32_t i = 0; i < xyz.y; i++) {
|
||||||
group_list.add(payload.get16(2 + 2*i));
|
group_list.add((uint32_t)payload.get16(2 + 2*i));
|
||||||
}
|
}
|
||||||
attr_list.addAttribute(command_name, true).setStrRaw(group_list.toString().c_str());
|
attr_list.addAttribute(command_name, true).setStrRaw(group_list.toString().c_str());
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,7 @@ bool convertGPDF_Commissioning(class Z_attribute_list &attr_list, uint16_t short
|
|||||||
JsonGeneratorArray gpdi_list;
|
JsonGeneratorArray gpdi_list;
|
||||||
for (uint32_t i = 0; i < gpid_len; i++) {
|
for (uint32_t i = 0; i < gpid_len; i++) {
|
||||||
if (idx_offset >= payload_len + payload_start) { break; } // end of payload
|
if (idx_offset >= payload_len + payload_start) { break; } // end of payload
|
||||||
gpdi_list.add(payload.get8(idx_offset++));
|
gpdi_list.add((uint32_t)payload.get8(idx_offset++));
|
||||||
}
|
}
|
||||||
ResponseAppend_P(PSTR(",\"commandid\":%s"), gpdi_list.toString().c_str());
|
ResponseAppend_P(PSTR(",\"commandid\":%s"), gpdi_list.toString().c_str());
|
||||||
}
|
}
|
||||||
@ -171,7 +171,7 @@ bool convertGPDF_Commissioning(class Z_attribute_list &attr_list, uint16_t short
|
|||||||
JsonGeneratorArray gpdi_list;
|
JsonGeneratorArray gpdi_list;
|
||||||
for (uint32_t i = 0; i < clust_report_len; i++) {
|
for (uint32_t i = 0; i < clust_report_len; i++) {
|
||||||
if (idx_offset >= payload_len + payload_start) { break; } // end of payload
|
if (idx_offset >= payload_len + payload_start) { break; } // end of payload
|
||||||
gpdi_list.add(payload.get16(idx_offset));
|
gpdi_list.add((uint32_t)payload.get16(idx_offset));
|
||||||
idx_offset += 2;
|
idx_offset += 2;
|
||||||
}
|
}
|
||||||
ResponseAppend_P(PSTR(",\"clusterreports\":%s"), gpdi_list.toString().c_str());
|
ResponseAppend_P(PSTR(",\"clusterreports\":%s"), gpdi_list.toString().c_str());
|
||||||
|
@ -550,7 +550,7 @@ extern "C" {
|
|||||||
} else if (mode == 12) {
|
} else if (mode == 12) {
|
||||||
a->setKeyName("array");
|
a->setKeyName("array");
|
||||||
a->newJsonArray();
|
a->newJsonArray();
|
||||||
a->val.arrval->add(-1);
|
a->val.arrval->add((int32_t)-1);
|
||||||
a->val.arrval->addStr("foo");
|
a->val.arrval->addStr("foo");
|
||||||
a->val.arrval->addStr("bar");
|
a->val.arrval->addStr("bar");
|
||||||
a->val.arrval->addStr("bar\"baz\'toto");
|
a->val.arrval->addStr("bar\"baz\'toto");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user