Skip to content

Commit 88ee974

Browse files
committed
Merge branch 'release/v3.2.x' of https://github.com/espressif/arduino-esp32 into release/v3.3.x
2 parents 41b788f + 84658de commit 88ee974

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class ZigbeeEP {
9595
void reportBatteryPercentage();
9696

9797
// Set time
98-
void addTimeCluster(tm time = {0}, int32_t gmt_offset = 0); // gmt offset in seconds
98+
void addTimeCluster(tm time = {}, int32_t gmt_offset = 0); // gmt offset in seconds
9999
void setTime(tm time);
100100
void setTimezone(int32_t gmt_offset);
101101

Diff for: libraries/Zigbee/src/ep/ZigbeeWindowCovering.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef struct zigbee_window_covering_cfg_s {
6767
class ZigbeeWindowCovering : public ZigbeeEP {
6868
public:
6969
ZigbeeWindowCovering(uint8_t endpoint);
70-
~ZigbeeWindowCovering();
70+
~ZigbeeWindowCovering() {}
7171

7272
// Set the callback functions for the window covering commands
7373
void onOpen(void (*callback)()) {

0 commit comments

Comments
 (0)