Skip to content

Commit d27d297

Browse files
me-no-devme-no-dev
committed
Update IDF to c4e65d6
1 parent e2bd93c commit d27d297

Some content is hidden

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

95 files changed

+2129
-910
lines changed

‎cores/esp32/esp32-hal-bt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bool btStop(){
5252
return true;
5353
}
5454
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){
55-
if (esp_bt_controller_disable(ESP_BT_MODE_BTDM)) {
55+
if (esp_bt_controller_disable()) {
5656
log_e("BT Disable failed");
5757
return false;
5858
}

‎package/package_esp32_index.template.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -33,68 +33,68 @@
3333
{
3434
"packager": "esp32",
3535
"name": "xtensa-esp32-elf-gcc",
36-
"version": "1.22.0-61-gab8375a-5.2.0"
36+
"version": "1.22.0-73-ge28a011-5.2.0"
3737
},
3838
{
3939
"packager": "esp32",
4040
"name": "esptool",
41-
"version": "a420774"
41+
"version": "4dab24e"
4242
}
4343
]
4444
}
4545
],
4646
"tools": [
4747
{
4848
"name": "xtensa-esp32-elf-gcc",
49-
"version": "1.22.0-61-gab8375a-5.2.0",
49+
"version": "1.22.0-73-ge28a011-5.2.0",
5050
"systems": [
5151
{
5252
"host": "i686-mingw32",
53-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0-2.zip",
54-
"archiveFileName": "xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0-2.zip",
55-
"checksum": "SHA-256:c00dbdab8e8acc273d4aa319a74f7bb1d9496c843159823201d685359174168f",
56-
"size": "76346909"
53+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-73-ge28a011-5.2.0.zip",
54+
"archiveFileName": "xtensa-esp32-elf-win32-1.22.0-73-ge28a011-5.2.0.zip",
55+
"checksum": "SHA-256:97566173909b20567b99ec1b0f5746e341d65961f82fdb760a00937193d03d29",
56+
"size": "78710389"
5757
},
5858
{
5959
"host": "x86_64-apple-darwin",
60-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-61-gab8375a-5.2.0.tar.gz",
61-
"archiveFileName": "xtensa-esp32-elf-osx-1.22.0-61-gab8375a-5.2.0.tar.gz",
62-
"checksum": "SHA-256:89a9a6084ec032ddcd4bdae37b428e533ed5fd0c0ab6b66ddf703e4b3f83d6e4",
63-
"size": "40481812"
60+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-73-ge28a011-5.2.0.tar.gz",
61+
"archiveFileName": "xtensa-esp32-elf-osx-1.22.0-73-ge28a011-5.2.0.tar.gz",
62+
"checksum": "SHA-256:5eb503462eb7f6a41c0d6c0538b512ab35a0f76ce96514a4e7a6074f6b3ad0d0",
63+
"size": "39903635"
6464
},
6565
{
6666
"host": "x86_64-pc-linux-gnu",
67-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz",
68-
"archiveFileName": "xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz",
69-
"checksum": "SHA-256:b74333fd7f622f035fee7c4e0ca57c3e2ccb2515de5d901f33e87e79cdf0d4f9",
70-
"size": "37674568"
67+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-73-ge28a011-5.2.0.tar.gz",
68+
"archiveFileName": "xtensa-esp32-elf-linux64-1.22.0-73-ge28a011-5.2.0.tar.gz",
69+
"checksum": "SHA-256:3763dbed9fd43901c07757622e9c46d29e89eda812b83627df5cb9d019cae0e5",
70+
"size": "37656793"
7171
},
7272
{
7373
"host": "i686-pc-linux-gnu",
74-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz",
75-
"archiveFileName": "xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz",
76-
"checksum": "SHA-256:dbb342b7c377a7c3a1fcccc60fa1193332d0c37e6a90c5075d3471c13c9e94ad",
77-
"size": "41032647"
74+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-73-ge28a011-5.2.0.tar.gz",
75+
"archiveFileName": "xtensa-esp32-elf-linux32-1.22.0-73-ge28a011-5.2.0.tar.gz",
76+
"checksum": "SHA-256:1d8b1dd16223dcb5181af7d713582cf7f22db36c0865d9fcff7b51cfac460641",
77+
"size": "38991614"
7878
}
7979
]
8080
},
8181
{
8282
"name": "esptool",
83-
"version": "a420774",
83+
"version": "4dab24e",
8484
"systems": [
8585
{
8686
"host": "i686-mingw32",
87-
"url": "https://dl.espressif.com/dl/esptool-a420774-windows.zip",
88-
"archiveFileName": "esptool-a420774-windows.zip",
89-
"checksum": "SHA-256:7778545baa30a85a37a956e47e42a236fa67227f21b160b2164ef83a5e20a41f",
90-
"size": "3394137"
87+
"url": "https://dl.espressif.com/dl/esptool-4dab24e-windows.zip",
88+
"archiveFileName": "esptool-4dab24e-windows.zip",
89+
"checksum": "SHA-256:604014edbd79616470ecda20d623bac3a8d916b1147d37f7a66a83959eff066c",
90+
"size": "3462819"
9191
},
9292
{
9393
"host": "x86_64-apple-darwin",
94-
"url": "https://dl.espressif.com/dl/esptool-a420774-macos.tar.gz",
95-
"archiveFileName": "esptool-a420774-macos.tar.gz",
96-
"checksum": "SHA-256:1a6237b695fe299357bfd78a9727564464a00e020bc7c7a4cf6fad02250eb2a2",
97-
"size": "3808980"
94+
"url": "https://dl.espressif.com/dl/esptool-4dab24e-macos.tar.gz",
95+
"archiveFileName": "esptool-4dab24e-macos.tar.gz",
96+
"checksum": "SHA-256:92fe2f0505ed93051681bd4d5d766664eacfa32745976dda695c728b529dcc8f",
97+
"size": "3869525"
9898
}
9999
]
100100
}

‎platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
3434

3535
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
3636
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
37-
compiler.c.elf.libs=-lgcc -lstdc++ -lapp_trace -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lconsole -lcore -lcxx -ldriver -lesp32 -lesp_adc_cal -lethernet -lexpat -lfatfs -lfreertos -lhal -lheap -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lpthread -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -lspiffs -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module
37+
compiler.c.elf.libs=-lgcc -lstdc++ -lapp_trace -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lconsole -lcore -lcxx -ldriver -lesp32 -lesp_adc_cal -lespnow -lethernet -lexpat -lfatfs -lfreertos -lhal -lheap -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lpthread -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -lspiffs -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module
3838

3939
compiler.as.cmd=xtensa-esp32-elf-as
4040

‎tools/gen_esp32part.exe

0 Bytes
Binary file not shown.

‎tools/gen_esp32part.py

+12-10
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@ def __init__(self):
5151
@classmethod
5252
def from_csv(cls, csv_contents):
5353
res = PartitionTable()
54-
lines = csv_contents.split("\n")
54+
lines = csv_contents.splitlines()
55+
56+
def expand_vars(f):
57+
f = os.path.expandvars(f)
58+
m = re.match(r'(?<!\\)\$([A-Za-z_][A-Za-z0-9_]*)', f)
59+
if m:
60+
raise InputError("unknown variable '%s'" % m.group(1))
61+
return f
62+
5563
for line_no in range(len(lines)):
56-
line = lines[line_no].strip()
64+
line = expand_vars(lines[line_no]).strip()
5765
if line.startswith("#") or len(line) == 0:
5866
continue
5967
try:
@@ -134,7 +142,7 @@ class PartitionDefinition(object):
134142
"app" : APP_TYPE,
135143
"data" : DATA_TYPE,
136144
}
137-
145+
138146
# Keep this map in sync with esp_partition_subtype_t enum in esp_partition.h
139147
SUBTYPES = {
140148
APP_TYPE : {
@@ -181,13 +189,7 @@ def __init__(self):
181189
def from_csv(cls, line):
182190
""" Parse a line from the CSV """
183191
line_w_defaults = line + ",,,," # lazy way to support default fields
184-
def expand_vars(f):
185-
f = os.path.expandvars(f)
186-
m = re.match(r'(?<!\\)\$([A-Za-z_][A-Za-z0-9_]*)', f)
187-
if m:
188-
raise InputError("unknown variable '%s'" % m.group(1))
189-
return f
190-
fields = [ expand_vars(f.strip()) for f in line_w_defaults.split(",") ]
192+
fields = [ f.strip() for f in line_w_defaults.split(",") ]
191193

192194
res = PartitionDefinition()
193195
res.name = fields[0]

‎tools/platformio-build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
join(FRAMEWORK_DIR, "tools", "sdk", "ld")
9595
],
9696
LIBS=[
97-
"gcc", "stdc++", "app_trace", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "console", "core", "cxx", "driver", "esp32", "esp_adc_cal", "ethernet", "expat", "fatfs", "freertos", "hal", "heap", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "pthread", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "spiffs", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
97+
"gcc", "stdc++", "app_trace", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "console", "core", "cxx", "driver", "esp32", "esp_adc_cal", "espnow", "ethernet", "expat", "fatfs", "freertos", "hal", "heap", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "pthread", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "spiffs", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
9898
],
9999

100100
UPLOADERFLAGS=[

‎tools/sdk/bin/bootloader.bin

-16 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qio.bin

-16 Bytes
Binary file not shown.

‎tools/sdk/include/bluedroid/bt_target.h

+6
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,12 @@
665665
#define L2CAP_CLIENT_INCLUDED FALSE
666666
#endif
667667

668+
/* The maximum number of simultaneous applications that can register with LE L2CAP. */
669+
#ifndef BLE_MAX_L2CAP_CLIENTS
670+
#define BLE_MAX_L2CAP_CLIENTS 15
671+
#endif
672+
673+
668674
/* The maximum number of simultaneous links that L2CAP can support. Up to 7*/
669675
#ifndef MAX_ACL_CONNECTIONS
670676
#define MAX_L2CAP_LINKS 5

‎tools/sdk/include/bluedroid/bta_api.h

+12
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,12 @@ typedef tBTM_SET_PKT_DATA_LENGTH_CBACK tBTA_SET_PKT_DATA_LENGTH_CBACK;
406406

407407
typedef tBTM_SET_LOCAL_PRIVACY_CBACK tBTA_SET_LOCAL_PRIVACY_CBACK;
408408

409+
typedef tBTM_CMPL_CB tBTA_CMPL_CB;
410+
411+
typedef tBTM_TX_POWER_RESULTS tBTA_TX_POWER_RESULTS;
412+
413+
typedef tBTM_RSSI_RESULTS tBTA_RSSI_RESULTS;
414+
409415
/* advertising channel map */
410416
#define BTA_BLE_ADV_CHNL_37 BTM_BLE_ADV_CHNL_37
411417
#define BTA_BLE_ADV_CHNL_38 BTM_BLE_ADV_CHNL_38
@@ -1404,6 +1410,12 @@ extern void BTA_DisableTestMode(void);
14041410
*******************************************************************************/
14051411
extern void BTA_DmSetDeviceName(char *p_name);
14061412

1413+
extern void BTA_DmUpdateWhiteList(BOOLEAN add_remove, BD_ADDR remote_addr);
1414+
1415+
extern void BTA_DmBleReadAdvTxPower(tBTA_CMPL_CB *cmpl_cb);
1416+
1417+
extern void BTA_DmBleReadRSSI(BD_ADDR remote_addr, tBTA_CMPL_CB *cmpl_cb);
1418+
14071419
/*******************************************************************************
14081420
**
14091421
** Function BTA_DmSetVisibility

0 commit comments

Comments
 (0)