Skip to content

Commit ab08c76

Browse files
committed
Merge branch 'release/v3.3.x' of https://github.com/espressif/arduino-esp32 into idf-master
2 parents 443c064 + 88ee974 commit ab08c76

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

libraries/Network/src/NetworkInterface.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
8181
);
8282
#endif
8383
memcpy(&arduino_event.event_info.got_ip, event_data, sizeof(ip_event_got_ip_t));
84-
#if SOC_WIFI_SUPPORTED
84+
#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
8585
if (_interface_id == ESP_NETIF_ID_STA) {
8686
arduino_event.event_id = ARDUINO_EVENT_WIFI_STA_GOT_IP;
8787
} else
@@ -96,7 +96,7 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
9696
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
9797
log_v("%s Lost IP", desc());
9898
#endif
99-
#if SOC_WIFI_SUPPORTED
99+
#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
100100
if (_interface_id == ESP_NETIF_ID_STA) {
101101
arduino_event.event_id = ARDUINO_EVENT_WIFI_STA_LOST_IP;
102102
} else
@@ -123,7 +123,7 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
123123
);
124124
#endif
125125
memcpy(&arduino_event.event_info.got_ip6, event_data, sizeof(ip_event_got_ip6_t));
126-
#if SOC_WIFI_SUPPORTED
126+
#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
127127
if (_interface_id == ESP_NETIF_ID_STA) {
128128
arduino_event.event_id = ARDUINO_EVENT_WIFI_STA_GOT_IP6;
129129
} else if (_interface_id == ESP_NETIF_ID_AP) {
@@ -136,7 +136,7 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
136136
arduino_event.event_id = ARDUINO_EVENT_ETH_GOT_IP6;
137137
}
138138
#endif /* CONFIG_LWIP_IPV6 */
139-
#if SOC_WIFI_SUPPORTED
139+
#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
140140
} else if (event_id == IP_EVENT_AP_STAIPASSIGNED && _interface_id == ESP_NETIF_ID_AP) {
141141
setStatusBits(ESP_NETIF_HAS_IP_BIT);
142142
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE

libraries/Zigbee/src/ZigbeeEP.h

Lines changed: 1 addition & 1 deletion
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

libraries/Zigbee/src/ep/ZigbeeWindowCovering.h

Lines changed: 1 addition & 1 deletion
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)