Skip to content

Commit 56ab32d

Browse files
Jason2866Staars
Jason2866
and
Staars
authored
NimBLE updates / S3 Display shift fix (espressif#68)
* Update push.yml * Update idf_component.yml * staars optimizations * remove BT Classic * rm not needed Arduino libs for Tasmota * Update defconfig.common * add "espressif/libsodium^1.0.20" * Update BLE in defconfig.esp32c2 * Update BLE in defconfig.esp32c6 * Update BLE in defconfig.esp32 * Update BLE in defconfig.esp32c3 * Update BLE in defconfig.esp32h2 * Update BLE in defconfig.esp32s3 * CONFIG_LITTLEFS_MAX_PARTITIONS=2 Try to fix SD-Card not working * rm libsodium only needed from Homekit * rm Arduino BLE Tasmota uses h2zero BLE * rm BLE lib * use actual setting name `CONFIG_BT_NIMBLE_NVS_PERSIST` * use actual config declaration * Update defconfig.esp32c3 * Update defconfig.esp32c6 * Update defconfig.esp32h2 * Update defconfig.esp32s3 * rm SimpleBLE * rm SimpleBLE * rm WiFiProv * rm WiFiProv * CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y * rm ESP32 examples * rm ESP32 examples * no clone of Arduino Libs... since Tasmota does still include everything needed in the framework * Update install-esp-idf.sh * Update update-components.sh * fix typo * # CONFIG_ETH_USE_SPI_ETHERNET is not set * Enable Eternet * revert Ethernet changes * CONFIG_ETH_USE_SPI_ETHERNET is not set * use ESP-LITTLEFS v1.7.0 * # CONFIG_MBEDTLS_HARDWARE_MPI is not set only needed for libsodium * Update defconfig.120m * Update defconfig.common * Update defconfig.esp32s3 * LittleFS v1.5.5 use same version as in Tasmota Core 2.0.11 Try to fix loosing FS content when switching between Core 2.0.11 and Core 3.0.0 * Update defconfig.120m * Update defconfig.esp32s3 --------- Co-authored-by: Christian Baars <[email protected]>
1 parent 1f7b507 commit 56ab32d

14 files changed

+175
-41
lines changed

Diff for: ‎.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Arduino IDF 5.1 with C2
1+
name: Arduino IDF 5.1 without DSP and MP3
22

33
on:
44
workflow_dispatch: # Manually start a workflow

Diff for: ‎configs/defconfig.120m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
2-
CONFIG_SPIRAM_SPEED_120M=y
2+
CONFIG_SPIRAM_SPEED_120M=y

Diff for: ‎configs/defconfig.common

+45-7
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
88
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
99
CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS=y
1010
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
11+
CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
1112
CONFIG_BT_ENABLED=y
1213
CONFIG_BT_STACK_NO_LOG=y
1314
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
1415
# CONFIG_BLE_MESH is not set
16+
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
1517
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
1618
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
17-
CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
18-
CONFIG_COMPILER_WARN_WRITE_STRINGS=y
19+
CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
20+
# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
1921
# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
2022
# CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR is not set
2123
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
@@ -31,11 +33,11 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
3133
CONFIG_ESP_TASK_WDT_PANIC=y
3234
CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
3335
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
34-
CONFIG_ESP_WIFI_FTM_ENABLE=y
36+
CONFIG_ESP_WIFI_FTM_ENABLE=n
3537
CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
3638
CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
3739
CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
38-
CONFIG_ESP_WIFI_CSI_ENABLED=y
40+
CONFIG_ESP_WIFI_CSI_ENABLED=n
3941
CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
4042
# CONFIG_ESP_WIFI_IRAM_OPT is not set
4143
# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
@@ -84,9 +86,35 @@ CONFIG_LWIP_TCP_RECVMBOX_SIZE=16
8486
CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
8587
CONFIG_NEWLIB_NANO_FORMAT=y
8688

87-
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
88-
CONFIG_MBEDTLS_PSK_MODES=y
89-
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
89+
# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
90+
# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
91+
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
92+
93+
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
94+
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=n
95+
CONFIG_MBEDTLS_PSK_MODES=n
96+
97+
# CONFIG_MBEDTLS_HARDWARE_AES is not set
98+
# CONFIG_MBEDTLS_HARDWARE_MPI is not set
99+
# CONFIG_MBEDTLS_HARDWARE_SHA is not set
100+
# CONFIG_MBEDTLS_HAVE_TIME is not set
101+
102+
# CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS is not set
103+
# CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS is not set
104+
# CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED is not set
105+
# CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED is not set
106+
# CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED is not set
107+
# CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED is not set
108+
# CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED is not set
109+
# CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED is not set
110+
# CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED is not set
111+
# CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED is not set
112+
# CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED is not set
113+
# CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED is not set
114+
# CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED is not set
115+
116+
117+
# CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set
90118
# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
91119
# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
92120
# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
@@ -109,6 +137,15 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
109137
# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
110138
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
111139
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
140+
141+
CONFIG_SPIFFS_MAX_PARTITIONS=1
142+
# CONFIG_SPIFFS_PAGE_CHECK is not set
143+
# CONFIG_SPIFFS_USE_MAGIC is not set
144+
# CONFIG_SPIFFS_USE_MTIME is not set
145+
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=1
146+
CONFIG_LITTLEFS_MAX_PARTITIONS=2
147+
CONFIG_DSP_MAX_FFT_SIZE_1024=y
148+
112149
#
113150
# Disable Cameras not used
114151
#
@@ -123,3 +160,4 @@ CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
123160
# CONFIG_BF3005_SUPPORT is not set
124161
# CONFIG_BF20A6_SUPPORT is not set
125162
# CONFIG_SC030IOT_SUPPORT is not set
163+

Diff for: ‎configs/defconfig.esp32

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR=y
2+
#
3+
# Bluetooth
4+
#
5+
CONFIG_BT_ENABLED=y
6+
CONFIG_BT_NIMBLE_ENABLED=y
7+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
8+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
9+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
10+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
11+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
12+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
13+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
14+
15+
CONFIG_ETH_ENABLED=y
16+
CONFIG_ETH_USE_ESP32_EMAC=y
17+
CONFIG_ETH_PHY_INTERFACE_RMII=y
18+
# CONFIG_ETH_USE_SPI_ETHERNET is not set
19+
220
# CONFIG_BTDM_CTRL_MODE_BTDM is not set
321
CONFIG_BT_BTC_TASK_STACK_SIZE=8192
422
CONFIG_BT_BTU_TASK_STACK_SIZE=8192
5-
CONFIG_BT_CLASSIC_ENABLED=y
6-
CONFIG_BT_A2DP_ENABLE=y
7-
CONFIG_BT_SPP_ENABLED=y
8-
CONFIG_BT_HFP_ENABLE=y
923
CONFIG_BT_STACK_NO_LOG=y
1024
CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
1125
CONFIG_SPIRAM=y

Diff for: ‎configs/defconfig.esp32c2

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
CONFIG_XTAL_FREQ_26=y
22
CONFIG_XTAL_FREQ=26
3-
CONFIG_BT_BLE_BLUFI_ENABLE=y
3+
#
4+
# Bluetooth
5+
#
6+
CONFIG_BT_ENABLED=y
7+
CONFIG_BT_NIMBLE_ENABLED=y
8+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
9+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
10+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
11+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
12+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
13+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
14+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
15+
416
CONFIG_RTC_CLK_CAL_CYCLES=576
517
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
618
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304

Diff for: ‎configs/defconfig.esp32c3

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
#
2+
# Bluetooth
3+
#
14
CONFIG_BT_ENABLED=y
2-
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
5+
CONFIG_BT_NIMBLE_ENABLED=y
6+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
7+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
8+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
9+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
10+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
11+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
12+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
13+
314
CONFIG_BT_CTRL_MODEM_SLEEP=y
415
CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
516
CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y

Diff for: ‎configs/defconfig.esp32c6

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
1+
#
2+
# Bluetooth
3+
#
4+
CONFIG_BT_ENABLED=y
5+
CONFIG_BT_NIMBLE_ENABLED=y
6+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
7+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
8+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
9+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
10+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
11+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
12+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
13+
214
CONFIG_BT_CTRL_MODEM_SLEEP=y
315
CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
416
CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y

Diff for: ‎configs/defconfig.esp32h2

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
1+
#
2+
# Bluetooth
3+
#
4+
CONFIG_BT_ENABLED=y
5+
CONFIG_BT_NIMBLE_ENABLED=y
6+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
7+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
8+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
9+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
10+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
11+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
12+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
13+
214
CONFIG_BT_CTRL_MODEM_SLEEP=y
315
CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
416
CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y

Diff for: ‎configs/defconfig.esp32s3

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
1-
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
21
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
32
CONFIG_SPIRAM=y
3+
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
44
CONFIG_RTC_CLK_CAL_CYCLES=576
55
CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
66
# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
77
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
88
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
99
CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
1010
CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
11+
12+
#
13+
# S3 Display shift fix -> https://espressif-docs.readthedocs-hosted.com/projects/esp-faq/en/latest/software-framework/peripherals/lcd.html
14+
#
15+
CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
16+
17+
#
18+
# Bluetooth
19+
#
20+
CONFIG_BT_ENABLED=y
21+
CONFIG_BT_NIMBLE_ENABLED=y
22+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
23+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
24+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
25+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
26+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
27+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
28+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set

Diff for: ‎main/idf_component.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ dependencies:
22
# Required IDF version
33
idf: ">=5.1"
44

5-
mdns: "^1.1.0"
6-
chmorgan/esp-libhelix-mp3: "1.0.3"
7-
esp-dsp: "^1.3.4"
5+
mdns: "^1.2.0"
6+
#libsodium: "^1.0.20"
7+
#chmorgan/esp-libhelix-mp3: "1.0.3"
8+
#esp-dsp: "^1.3.4"
89

910
# esp-sr: "^1.3.1"
1011
# esp32-camera: "^2.0.4"

Diff for: ‎tools/archive-build.sh

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ rm -rf arduino-esp32/docs
1818
rm -rf arduino-esp32/tests
1919
rm -rf arduino-esp32/libraries/RainMaker
2020
rm -rf arduino-esp32/libraries/Insights
21+
rm -rf arduino-esp32/libraries/BLE
22+
rm -rf arduino-esp32/libraries/SimpleBLE
23+
rm -rf arduino-esp32/libraries/WiFiProv
24+
rm -rf arduino-esp32/libraries/ESP32
2125
rm -rf arduino-esp32/package
2226
rm -rf arduino-esp32/tools/esp32-arduino-libs
2327
rm -rf arduino-esp32/tools/esptool.py

Diff for: ‎tools/install-arduino.sh

+19-9
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,25 @@ if [ "$AR_BRANCH" ]; then
4747
fi
4848
if [ $? -ne 0 ]; then exit 1; fi
4949

50+
#
51+
# remove libraries not needed for Tasmota
52+
#
53+
rm -rf "$AR_COMPS/arduino/libraries/RainMaker"
54+
rm -rf "$AR_COMPS/arduino/libraries/Insights"
55+
rm -rf "$AR_COMPS/arduino/libraries/BLE"
56+
rm -rf "$AR_COMPS/arduino/libraries/SimpleBLE"
57+
rm -rf "$AR_COMPS/arduino/libraries/WiFiProv"
58+
rm -rf "$AR_COMPS/arduino/libraries/ESP32"
59+
5060
#
5161
# CLONE/UPDATE ESP32-ARDUINO-LIBS
5262
#
53-
if [ ! -d "$IDF_LIBS_DIR" ]; then
54-
echo "Cloning esp32-arduino-libs..."
55-
git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
56-
else
57-
echo "Updating esp32-arduino-libs..."
58-
git -C "$IDF_LIBS_DIR" fetch && \
59-
git -C "$IDF_LIBS_DIR" pull --ff-only
60-
fi
61-
if [ $? -ne 0 ]; then exit 1; fi
63+
#if [ ! -d "$IDF_LIBS_DIR" ]; then
64+
# echo "Cloning esp32-arduino-libs..."
65+
# git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
66+
#else
67+
# echo "Updating esp32-arduino-libs..."
68+
# git -C "$IDF_LIBS_DIR" fetch && \
69+
# git -C "$IDF_LIBS_DIR" pull --ff-only
70+
#fi
71+
#if [ $? -ne 0 ]; then exit 1; fi

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

-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
3636
export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
3737
fi
3838

39-
#
40-
# Arduino needs cam_hal.h from esp32-camera in include folder
41-
#
42-
cp "AR_COMPS$/esp32-camera/driver/private_include/cam_hal.h" "AR_COMPS$/esp32-camera/driver/include/"
43-
4439
#
4540
# SETUP ESP-IDF ENV
4641
#

Diff for: ‎tools/update-components.sh

+13-6
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,23 @@ fi
1919
if [ $? -ne 0 ]; then exit 1; fi
2020

2121
#
22-
# CLONE/UPDATE ESP-LITTLEFS
22+
# Arduino needs cam_hal.h from esp32-camera in include folder
23+
#
24+
cp "$AR_COMPS/esp32-camera/driver/private_include/cam_hal.h" "$AR_COMPS/esp32-camera/driver/include/"
25+
26+
#
27+
# CLONE/UPDATE ESP-LITTLEFS v1.5.5 commit 9eeac09...
2328
#
2429
echo "Updating ESP-LITTLEFS..."
2530
if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
26-
git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \
27-
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
31+
git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs"
32+
git -C "$AR_COMPS/esp_littlefs" checkout 9eeac09c9c250643a32df47ea870dae2dd042648
33+
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
2834
else
29-
git -C "$AR_COMPS/esp_littlefs" fetch && \
30-
git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \
31-
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
35+
git -C "$AR_COMPS/esp_littlefs" fetch
36+
git -C "$AR_COMPS/esp_littlefs" pull --ff-only
37+
git -C "$AR_COMPS/esp_littlefs" checkout 9eeac09c9c250643a32df47ea870dae2dd042648
38+
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
3239
fi
3340
if [ $? -ne 0 ]; then exit 1; fi
3441

0 commit comments

Comments
 (0)