Skip to content

Commit 7e0811e

Browse files
committed
Update tools to latest IDF
1 parent f0b7959 commit 7e0811e

File tree

131 files changed

+14624
-771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+14624
-771
lines changed

libraries/WiFi/src/WiFiGeneric.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ void initWiFi()
290290
{
291291
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
292292
nvs_flash_init();
293-
system_init();
294293
tcpip_adapter_init();
295294
esp_event_loop_init(WiFiGenericClass::_eventCallback, NULL);
296295
esp_wifi_init(&cfg);

libraries/Wire/src/Wire.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ extern "C" {
2929

3030
#include "esp32-hal-i2c.h"
3131
#include "Wire.h"
32+
#include "Arduino.h"
3233

3334
TwoWire::TwoWire(uint8_t bus_num)
3435
:num(bus_num & 1)

platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ compiler.warning_flags.all=-Wall -Wextra
1313

1414
compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
1515
compiler.sdk.path={runtime.platform.path}/tools/sdk
16-
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
16+
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
1717

1818
compiler.c.cmd=xtensa-esp32-elf-gcc
1919
compiler.c.flags=-c {compiler.warning_flags} -Os -g3 -Wpointer-arith -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -ffunction-sections -fdata-sections -mlongcalls -nostdlib -MMD -std=gnu99 -fstrict-volatile-bitfields
@@ -26,7 +26,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
2626

2727
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
2828
compiler.c.elf.flags="-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -nostdlib -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
29-
compiler.c.elf.libs=-lgcc -lc -lm -lhal -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lbtdm_app -lbt -ldriver -lesp32 -lcrypto -lexpat -lfreertos -ljson -llog -llwip -lmbedtls -lnghttp -lnvs_flash -lspi_flash -ltcpip_adapter -lnewlib -lvfs
29+
compiler.c.elf.libs=-lbt -lbtdm_app -lc -lcoexist -lcore -ldriver -lesp32 -lexpat -lfreertos -lg -lhal -ljson -llog -llwip -lm -lmbedtls -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lrtc -lsmartconfig -lspi_flash -ltcpip_adapter -lvfs -lwpa -lwpa_supplicant -lxtensa-debug-module
3030

3131
compiler.as.cmd=xtensa-esp32-elf-as
3232

tools/sdk/bin/bootloader.bin

-48 Bytes
Binary file not shown.

tools/sdk/include/bt/bt.h

+9-10
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,36 @@ extern "C" {
2828
*
2929
* This function should be called only once, before any other BT functions are called.
3030
*/
31-
void bt_controller_init();
31+
void bt_controller_init(void);
3232

33-
/** @brief: vhci_host_callback
33+
/** @brief vhci_host_callback
3434
* used for vhci call host function to notify what host need to do
3535
*
3636
* notify_host_send_available: notify host can send packet to controller
3737
* notify_host_recv: notify host that controller has packet send to host
3838
*/
3939
typedef struct vhci_host_callback {
40-
4140
void (*notify_host_send_available)(void);
4241
int (*notify_host_recv)(uint8_t *data, uint16_t len);
4342
} vhci_host_callback_t;
4443

45-
/** @brief: API_vhci_host_check_send_available
44+
/** @brief API_vhci_host_check_send_available
4645
* used for check actively if the host can send packet to controller or not.
47-
* return true for ready to send, false means cannot send packet
46+
* @return true for ready to send, false means cannot send packet
4847
*/
4948
bool API_vhci_host_check_send_available(void);
5049

51-
/** @brief: API_vhci_host_send_packet
50+
/** @brief API_vhci_host_send_packet
5251
* host send packet to controller
53-
* param data is the packet point, the param len is the packet length
54-
* return void
52+
* @param data the packet point
53+
*,@param len the packet length
5554
*/
5655
void API_vhci_host_send_packet(uint8_t *data, uint16_t len);
5756

58-
/** @brief: API_vhci_host_register_callback
57+
/** @brief API_vhci_host_register_callback
5958
* register the vhci referece callback, the call back
6059
* struct defined by vhci_host_callback structure.
61-
* param is the vhci_host_callback type variable
60+
* @param callback vhci_host_callback type variable
6261
*/
6362
void API_vhci_host_register_callback(const vhci_host_callback_t *callback);
6463

tools/sdk/include/config/sdkconfig.h

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#define CONFIG_ULP_COPROC_RESERVE_MEM 0
2020
#define CONFIG_ESPTOOLPY_BAUD 921600
2121
#define CONFIG_TOOLPREFIX "xtensa-esp32-elf-"
22+
#define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
2223
#define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
2324
#define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
2425
#define CONFIG_ESP32_ENABLE_STACK_WIFI 1
@@ -28,8 +29,10 @@
2829
#define CONFIG_LOG_DEFAULT_LEVEL 1
2930
#define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1
3031
#define CONFIG_PYTHON "python"
32+
#define CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1 1
3133
#define CONFIG_ESPTOOLPY_COMPRESSED 1
3234
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
35+
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
3336
#define CONFIG_PARTITION_TABLE_SINGLE_APP 1
3437
#define CONFIG_WIFI_ENABLED 1
3538
#define CONFIG_ESPTOOLPY_FLASHFREQ_80M 1
@@ -43,6 +46,7 @@
4346
#define CONFIG_LWIP_SO_REUSE 1
4447
#define CONFIG_FREERTOS_CORETIMER_0 1
4548
#define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
49+
#define CONFIG_FREERTOS_ISR_STACKSIZE 1536
4650
#define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
4751
#define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
4852
#define CONFIG_ESPTOOLPY_BAUD_921600B 1

0 commit comments

Comments
 (0)