Skip to content

Commit 97d7d20

Browse files
me-no-devme-no-dev
authored
Merge pull request espressif#9 from espressif/release/v3.3
Switch to release/v3.3
2 parents db3e5e7 + 3f017e9 commit 97d7d20

File tree

6 files changed

+77
-15
lines changed

6 files changed

+77
-15
lines changed

‎.github/workflows/cron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
idf_branch: [release/v3.2]
23+
idf_branch: [release/v3.3]
2424
steps:
2525
- uses: actions/checkout@v1
2626
- name: Install dependencies

‎.github/workflows/push.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
- release/*
87
pull_request:
98

109
jobs:

‎sdkconfig

Lines changed: 72 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Automatically generated file; DO NOT EDIT.
33
# Espressif IoT Development Framework Configuration
44
#
5+
CONFIG_IDF_TARGET="esp32"
56
CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
67

78
#
@@ -11,6 +12,13 @@ CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
1112
CONFIG_PYTHON="python"
1213
CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
1314

15+
#
16+
# Application manager
17+
#
18+
CONFIG_APP_COMPILE_TIME_DATE=y
19+
CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=
20+
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=
21+
1422
#
1523
# Arduino Configuration
1624
#
@@ -68,6 +76,7 @@ CONFIG_BOOTLOADER_APP_TEST=
6876
CONFIG_BOOTLOADER_WDT_ENABLE=y
6977
CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
7078
CONFIG_BOOTLOADER_WDT_TIME_MS=9000
79+
CONFIG_APP_ROLLBACK_ENABLE=
7180

7281
#
7382
# Security features
@@ -177,9 +186,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
177186
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
178187
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2
179188
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0
180-
CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_HCI=
181-
CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_PCM=y
182-
CONFIG_BTDM_CONTROLLER_BR_EDR_SCO_DATA_PATH_EFF=1
189+
CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
183190
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
184191
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2
185192
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -212,6 +219,7 @@ CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
212219
CONFIG_BLUEDROID_PINNED_TO_CORE_1=
213220
CONFIG_BLUEDROID_PINNED_TO_CORE=0
214221
CONFIG_BTC_TASK_STACK_SIZE=8192
222+
CONFIG_BTU_TASK_STACK_SIZE=4096
215223
CONFIG_BLUEDROID_MEM_DEBUG=
216224
CONFIG_CLASSIC_BT_ENABLED=y
217225
CONFIG_A2DP_ENABLE=y
@@ -222,6 +230,7 @@ CONFIG_HFP_ENABLE=y
222230
CONFIG_HFP_CLIENT_ENABLE=y
223231
CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
224232
CONFIG_HFP_AUDIO_DATA_PATH_HCI=
233+
CONFIG_BT_SSP_ENABLED=y
225234
CONFIG_GATTS_ENABLE=y
226235
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
227236
CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
@@ -257,6 +266,16 @@ CONFIG_SPI_MASTER_IN_IRAM=
257266
CONFIG_SPI_MASTER_ISR_IN_IRAM=y
258267
CONFIG_SPI_SLAVE_IN_IRAM=
259268
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
269+
270+
#
271+
# eFuse Bit Manager
272+
#
273+
CONFIG_EFUSE_CUSTOM_TABLE=
274+
CONFIG_EFUSE_VIRTUAL=
275+
CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE=
276+
CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
277+
CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT=
278+
CONFIG_EFUSE_MAX_BLK_LEN=192
260279
CONFIG_C_IMPL=
261280
CONFIG_XTENSA_IMPL=y
262281

@@ -281,6 +300,7 @@ CONFIG_LSSH_WITH_LANDMARK=
281300
#
282301
# ESP32-specific
283302
#
303+
CONFIG_IDF_TARGET_ESP32=y
284304
CONFIG_ESP32_REV_MIN_0=y
285305
CONFIG_ESP32_REV_MIN_1=
286306
CONFIG_ESP32_REV_MIN_2=
@@ -332,10 +352,6 @@ CONFIG_MEMMAP_TRACEMEM=
332352
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
333353
CONFIG_ESP32_TRAX=
334354
CONFIG_TRACEMEM_RESERVE_DRAM=0x0
335-
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
336-
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
337-
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
338-
CONFIG_ESP32_ENABLE_COREDUMP=
339355
CONFIG_TWO_UNIVERSAL_MAC_ADDRESS=
340356
CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
341357
CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -426,9 +442,10 @@ CONFIG_ESP32_WIFI_NVS_ENABLED=y
426442
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
427443
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
428444
CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
445+
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
446+
CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
429447
CONFIG_ESP32_WIFI_IRAM_OPT=y
430448
CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
431-
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
432449

433450
#
434451
# PHY
@@ -470,15 +487,30 @@ CONFIG_EVENT_LOOP_PROFILING=
470487
# ESP HTTP client
471488
#
472489
CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
490+
CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
473491

474492
#
475493
# HTTP Server
476494
#
477495
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
478496
CONFIG_HTTPD_MAX_URI_LEN=512
497+
CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
479498
CONFIG_HTTPD_PURGE_BUF_LEN=32
480499
CONFIG_HTTPD_LOG_PURGE_DATA=
481500

501+
#
502+
# ESP HTTPS OTA
503+
#
504+
CONFIG_OTA_ALLOW_HTTP=
505+
506+
#
507+
# Core dump
508+
#
509+
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
510+
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
511+
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
512+
CONFIG_ESP32_ENABLE_COREDUMP=
513+
482514
#
483515
# Ethernet
484516
#
@@ -525,6 +557,7 @@ CONFIG_FATFS_API_ENCODING_UTF_8=
525557
CONFIG_FATFS_FS_LOCK=0
526558
CONFIG_FATFS_TIMEOUT_MS=10000
527559
CONFIG_FATFS_PER_FILE_CACHE=y
560+
CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
528561

529562
#
530563
# Modbus configuration
@@ -573,6 +606,8 @@ CONFIG_FREERTOS_USE_TRACE_FACILITY=
573606
CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
574607
CONFIG_FREERTOS_DEBUG_INTERNALS=
575608
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
609+
CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
610+
CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=
576611

577612
#
578613
# Heap memory debugging
@@ -606,11 +641,11 @@ CONFIG_LOG_COLORS=
606641
CONFIG_L2_TO_L3_COPY=
607642
CONFIG_LWIP_IRAM_OPTIMIZATION=
608643
CONFIG_LWIP_MAX_SOCKETS=10
644+
CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y
609645
CONFIG_USE_ONLY_LWIP_SELECT=
610646
CONFIG_LWIP_SO_REUSE=y
611647
CONFIG_LWIP_SO_REUSE_RXTOALL=y
612648
CONFIG_LWIP_SO_RCVBUF=y
613-
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
614649
CONFIG_LWIP_IP_FRAG=
615650
CONFIG_LWIP_IP_REASSEMBLY=
616651
CONFIG_LWIP_STATS=
@@ -659,6 +694,7 @@ CONFIG_TCPIP_TASK_AFFINITY_CPU0=y
659694
CONFIG_TCPIP_TASK_AFFINITY_CPU1=
660695
CONFIG_TCPIP_TASK_AFFINITY=0x0
661696
CONFIG_PPP_SUPPORT=y
697+
CONFIG_PPP_NOTIFY_PHASE_SUPPORT=
662698
CONFIG_PPP_PAP_SUPPORT=y
663699
CONFIG_PPP_CHAP_SUPPORT=y
664700
CONFIG_PPP_MSCHAP_SUPPORT=y
@@ -676,6 +712,12 @@ CONFIG_LWIP_BROADCAST_PING=
676712
#
677713
CONFIG_LWIP_MAX_RAW_PCBS=16
678714

715+
#
716+
# SNTP
717+
#
718+
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
719+
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
720+
679721
#
680722
# mbedTLS
681723
#
@@ -686,6 +728,8 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
686728
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
687729
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
688730
CONFIG_MBEDTLS_DEBUG=
731+
CONFIG_MBEDTLS_ECP_RESTARTABLE=
732+
CONFIG_MBEDTLS_CMAC_C=
689733
CONFIG_MBEDTLS_HARDWARE_AES=y
690734
CONFIG_MBEDTLS_HARDWARE_MPI=
691735
CONFIG_MBEDTLS_HARDWARE_SHA=
@@ -795,6 +839,11 @@ CONFIG_OPENSSL_ASSERT_EXIT=
795839
CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
796840
CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
797841
CONFIG_PTHREAD_STACK_MIN=768
842+
CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
843+
CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0=
844+
CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=
845+
CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
846+
CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
798847

799848
#
800849
# SPI Flash driver
@@ -844,6 +893,15 @@ CONFIG_SPIFFS_TEST_VISUALISATION=
844893
CONFIG_IP_LOST_TIMER_INTERVAL=120
845894
CONFIG_TCPIP_LWIP=y
846895

896+
#
897+
# Unity unit testing library
898+
#
899+
CONFIG_UNITY_ENABLE_FLOAT=y
900+
CONFIG_UNITY_ENABLE_DOUBLE=y
901+
CONFIG_UNITY_ENABLE_COLOR=
902+
CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
903+
CONFIG_UNITY_ENABLE_FIXTURE=
904+
847905
#
848906
# Virtual file system
849907
#
@@ -856,3 +914,8 @@ CONFIG_SUPPORT_TERMIOS=y
856914
CONFIG_WL_SECTOR_SIZE_512=
857915
CONFIG_WL_SECTOR_SIZE_4096=y
858916
CONFIG_WL_SECTOR_SIZE=4096
917+
918+
#
919+
# Wi-Fi Provisioning Manager
920+
#
921+
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16

‎tools/build-bootloaders.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ $SED -i '/CONFIG_ESPTOOLPY_FLASHFREQ_40M/c\CONFIG_ESPTOOLPY_FLASHFREQ_40M=' ./sd
1414
$SED -i '/CONFIG_SPIRAM_SPEED_40M/c\CONFIG_SPIRAM_SPEED_40M=' ./sdkconfig
1515
echo "CONFIG_SPIRAM_SPEED_80M=y" >> ./sdkconfig
1616
echo "CONFIG_BOOTLOADER_SPI_WP_PIN=7" >> ./sdkconfig
17-
echo "CONFIG_SPIRAM_OCCUPY_VSPI_HOST=" >> ./sdkconfig
1817
echo "CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y" >> ./sdkconfig
18+
echo "CONFIG_SPIRAM_OCCUPY_VSPI_HOST=" >> ./sdkconfig
19+
echo "CONFIG_SPIRAM_OCCUPY_NO_HOST=" >> ./sdkconfig
1920

2021
$SED -i '/CONFIG_FLASHMODE_QIO/c\CONFIG_FLASHMODE_QIO=y' ./sdkconfig
2122
$SED -i '/CONFIG_FLASHMODE_QOUT/c\CONFIG_FLASHMODE_QOUT=' ./sdkconfig

‎tools/config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-8
99
IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz"
1010

1111
if [ -z $IDF_BRANCH ]; then
12-
IDF_BRANCH="release/v3.2"
12+
IDF_BRANCH="release/v3.3"
1313
fi
1414

1515
# Owner of the target ESP32 Arduino repository

‎tools/prepare-libs.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ cp $IDF_COMPS/partition_table/gen_esp32part.py $AR_GEN_PART_PY
143143
mkdir -p $AR_SDK/ld && find $IDF_COMPS/esp32/ld -name '*.ld' -exec cp -f {} $AR_SDK/ld/ \;
144144

145145
# ld script
146-
cp -f build/esp32/esp32_out.ld $AR_SDK/ld/
147-
#cp -f build/esp32/esp32.common.ld $AR_SDK/ld/
146+
cp -f build/esp32/*.ld $AR_SDK/ld/
148147

149148
# Add IDF versions to sdkconfig
150149
echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> $AR_SDK/include/config/sdkconfig.h

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy