Skip to content

Commit df94c0f

Browse files
aalyaaly
committed
Merge branch 'espressif:master' into master
2 parents a0d8107 + 5ba4c21 commit df94c0f

File tree

4 files changed

+75
-28
lines changed

4 files changed

+75
-28
lines changed

‎CMakeLists.txt

Lines changed: 69 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -117,27 +117,74 @@ set(ARDUINO_ALL_LIBRARIES
117117
WiFiProv
118118
Wire
119119
Zigbee
120-
M5StickCPlus
120+
M5Unified
121+
M5GFX
121122
)
122123

123-
set(ARDUINO_LIBRARY_M5StickCPlus_SRCS
124-
libraries/M5StickC-Plus/src/AXP192.cpp
125-
libraries/M5StickC-Plus/src/M5Display.cpp
126-
libraries/M5StickC-Plus/src/M5StickCPlus.cpp
127-
libraries/M5StickC-Plus/src/RTC.cpp
128-
libraries/M5StickC-Plus/src/utility/Button.cpp
129-
libraries/M5StickC-Plus/src/utility/In_eSPI.cpp
130-
libraries/M5StickC-Plus/src/utility/MahonyAHRS.cpp
131-
libraries/M5StickC-Plus/src/utility/MPU6886.cpp
132-
libraries/M5StickC-Plus/src/utility/Speaker.cpp
133-
libraries/M5StickC-Plus/src/utility/Sprite.cpp
134-
libraries/M5StickC-Plus/src/Fonts/Font16.c
135-
libraries/M5StickC-Plus/src/Fonts/Font32rle.c
136-
libraries/M5StickC-Plus/src/Fonts/Font64rle.c
137-
libraries/M5StickC-Plus/src/Fonts/Font72rle.c
138-
libraries/M5StickC-Plus/src/Fonts/Font7srle.c
139-
libraries/M5StickC-Plus/src/Fonts/glcdfont.c
140-
libraries/M5StickC-Plus/src/utility/qrcode.c)
124+
set(ARDUINO_LIBRARY_M5Unified_SRCS
125+
libraries/M5Unified/src/utility/Power_Class.cpp
126+
libraries/M5Unified/src/utility/AXP192_Class.cpp
127+
libraries/M5Unified/src/utility/Touch_Class.cpp
128+
libraries/M5Unified/src/utility/Speaker_Class.cpp
129+
libraries/M5Unified/src/utility/imu/MPU6886_Class.cpp
130+
libraries/M5Unified/src/utility/imu/AK8963_Class.cpp
131+
libraries/M5Unified/src/utility/imu/BMM150_Class.cpp
132+
libraries/M5Unified/src/utility/imu/SH200Q_Class.cpp
133+
libraries/M5Unified/src/utility/imu/BMI270_Class.cpp
134+
libraries/M5Unified/src/utility/imu/IMU_Base.cpp
135+
libraries/M5Unified/src/utility/Log_Class.cpp
136+
libraries/M5Unified/src/utility/Mic_Class.cpp
137+
libraries/M5Unified/src/utility/INA3221_Class.cpp
138+
libraries/M5Unified/src/utility/IMU_Class.cpp
139+
libraries/M5Unified/src/utility/I2C_Class.cpp
140+
libraries/M5Unified/src/utility/IP5306_Class.cpp
141+
libraries/M5Unified/src/utility/Button_Class.cpp
142+
libraries/M5Unified/src/utility/AXP2101_Class.cpp
143+
libraries/M5Unified/src/utility/M5Timer.cpp
144+
libraries/M5Unified/src/utility/RTC8563_Class.cpp
145+
libraries/M5Unified/src/M5Unified.cpp)
146+
147+
148+
set(ARDUINO_LIBRARY_M5GFX_SRCS
149+
libraries/M5GFX/src/lgfx/v1/LGFX_Button.cpp
150+
libraries/M5GFX/src/lgfx/v1/lgfx_fonts.cpp
151+
libraries/M5GFX/src/lgfx/v1/LGFXBase.cpp
152+
libraries/M5GFX/src/lgfx/v1/LGFX_Sprite.cpp
153+
libraries/M5GFX/src/lgfx/v1/touch/Touch_FT5x06.cpp
154+
libraries/M5GFX/src/lgfx/v1/touch/Touch_CST816S.cpp
155+
libraries/M5GFX/src/lgfx/v1/touch/Touch_GT911.cpp
156+
libraries/M5GFX/src/lgfx/v1/platforms/esp32c3/Bus_Parallel8.cpp
157+
libraries/M5GFX/src/lgfx/v1/platforms/esp32s2/Bus_Parallel8.cpp
158+
libraries/M5GFX/src/lgfx/v1/platforms/esp32s2/Bus_Parallel16.cpp
159+
libraries/M5GFX/src/lgfx/v1/platforms/framebuffer/Panel_fb.cpp
160+
libraries/M5GFX/src/lgfx/v1/platforms/framebuffer/common.cpp
161+
libraries/M5GFX/src/lgfx/v1/platforms/sdl/common.cpp
162+
libraries/M5GFX/src/lgfx/v1/platforms/sdl/Panel_sdl.cpp
163+
libraries/M5GFX/src/lgfx/v1/platforms/esp32s3/Bus_Parallel8.cpp
164+
libraries/M5GFX/src/lgfx/v1/platforms/esp32s3/Bus_Parallel16.cpp
165+
libraries/M5GFX/src/lgfx/v1/platforms/esp32/Bus_I2C.cpp
166+
libraries/M5GFX/src/lgfx/v1/platforms/esp32/Bus_Parallel8.cpp
167+
libraries/M5GFX/src/lgfx/v1/platforms/esp32/Bus_SPI.cpp
168+
libraries/M5GFX/src/lgfx/v1/platforms/esp32/Light_PWM.cpp
169+
libraries/M5GFX/src/lgfx/v1/platforms/esp32/Panel_CVBS.cpp
170+
libraries/M5GFX/src/lgfx/v1/platforms/esp32/common.cpp
171+
libraries/M5GFX/src/lgfx/v1/misc/common_function.cpp
172+
libraries/M5GFX/src/lgfx/v1/misc/DividedFrameBuffer.cpp
173+
libraries/M5GFX/src/lgfx/v1/misc/SpriteBuffer.cpp
174+
libraries/M5GFX/src/lgfx/v1/misc/pixelcopy.cpp
175+
libraries/M5GFX/src/lgfx/v1/panel/Panel_LCD.cpp
176+
libraries/M5GFX/src/lgfx/v1/panel/Panel_GDEW0154D67.cpp
177+
libraries/M5GFX/src/lgfx/v1/panel/Panel_GDEW0154M09.cpp
178+
libraries/M5GFX/src/lgfx/v1/panel/Panel_FrameBufferBase.cpp
179+
libraries/M5GFX/src/lgfx/v1/panel/Panel_M5UnitLCD.cpp
180+
libraries/M5GFX/src/lgfx/v1/panel/Panel_EPDiy.cpp
181+
libraries/M5GFX/src/lgfx/v1/panel/Panel_IT8951.cpp
182+
libraries/M5GFX/src/lgfx/v1/panel/Panel_M5UnitGLASS.cpp
183+
libraries/M5GFX/src/lgfx/v1/panel/Panel_M5HDMI.cpp
184+
libraries/M5GFX/src/lgfx/v1/panel/Panel_SSD1306.cpp
185+
libraries/M5GFX/src/lgfx/v1/panel/Panel_Device.cpp
186+
libraries/M5GFX/src/lgfx/v1/panel/Panel_HasBuffer.cpp
187+
libraries/M5GFX/src/M5GFX.cpp)
141188

142189
set(ARDUINO_LIBRARY_ArduinoOTA_SRCS libraries/ArduinoOTA/src/ArduinoOTA.cpp)
143190

@@ -350,7 +397,7 @@ set(ARDUINO_LIBRARY_BLE_SRCS
350397

351398
set(ARDUINO_LIBRARIES_SRCS)
352399
set(ARDUINO_LIBRARIES_REQUIRES)
353-
set(ARDUINO_LIBRARIES_INCLUDEDIRS libraries/M5StickC-Plus/src/)
400+
set(ARDUINO_LIBRARIES_INCLUDEDIRS libraries/M5Unified/src/ libraries/M5GFX/src/)
354401

355402
foreach(libname IN LISTS ARDUINO_ALL_LIBRARIES)
356403
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_${libname})
@@ -369,7 +416,7 @@ endforeach()
369416
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
370417
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
371418
set(priv_includes cores/esp32/libb64)
372-
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser esp_ringbuf esp_driver_gptimer esp_driver_usb_serial_jtag driver)
419+
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser esp_ringbuf esp_driver_gptimer esp_driver_usb_serial_jtag driver efuse)
373420
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
374421

375422
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
@@ -440,4 +487,4 @@ if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LittleFS
440487
endif()
441488
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv)
442489
maybe_add_component(espressif__network_provisioning)
443-
endif()
490+
endif()

‎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)