Skip to content

Commit 988507d

Browse files
authored
Tasmota changes IDF v5.1
1 parent 18604f7 commit 988507d

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

CMakeLists.txt

+1-15
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,9 @@ set(LIBRARY_SRCS
8888
libraries/HTTPClient/src/HTTPClient.cpp
8989
libraries/HTTPUpdate/src/HTTPUpdate.cpp
9090
libraries/LittleFS/src/LittleFS.cpp
91-
libraries/Insights/src/Insights.cpp
9291
libraries/I2S/src/I2S.cpp
9392
libraries/NetBIOS/src/NetBIOS.cpp
9493
libraries/Preferences/src/Preferences.cpp
95-
libraries/RainMaker/src/RMaker.cpp
96-
libraries/RainMaker/src/RMakerNode.cpp
97-
libraries/RainMaker/src/RMakerParam.cpp
98-
libraries/RainMaker/src/RMakerDevice.cpp
99-
libraries/RainMaker/src/RMakerType.cpp
100-
libraries/RainMaker/src/RMakerQR.cpp
101-
libraries/RainMaker/src/RMakerUtils.cpp
10294
libraries/SD_MMC/src/SD_MMC.cpp
10395
libraries/SD/src/SD.cpp
10496
libraries/SD/src/sd_diskio.cpp
@@ -184,11 +176,9 @@ set(includedirs
184176
libraries/HTTPClient/src
185177
libraries/HTTPUpdate/src
186178
libraries/LittleFS/src
187-
libraries/Insights/src
188179
libraries/I2S/src
189180
libraries/NetBIOS/src
190181
libraries/Preferences/src
191-
libraries/RainMaker/src
192182
libraries/SD_MMC/src
193183
libraries/SD/src
194184
libraries/SimpleBLE/src
@@ -207,7 +197,7 @@ set(includedirs
207197
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
208198
set(priv_includes cores/esp32/libb64)
209199
set(requires spi_flash mbedtls mdns wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
210-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid esp_insights)
200+
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid)
211201

212202
idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
213203

@@ -250,10 +240,6 @@ endfunction()
250240

251241
maybe_add_component(esp-dsp)
252242

253-
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
254-
maybe_add_component(esp_rainmaker)
255-
maybe_add_component(qrcode)
256-
endif()
257243
if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
258244
maybe_add_component(arduino_tinyusb)
259245
endif()

tools/platformio-build.py

-11
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
2626

2727
from os.path import abspath, basename, isdir, isfile, join
28-
from copy import deepcopy
2928
from SCons.Script import DefaultEnvironment, SConscript
3029

3130
env = DefaultEnvironment()
@@ -237,13 +236,3 @@ def add_tinyuf2_extra_image():
237236
),
238237
)
239238
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", partition_table)
240-
241-
#
242-
# Adjust the `esptoolpy` command in the `ElfToBin` builder with firmware checksum offset
243-
#
244-
245-
action = deepcopy(env["BUILDERS"]["ElfToBin"].action)
246-
action.cmd_list = env["BUILDERS"]["ElfToBin"].action.cmd_list.replace(
247-
"-o", "--elf-sha256-offset 0xb0 -o"
248-
)
249-
env["BUILDERS"]["ElfToBin"].action = action

0 commit comments

Comments
 (0)