Skip to content

Commit 12cdbc3

Browse files
me-no-devme-no-dev
committed
Update configs and ensure we are in the proper folder
1 parent 533482e commit 12cdbc3

File tree

4 files changed

+80
-24
lines changed

4 files changed

+80
-24
lines changed

Diff for: ‎sdkconfig.esp32

+20-9
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
517517
# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
518518
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
519519
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
520+
# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
520521
CONFIG_SPIRAM_CACHE_WORKAROUND=y
521522

522523
#
@@ -629,7 +630,6 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
629630
CONFIG_ETH_ENABLED=y
630631
CONFIG_ETH_USE_ESP32_EMAC=y
631632
CONFIG_ETH_PHY_INTERFACE_RMII=y
632-
# CONFIG_ETH_PHY_INTERFACE_MII is not set
633633
CONFIG_ETH_RMII_CLK_INPUT=y
634634
# CONFIG_ETH_RMII_CLK_OUTPUT is not set
635635
CONFIG_ETH_RMII_CLK_IN_GPIO=0
@@ -706,9 +706,18 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
706706
#
707707
# Sleep Config
708708
#
709+
CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
709710
# end of Sleep Config
710711
# end of Hardware Settings
711712

713+
#
714+
# IPC (Inter-Processor Call)
715+
#
716+
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
717+
CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
718+
CONFIG_ESP_IPC_ISR_ENABLE=y
719+
# end of IPC (Inter-Processor Call)
720+
712721
#
713722
# LCD and Touch Panel
714723
#
@@ -776,8 +785,6 @@ CONFIG_ESP_TASK_WDT_PANIC=y
776785
CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
777786
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
778787
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
779-
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
780-
CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
781788
# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
782789
# end of ESP System Settings
783790

@@ -888,6 +895,10 @@ CONFIG_FMB_SERIAL_BUF_SIZE=256
888895
CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
889896
CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
890897
CONFIG_FMB_PORT_TASK_PRIO=10
898+
# CONFIG_FMB_PORT_TASK_AFFINITY_NO_AFFINITY is not set
899+
CONFIG_FMB_PORT_TASK_AFFINITY_CPU0=y
900+
# CONFIG_FMB_PORT_TASK_AFFINITY_CPU1 is not set
901+
CONFIG_FMB_PORT_TASK_AFFINITY=0x0
891902
# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
892903
CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
893904
CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
@@ -904,8 +915,10 @@ CONFIG_FMB_TIMER_INDEX=0
904915
#
905916
# CONFIG_FREERTOS_UNICORE is not set
906917
CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
918+
CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y
907919
CONFIG_FREERTOS_CORETIMER_0=y
908920
# CONFIG_FREERTOS_CORETIMER_1 is not set
921+
CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
909922
CONFIG_FREERTOS_HZ=1000
910923
# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
911924
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
@@ -1204,9 +1217,12 @@ CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
12041217
CONFIG_MBEDTLS_SSL_PROTO_TLS1=y
12051218
CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
12061219
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
1220+
# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
12071221
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
12081222
CONFIG_MBEDTLS_SSL_ALPN=y
12091223
CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
1224+
CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y
1225+
CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y
12101226
CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
12111227

12121228
#
@@ -1416,11 +1432,6 @@ CONFIG_WS_BUFFER_SIZE=1024
14161432
# end of Websocket
14171433
# end of TCP Transport
14181434

1419-
#
1420-
# TinyUSB
1421-
#
1422-
# end of TinyUSB
1423-
14241435
#
14251436
# Unity unit testing library
14261437
#
@@ -1699,6 +1710,7 @@ CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
16991710
# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
17001711
CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
17011712
CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
1713+
CONFIG_IPC_TASK_STACK_SIZE=1024
17021714
CONFIG_REDUCE_PHY_TX_POWER=y
17031715
# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
17041716
CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y
@@ -1721,7 +1733,6 @@ CONFIG_TASK_WDT_PANIC=y
17211733
CONFIG_TASK_WDT_TIMEOUT_S=5
17221734
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
17231735
# CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
1724-
CONFIG_IPC_TASK_STACK_SIZE=1024
17251736
CONFIG_TIMER_TASK_STACK_SIZE=4096
17261737
CONFIG_SW_COEXIST_ENABLE=y
17271738
# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set

Diff for: ‎sdkconfig.esp32c3

+16-9
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,12 @@ CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
715715
# end of Sleep Config
716716
# end of Hardware Settings
717717

718+
#
719+
# IPC (Inter-Processor Call)
720+
#
721+
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
722+
# end of IPC (Inter-Processor Call)
723+
718724
#
719725
# LCD and Touch Panel
720726
#
@@ -756,6 +762,7 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
756762
CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
757763
CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y
758764
CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
765+
# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set
759766

760767
#
761768
# Memory protection
@@ -784,7 +791,6 @@ CONFIG_ESP_TASK_WDT=y
784791
# CONFIG_ESP_TASK_WDT_PANIC is not set
785792
CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
786793
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
787-
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
788794
# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
789795
# end of ESP System Settings
790796

@@ -893,6 +899,7 @@ CONFIG_FMB_SERIAL_BUF_SIZE=256
893899
CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
894900
CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
895901
CONFIG_FMB_PORT_TASK_PRIO=10
902+
CONFIG_FMB_PORT_TASK_AFFINITY=0x7FFFFFFF
896903
CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT=y
897904
CONFIG_FMB_CONTROLLER_SLAVE_ID=0x00112233
898905
CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
@@ -910,8 +917,10 @@ CONFIG_FMB_TIMER_INDEX=0
910917
#
911918
CONFIG_FREERTOS_UNICORE=y
912919
CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
913-
CONFIG_FREERTOS_CORETIMER_0=y
914-
# CONFIG_FREERTOS_CORETIMER_1 is not set
920+
CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y
921+
CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y
922+
# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set
923+
CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y
915924
CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y
916925
CONFIG_FREERTOS_HZ=1000
917926
CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
@@ -1201,9 +1210,12 @@ CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
12011210
CONFIG_MBEDTLS_SSL_PROTO_TLS1=y
12021211
CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
12031212
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
1213+
# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
12041214
# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
12051215
CONFIG_MBEDTLS_SSL_ALPN=y
12061216
CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
1217+
CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y
1218+
CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y
12071219
CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
12081220

12091221
#
@@ -1412,11 +1424,6 @@ CONFIG_WS_BUFFER_SIZE=1024
14121424
# end of Websocket
14131425
# end of TCP Transport
14141426

1415-
#
1416-
# TinyUSB
1417-
#
1418-
# end of TinyUSB
1419-
14201427
#
14211428
# Unity unit testing library
14221429
#
@@ -1725,6 +1732,7 @@ CONFIG_ADC2_DISABLE_DAC=y
17251732
CONFIG_POST_EVENTS_FROM_ISR=y
17261733
CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
17271734
CONFIG_ESP_SYSTEM_PD_FLASH=y
1735+
CONFIG_IPC_TASK_STACK_SIZE=1024
17281736
CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y
17291737
# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
17301738
CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y
@@ -1748,7 +1756,6 @@ CONFIG_TASK_WDT=y
17481756
# CONFIG_TASK_WDT_PANIC is not set
17491757
CONFIG_TASK_WDT_TIMEOUT_S=5
17501758
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
1751-
CONFIG_IPC_TASK_STACK_SIZE=1024
17521759
CONFIG_TIMER_TASK_STACK_SIZE=3584
17531760
CONFIG_SW_COEXIST_ENABLE=y
17541761
# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set

Diff for: ‎sdkconfig.esp32s2

+42-5
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,16 @@ CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES=2
544544
#
545545
# Sleep Config
546546
#
547+
CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
547548
# end of Sleep Config
548549
# end of Hardware Settings
549550

551+
#
552+
# IPC (Inter-Processor Call)
553+
#
554+
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
555+
# end of IPC (Inter-Processor Call)
556+
550557
#
551558
# LCD and Touch Panel
552559
#
@@ -616,7 +623,6 @@ CONFIG_ESP_TASK_WDT=y
616623
CONFIG_ESP_TASK_WDT_PANIC=y
617624
CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
618625
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
619-
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
620626
# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
621627
# end of ESP System Settings
622628

@@ -726,6 +732,7 @@ CONFIG_FMB_SERIAL_BUF_SIZE=256
726732
CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
727733
CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
728734
CONFIG_FMB_PORT_TASK_PRIO=10
735+
CONFIG_FMB_PORT_TASK_AFFINITY=0x7FFFFFFF
729736
# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
730737
CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
731738
CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
@@ -742,8 +749,10 @@ CONFIG_FMB_TIMER_INDEX=0
742749
#
743750
CONFIG_FREERTOS_UNICORE=y
744751
CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
752+
CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y
745753
CONFIG_FREERTOS_CORETIMER_0=y
746754
# CONFIG_FREERTOS_CORETIMER_1 is not set
755+
CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
747756
CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y
748757
CONFIG_FREERTOS_HZ=1000
749758
# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
@@ -1044,9 +1053,12 @@ CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
10441053
CONFIG_MBEDTLS_SSL_PROTO_TLS1=y
10451054
CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
10461055
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
1056+
# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
10471057
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
10481058
CONFIG_MBEDTLS_SSL_ALPN=y
10491059
CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
1060+
CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y
1061+
CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y
10501062
CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
10511063

10521064
#
@@ -1252,10 +1264,10 @@ CONFIG_WS_BUFFER_SIZE=1024
12521264
# end of TCP Transport
12531265

12541266
#
1255-
# TinyUSB
1267+
# TinyUSB Stack
12561268
#
1257-
# CONFIG_USB_ENABLED is not set
1258-
# end of TinyUSB
1269+
# CONFIG_TINYUSB is not set
1270+
# end of TinyUSB Stack
12591271

12601272
#
12611273
# Unity unit testing library
@@ -1269,6 +1281,12 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
12691281
# CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
12701282
# end of Unity unit testing library
12711283

1284+
#
1285+
# USB-OTG
1286+
#
1287+
CONFIG_USB_OTG_SUPPORTED=y
1288+
# end of USB-OTG
1289+
12721290
#
12731291
# Virtual file system
12741292
#
@@ -1430,6 +1448,15 @@ CONFIG_MONITOR_BAUD_115200B=y
14301448
# CONFIG_MONITOR_BAUD_OTHER is not set
14311449
CONFIG_MONITOR_BAUD_OTHER_VAL=115200
14321450
CONFIG_MONITOR_BAUD=115200
1451+
CONFIG_USB_CDC_ENABLED=y
1452+
CONFIG_USB_DESC_CDC_STRING="Espressif CDC Device"
1453+
CONFIG_USB_CDC_RX_BUFSIZE=64
1454+
CONFIG_USB_CDC_TX_BUFSIZE=64
1455+
CONFIG_USB_MSC_ENABLED=y
1456+
CONFIG_USB_DESC_MSC_STRING="Espressif MSC Device"
1457+
CONFIG_USB_MSC_BUFSIZE=512
1458+
CONFIG_USB_DESC_HID_STRING="Espressif HID Device"
1459+
CONFIG_USB_DEBUG_LEVEL=0
14331460
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
14341461
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
14351462
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
@@ -1456,6 +1483,7 @@ CONFIG_ADC2_DISABLE_DAC=y
14561483
# CONFIG_EVENT_LOOP_PROFILING is not set
14571484
CONFIG_POST_EVENTS_FROM_ISR=y
14581485
CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
1486+
CONFIG_IPC_TASK_STACK_SIZE=1024
14591487
# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
14601488
CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y
14611489
# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
@@ -1478,7 +1506,6 @@ CONFIG_TASK_WDT=y
14781506
CONFIG_TASK_WDT_PANIC=y
14791507
CONFIG_TASK_WDT_TIMEOUT_S=5
14801508
# CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
1481-
CONFIG_IPC_TASK_STACK_SIZE=1024
14821509
CONFIG_TIMER_TASK_STACK_SIZE=4096
14831510
# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
14841511
# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
@@ -1538,6 +1565,16 @@ CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
15381565
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
15391566
# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
15401567
# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
1568+
# CONFIG_USB_ENABLED is not set
1569+
CONFIG_USB_DEBUG_LEVEL=0
1570+
CONFIG_USB_DESC_CDC_STRING="Espressif CDC Device"
1571+
CONFIG_USB_DESC_MSC_STRING="Espressif MSC Device"
1572+
CONFIG_USB_DESC_HID_STRING="Espressif HID Device"
1573+
CONFIG_USB_MSC_ENABLED=y
1574+
CONFIG_USB_MSC_BUFSIZE=512
1575+
CONFIG_USB_CDC_ENABLED=y
1576+
CONFIG_USB_CDC_RX_BUFSIZE=64
1577+
CONFIG_USB_CDC_TX_BUFSIZE=64
15411578
CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
15421579
CONFIG_SUPPORT_TERMIOS=y
15431580
CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1

Diff for: ‎tools/install-esp-idf.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ if [ -x $idf_was_installed ]; then
9797
echo "ESP-IDF is already installed at: $IDF_PATH"
9898
else
9999
git -C $IDF_PATH submodule update --init --recursive
100-
cd $IDF_PATH && python -m pip install -r requirements.txt && cd "$AR_ROOT"
100+
cd $IDF_PATH && python -m pip install -r requirements.txt
101101
fi
102+
cd "$AR_ROOT"
102103
$IDF_PATH/install.sh
103104
source $IDF_PATH/export.sh

0 commit comments

Comments
 (0)