Skip to content

Commit 5a4abff

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents d0a1a7d + 3453ced commit 5a4abff

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
8686
# end of MAC Config
8787

8888
CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
89-
CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
90-
# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
89+
# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0 is not set
90+
CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1=y
9191
# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
92-
CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
92+
CONFIG_ESP_MAIN_TASK_AFFINITY=0x1
9393
#
9494
# Wi-Fi
9595
#

ports/espressif/esp-idf-config/sdkconfig.defaults

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
246246
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
247247
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
248248
CONFIG_ESP_PHY_MAX_TX_POWER=20
249+
CONFIG_ESP_PHY_ENABLE_USB=y
249250
# end of PHY
250251

251252
# CONFIG_PM_ENABLE is not set

ports/espressif/tools/update_sdkconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"CONFIG_ESP_CONSOLE_",
1010
"CONFIG_CONSOLE_UART_",
1111
"CONFIG_ESP_SYSTEM_PANIC_",
12+
"CONFIG_ESP32S2_PANIC_",
1213
"COMPILER_OPTIMIZATION_",
1314
"CONFIG_ESP32S3_DEBUG_OCDAWARE",
1415
"CONFIG_FREERTOS_ASSERT_",
@@ -142,8 +143,7 @@ def update(debug, board, update_all):
142143
current_group = None
143144
else:
144145
current_group = line[2:]
145-
146-
if (not update_all and line not in defaults) or (
146+
elif (not update_all and line not in defaults) or (
147147
update_all and matches_group(line, BOARD_SETTINGS)
148148
):
149149
last_board_group = add_group(board_settings, last_board_group, current_group)

0 commit comments

Comments
 (0)