djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Hosted Weblate 2022-01-17 22:10:09 +01:00
parent d0a1a7d380 3453ced296
commit 5a4abff7f5
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
View File

@ -86,10 +86,10 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
# end of MAC Config
CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0 is not set
CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1=y
# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
CONFIG_ESP_MAIN_TASK_AFFINITY=0x1
#
# Wi-Fi
#

1
ports/espressif/esp-idf-config/sdkconfig.defaults
View File

@ -246,6 +246,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
CONFIG_ESP_PHY_MAX_TX_POWER=20
CONFIG_ESP_PHY_ENABLE_USB=y
# end of PHY
# CONFIG_PM_ENABLE is not set

4
ports/espressif/tools/update_sdkconfig.py
View File

@ -9,6 +9,7 @@ OPT_SETTINGS = [
"CONFIG_ESP_CONSOLE_",
"CONFIG_CONSOLE_UART_",
"CONFIG_ESP_SYSTEM_PANIC_",
"CONFIG_ESP32S2_PANIC_",
"COMPILER_OPTIMIZATION_",
"CONFIG_ESP32S3_DEBUG_OCDAWARE",
"CONFIG_FREERTOS_ASSERT_",
@ -142,8 +143,7 @@ def update(debug, board, update_all):
current_group = None
else:
current_group = line[2:]
if (not update_all and line not in defaults) or (
elif (not update_all and line not in defaults) or (
update_all and matches_group(line, BOARD_SETTINGS)
):
last_board_group = add_group(board_settings, last_board_group, current_group)