Skip to content

Commit 5c06561

Browse files
authored
Merge branch 'master' into feat/zigbee-ota
2 parents ea9d246 + 250c1ab commit 5c06561

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Diff for: libraries/ESP_I2S/src/ESP_I2S.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
#include "mp3dec.h"
1212
#endif
1313

14+
#if SOC_I2S_HW_VERSION_2
15+
#undef I2S_STD_CLK_DEFAULT_CONFIG
16+
#define I2S_STD_CLK_DEFAULT_CONFIG(rate) \
17+
{ .sample_rate_hz = rate, .clk_src = I2S_CLK_SRC_DEFAULT, .ext_clk_freq_hz = 0, .mclk_multiple = I2S_MCLK_MULTIPLE_256, }
18+
#endif
19+
1420
#define I2S_READ_CHUNK_SIZE 1920
1521

1622
#define I2S_DEFAULT_CFG() \

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

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

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

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)