Skip to content

Commit c47324a

Browse files
committed
fix(Zigbee): proper parameter in printBoundDevices
1 parent 40c56b5 commit c47324a

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

Diff for: libraries/Zigbee/src/ZigbeeEP.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -186,21 +186,21 @@ char *ZigbeeEP::readModel(uint8_t endpoint, uint16_t short_addr, esp_zb_ieee_add
186186
return _read_model;
187187
}
188188

189-
void ZigbeeEP::printBoundDevices(Print *print) {
190-
if (print == nullptr) {
191-
log_i("Bound devices:");
192-
for ([[maybe_unused]]
193-
const auto &device : _bound_devices) {
194-
log_i("Device on endpoint %d, short address: 0x%x, ieee address: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", device->endpoint, device->short_addr,
195-
device->ieee_addr[7], device->ieee_addr[6], device->ieee_addr[5], device->ieee_addr[4], device->ieee_addr[3], device->ieee_addr[2], device->ieee_addr[1], device->ieee_addr[0]);
196-
}
197-
} else {
198-
print->println("Bound devices:");
199-
for ([[maybe_unused]]
200-
const auto &device : _bound_devices) {
201-
print->printf("Device on endpoint %d, short address: 0x%x, ieee address: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\r\n", device->endpoint, device->short_addr,
202-
device->ieee_addr[7], device->ieee_addr[6], device->ieee_addr[5], device->ieee_addr[4], device->ieee_addr[3], device->ieee_addr[2], device->ieee_addr[1], device->ieee_addr[0]);
189+
void ZigbeeEP::printBoundDevices() {
190+
log_i("Bound devices:");
191+
for ([[maybe_unused]]
192+
const auto &device : _bound_devices) {
193+
log_i("Device on endpoint %d, short address: 0x%x, ieee address: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", device->endpoint, device->short_addr,
194+
device->ieee_addr[7], device->ieee_addr[6], device->ieee_addr[5], device->ieee_addr[4], device->ieee_addr[3], device->ieee_addr[2], device->ieee_addr[1], device->ieee_addr[0]);
203195
}
196+
}
197+
198+
void ZigbeeEP::printBoundDevices(Print &print) {
199+
print.println("Bound devices:");
200+
for ([[maybe_unused]]
201+
const auto &device : _bound_devices) {
202+
print.printf("Device on endpoint %d, short address: 0x%x, ieee address: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\r\n", device->endpoint, device->short_addr,
203+
device->ieee_addr[7], device->ieee_addr[6], device->ieee_addr[5], device->ieee_addr[4], device->ieee_addr[3], device->ieee_addr[2], device->ieee_addr[1], device->ieee_addr[0]);
204204
}
205205
}
206206

Diff for: libraries/Zigbee/src/ZigbeeEP.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ class ZigbeeEP {
6666
return _endpoint;
6767
}
6868

69-
void printBoundDevices(Print *print = nullptr);
69+
void printBoundDevices();
70+
void printBoundDevices(Print &print);
71+
7072
std::list<zb_device_params_t *> getBoundDevices() const {
7173
return _bound_devices;
7274
}

0 commit comments

Comments
 (0)