Skip to content

Commit acd7320

Browse files
author
Victor Ho
committed
Merge branch 'master' into vvidf/v4.1
* master: M5Stack's product offering includes various ESP32-based camera devices. (espressif#4030) Fix for issue 3974 m_connectedCount incorrectly decremented when no connection exists Add a new board of KITS for IoT education (espressif#3703) update M5Camera pins (espressif#4021) Update SD_MMC.cpp (espressif#4020) Added missing wifi_provisioning dependency. (espressif#4003) HardwareSerial bugfix & improvement (espressif#3713) Allow using custom linker scripts (espressif#3735) Add M5Stack-ATOM Board (espressif#3883) Minor modifications in provisioning (espressif#3919) Add support of unified provisioning to Arduino Update install-platformio-esp32.sh add new board Handbit (espressif#3807) Move _STREAM_BOUNDARY before _STREAM_PART (espressif#3720) Add Senses's WEIZEN board from Senses IoT platform (espressif#3687) Revert "std::shared_ptr Memory Leak (espressif#3680)" (espressif#3682) std::shared_ptr Memory Leak (espressif#3680) Minimize HardwareSerial Receive and Transmit delays (espressif#3664) fix removeApbChangeCallback() error in spiStopBus() (espressif#3675) # Conflicts: # CMakeLists.txt
2 parents cb753e6 + b92c58d commit acd7320

File tree

22 files changed

+1078
-46
lines changed

22 files changed

+1078
-46
lines changed

Diff for: .github/scripts/install-platformio-esp32.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "Installing PlatformIO ..."
99
pip install -U https://github.com/platformio/platformio/archive/develop.zip > /dev/null 2>&1
1010

1111
echo "Installing Platform ESP32 ..."
12-
python -m platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage > /dev/null 2>&1
12+
python -m platformio platform install https://github.com/platformio/platform-espressif32.git > /dev/null 2>&1
1313

1414
echo "Replacing the framework version ..."
1515
if [[ "$OSTYPE" == "darwin"* ]]; then

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ tools/mkspiffs/mkspiffs.exe
1212
.vs/
1313
__vm/
1414
*.vcxproj*
15+
.vscode/

Diff for: CMakeLists.txt

+69-2
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,74 @@ set(LIBRARY_SRCS
7171
libraries/WiFi/src/WiFi.cpp
7272
libraries/WiFi/src/WiFiGeneric.cpp
7373
libraries/WiFi/src/WiFiMulti.cpp
74+
libraries/WiFi/src/WiFiProv.cpp
7475
libraries/WiFi/src/WiFiScan.cpp
7576
libraries/WiFi/src/WiFiServer.cpp
7677
libraries/WiFi/src/WiFiSTA.cpp
7778
libraries/WiFi/src/WiFiUdp.cpp
7879
libraries/Wire/src/Wire.cpp
7980
)
8081

82+
set(AZURE_SRCS
83+
libraries/AzureIoT/src/az_iot/azureiotcerts.c
84+
libraries/AzureIoT/src/az_iot/c-utility/pal/agenttime.c
85+
libraries/AzureIoT/src/az_iot/c-utility/pal/dns_async.c
86+
libraries/AzureIoT/src/az_iot/c-utility/pal/freertos/lock.c
87+
libraries/AzureIoT/src/az_iot/c-utility/pal/freertos/threadapi.c
88+
libraries/AzureIoT/src/az_iot/c-utility/pal/freertos/tickcounter.c
89+
libraries/AzureIoT/src/az_iot/c-utility/pal/lwip/sntp_lwip.c
90+
libraries/AzureIoT/src/az_iot/c-utility/pal/socket_async.c
91+
libraries/AzureIoT/src/az_iot/c-utility/pal/src/platform_openssl_compact.c
92+
libraries/AzureIoT/src/az_iot/c-utility/pal/src/tlsio_openssl_compact.c
93+
libraries/AzureIoT/src/az_iot/c-utility/pal/tlsio_options.c
94+
libraries/AzureIoT/src/az_iot/c-utility/src/base64.c
95+
libraries/AzureIoT/src/az_iot/c-utility/src/buffer.c
96+
libraries/AzureIoT/src/az_iot/c-utility/src/connection_string_parser.c
97+
libraries/AzureIoT/src/az_iot/c-utility/src/consolelogger.c
98+
libraries/AzureIoT/src/az_iot/c-utility/src/constbuffer.c
99+
libraries/AzureIoT/src/az_iot/c-utility/src/constmap.c
100+
libraries/AzureIoT/src/az_iot/c-utility/src/crt_abstractions.c
101+
libraries/AzureIoT/src/az_iot/c-utility/src/doublylinkedlist.c
102+
libraries/AzureIoT/src/az_iot/c-utility/src/gballoc.c
103+
libraries/AzureIoT/src/az_iot/c-utility/src/gb_stdio.c
104+
libraries/AzureIoT/src/az_iot/c-utility/src/gb_time.c
105+
libraries/AzureIoT/src/az_iot/c-utility/src/hmac.c
106+
libraries/AzureIoT/src/az_iot/c-utility/src/hmacsha256.c
107+
libraries/AzureIoT/src/az_iot/c-utility/src/httpapiex.c
108+
libraries/AzureIoT/src/az_iot/c-utility/src/httpapiexsas.c
109+
libraries/AzureIoT/src/az_iot/c-utility/src/httpheaders.c
110+
libraries/AzureIoT/src/az_iot/c-utility/src/http_proxy_io.c
111+
libraries/AzureIoT/src/az_iot/c-utility/src/map.c
112+
libraries/AzureIoT/src/az_iot/c-utility/src/optionhandler.c
113+
libraries/AzureIoT/src/az_iot/c-utility/src/sastoken.c
114+
libraries/AzureIoT/src/az_iot/c-utility/src/sha1.c
115+
libraries/AzureIoT/src/az_iot/c-utility/src/sha224.c
116+
libraries/AzureIoT/src/az_iot/c-utility/src/sha384-512.c
117+
libraries/AzureIoT/src/az_iot/c-utility/src/singlylinkedlist.c
118+
libraries/AzureIoT/src/az_iot/c-utility/src/strings.c
119+
libraries/AzureIoT/src/az_iot/c-utility/src/string_tokenizer.c
120+
libraries/AzureIoT/src/az_iot/c-utility/src/urlencode.c
121+
libraries/AzureIoT/src/az_iot/c-utility/src/usha.c
122+
libraries/AzureIoT/src/az_iot/c-utility/src/vector.c
123+
libraries/AzureIoT/src/az_iot/c-utility/src/xio.c
124+
libraries/AzureIoT/src/az_iot/c-utility/src/xlogging.c
125+
libraries/AzureIoT/src/az_iot/iothub_client/src/blob.c
126+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client_authorization.c
127+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client.c
128+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client_ll.c
129+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_client_retry_control.c
130+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothub_message.c
131+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransport.c
132+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransportmqtt.c
133+
libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransport_mqtt_common.c
134+
libraries/AzureIoT/src/az_iot/iothub_client/src/version.c
135+
libraries/AzureIoT/src/az_iot/umqtt/src/mqtt_client.c
136+
libraries/AzureIoT/src/az_iot/umqtt/src/mqtt_codec.c
137+
libraries/AzureIoT/src/az_iot/umqtt/src/mqtt_message.c
138+
libraries/AzureIoT/src/AzureIotHub.cpp
139+
libraries/AzureIoT/src/Esp32MQTTClient.cpp
140+
)
141+
81142
set(BLE_SRCS
82143
libraries/BLE/src/BLE2902.cpp
83144
libraries/BLE/src/BLE2904.cpp
@@ -110,13 +171,14 @@ set(BLE_SRCS
110171
libraries/BLE/src/GeneralUtils.cpp
111172
)
112173

113-
set(COMPONENT_SRCS ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
174+
set(COMPONENT_SRCS ${CORE_SRCS} ${LIBRARY_SRCS} ${AZURE_SRCS} ${BLE_SRCS})
114175

115176
set(COMPONENT_ADD_INCLUDEDIRS
116177
variants/esp32/
117178
cores/esp32/
118179
libraries/ArduinoOTA/src
119180
libraries/AsyncUDP/src
181+
libraries/AzureIoT/src
120182
libraries/BLE/src
121183
libraries/BluetoothSerial/src
122184
libraries/DNSServer/src
@@ -144,7 +206,12 @@ set(COMPONENT_ADD_INCLUDEDIRS
144206

145207
set(COMPONENT_PRIV_INCLUDEDIRS cores/esp32/libb64)
146208

147-
set(COMPONENT_REQUIRES spi_flash mbedtls mdns esp_adc_cal)
209+
set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet esp_adc_cal wifi_provisioning)
148210
set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt)
149211

150212
register_component()
213+
214+
set_source_files_properties(libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransport_mqtt_common.c
215+
PROPERTIES COMPILE_FLAGS
216+
-Wno-maybe-uninitialized
217+
)

0 commit comments

Comments
 (0)