Skip to content

Commit 6874e15

Browse files
Jason2866Jason2866
authored
Tasmota 3.1.x Esp32-P4
1 parent 4e9eb35 commit 6874e15

File tree

103 files changed

+1069
-1484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1069
-1484
lines changed

Diff for: ‎.github/scripts/on-release.sh

+3-17
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,8 @@ find "$PKG_DIR" -name '*.git*' -type f -delete
219219
##
220220
RVTC_NAME="riscv32-esp-elf-gcc"
221221
RVTC_NEW_NAME="esp-rv32"
222-
X32TC_NAME="xtensa-esp32-elf-gcc"
222+
X32TC_NAME="xtensa-esp-elf-gcc"
223223
X32TC_NEW_NAME="esp-x32"
224-
XS2TC_NAME="xtensa-esp32s2-elf-gcc"
225-
XS2TC_NEW_NAME="esp-xs2"
226-
XS3TC_NAME="xtensa-esp32s3-elf-gcc"
227-
XS3TC_NEW_NAME="esp-xs3"
228224

229225
# Replace tools locations in platform.txt
230226
echo "Generating platform.txt..."
@@ -233,9 +229,7 @@ sed "s/version=.*/version=$RELEASE_TAG/g" | \
233229
sed 's/tools\.esp32-arduino-libs\.path\.windows=.*//g' | \
234230
sed 's/{runtime\.platform\.path}.tools.esp32-arduino-libs/\{runtime.tools.esp32-arduino-libs.path\}/g' | \
235231
sed 's/{runtime\.platform\.path}.tools.xtensa-esp-elf-gdb/\{runtime.tools.xtensa-esp-elf-gdb.path\}/g' | \
236-
sed "s/{runtime\.platform\.path}.tools.xtensa-esp32-elf/\\{runtime.tools.$X32TC_NEW_NAME.path\\}/g" | \
237-
sed "s/{runtime\.platform\.path}.tools.xtensa-esp32s2-elf/\\{runtime.tools.$XS2TC_NEW_NAME.path\\}/g" | \
238-
sed "s/{runtime\.platform\.path}.tools.xtensa-esp32s3-elf/\\{runtime.tools.$XS3TC_NEW_NAME.path\\}/g" | \
232+
sed "s/{runtime\.platform\.path}.tools.xtensa-esp-elf/\\{runtime.tools.$X32TC_NEW_NAME.path\\}/g" | \
239233
sed 's/{runtime\.platform\.path}.tools.riscv32-esp-elf-gdb/\{runtime.tools.riscv32-esp-elf-gdb.path\}/g' | \
240234
sed "s/{runtime\.platform\.path}.tools.riscv32-esp-elf/\\{runtime.tools.$RVTC_NEW_NAME.path\\}/g" | \
241235
sed 's/{runtime\.platform\.path}.tools.esptool/\{runtime.tools.esptool_py.path\}/g' | \
@@ -293,15 +287,7 @@ rvtc_jq_arg="\
293287
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$X32TC_NAME\")).version = \"$RVTC_VERSION\" |\
294288
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$X32TC_NAME\")).name = \"$X32TC_NEW_NAME\" |\
295289
(.packages[0].tools[] | select(.name==\"$X32TC_NAME\")).version = \"$RVTC_VERSION\" |\
296-
(.packages[0].tools[] | select(.name==\"$X32TC_NAME\")).name = \"$X32TC_NEW_NAME\" |\
297-
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS2TC_NAME\")).version = \"$RVTC_VERSION\" |\
298-
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS2TC_NAME\")).name = \"$XS2TC_NEW_NAME\" |\
299-
(.packages[0].tools[] | select(.name==\"$XS2TC_NAME\")).version = \"$RVTC_VERSION\" |\
300-
(.packages[0].tools[] | select(.name==\"$XS2TC_NAME\")).name = \"$XS2TC_NEW_NAME\" |\
301-
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS3TC_NAME\")).version = \"$RVTC_VERSION\" |\
302-
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\" |\
303-
(.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).version = \"$RVTC_VERSION\" |\
304-
(.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\""
290+
(.packages[0].tools[] | select(.name==\"$X32TC_NAME\")).name = \"$X32TC_NEW_NAME\""
305291
cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-rvfix.json"
306292
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-rvfix.json"
307293

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

+22-21
Original file line numberDiff line numberDiff line change
@@ -194,28 +194,29 @@ jobs:
194194
- name: Build Sketches
195195
run: bash ./.github/scripts/on-push.sh
196196

197-
# PlatformIO on Windows, Ubuntu and Mac
198-
build-platformio:
199-
name: PlatformIO on ${{ matrix.os }}
200-
needs: gen-chunks
201-
if: |
202-
needs.gen-chunks.outputs.build_all == 'true' ||
203-
needs.gen-chunks.outputs.build_static_sketches == 'true' ||
204-
needs.gen-chunks.outputs.build_platformio == 'true'
205-
runs-on: ${{ matrix.os }}
206-
strategy:
207-
fail-fast: false
208-
matrix:
209-
os: [ubuntu-latest, windows-latest, macOS-latest]
197+
# # PlatformIO on Windows, Ubuntu and Mac
198+
# build-platformio:
199+
# name: PlatformIO on ${{ matrix.os }}
200+
# needs: gen-chunks
201+
# if: |
202+
# needs.gen-chunks.outputs.build_all == 'true' ||
203+
# needs.gen-chunks.outputs.build_static_sketches == 'true' ||
204+
# needs.gen-chunks.outputs.build_platformio == 'true'
205+
# runs-on: ${{ matrix.os }}
206+
# strategy:
207+
# fail-fast: false
208+
# matrix:
209+
# os: [ubuntu-latest, windows-latest, macOS-latest]
210210

211-
steps:
212-
- uses: actions/checkout@v4
213-
- uses: actions/setup-python@v5
214-
with:
215-
python-version: '3.x'
216-
- name: Build Sketches
217-
run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
211+
# steps:
212+
# - uses: actions/checkout@v4
213+
# - uses: actions/setup-python@v5
214+
# with:
215+
# python-version: '3.x'
216+
# - name: Build Sketches
217+
# run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
218218

219+
# ESP-IDF component build
219220
build-esp-idf-component:
220221
name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
221222
needs: gen-chunks
@@ -231,7 +232,7 @@ jobs:
231232
# See https://hub.docker.com/r/espressif/idf/tags and
232233
# https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html
233234
# for details.
234-
idf_ver: ["release-v5.1"]
235+
idf_ver: ["release-v5.3"]
235236
idf_target: ["esp32", "esp32s2", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2"]
236237
container: espressif/idf:${{ matrix.idf_ver }}
237238
steps:

Diff for: ‎CMakeLists.txt

+4-100
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# export ARDUINO_SKIP_IDF_VERSION_CHECK=1
66
# idf.py build
77

8-
set(min_supported_idf_version "5.1.0")
9-
set(max_supported_idf_version "5.1.99")
8+
set(min_supported_idf_version "5.3.0")
9+
set(max_supported_idf_version "5.3.99")
1010
set(idf_version "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
1111

1212
if ("${idf_version}" AND NOT "$ENV{ARDUINO_SKIP_IDF_VERSION_CHECK}")
@@ -25,7 +25,6 @@ endif()
2525
set(CORE_SRCS
2626
cores/esp32/base64.cpp
2727
cores/esp32/cbuf.cpp
28-
cores/esp32/chip-debug-report.cpp
2928
cores/esp32/esp32-hal-adc.c
3029
cores/esp32/esp32-hal-bt.c
3130
cores/esp32/esp32-hal-cpu.c
@@ -78,39 +77,27 @@ set(CORE_SRCS
7877
set(ARDUINO_ALL_LIBRARIES
7978
ArduinoOTA
8079
AsyncUDP
81-
BLE
82-
BluetoothSerial
8380
DNSServer
8481
EEPROM
85-
ESP_I2S
86-
ESP_NOW
87-
ESP_SR
8882
ESPmDNS
8983
Ethernet
9084
FFat
9185
FS
9286
HTTPClient
9387
HTTPUpdate
94-
Insights
9588
LittleFS
9689
NetBIOS
9790
Network
98-
OpenThread
9991
PPP
10092
Preferences
101-
RainMaker
10293
SD_MMC
10394
SD
104-
SimpleBLE
105-
SPIFFS
10695
SPI
10796
Ticker
10897
Update
10998
USB
11099
WebServer
111-
NetworkClientSecure
112100
WiFi
113-
WiFiProv
114101
Wire
115102
)
116103

@@ -119,26 +106,10 @@ set(ARDUINO_LIBRARY_ArduinoOTA_REQUIRES esp_https_ota)
119106

120107
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
121108

122-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
123-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
124-
libraries/BluetoothSerial/src/BTAddress.cpp
125-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
126-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
127-
128109
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
129110

130111
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
131112

132-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
133-
134-
set(ARDUINO_LIBRARY_ESP_NOW_SRCS
135-
libraries/ESP_NOW/src/ESP32_NOW.cpp
136-
libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp)
137-
138-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
139-
libraries/ESP_SR/src/ESP_SR.cpp
140-
libraries/ESP_SR/src/esp32-hal-sr.c)
141-
142113
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
143114

144115
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -153,43 +124,23 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
153124

154125
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
155126

156-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
157-
158127
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
159128

160129
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
161130

162-
set(ARDUINO_LIBRARY_OpenThread_SRCS
163-
libraries/OpenThread/src/OThreadCLI.cpp
164-
libraries/OpenThread/src/OThreadCLI_Util.cpp)
165-
166131
set(ARDUINO_LIBRARY_PPP_SRCS
167132
libraries/PPP/src/PPP.cpp
168133
libraries/PPP/src/ppp.c)
169134

170135
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
171136

172-
set(ARDUINO_LIBRARY_RainMaker_SRCS
173-
libraries/RainMaker/src/RMaker.cpp
174-
libraries/RainMaker/src/RMakerNode.cpp
175-
libraries/RainMaker/src/RMakerParam.cpp
176-
libraries/RainMaker/src/RMakerDevice.cpp
177-
libraries/RainMaker/src/RMakerType.cpp
178-
libraries/RainMaker/src/RMakerQR.cpp
179-
libraries/RainMaker/src/RMakerUtils.cpp
180-
libraries/RainMaker/src/AppInsights.cpp)
181-
182137
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
183138

184139
set(ARDUINO_LIBRARY_SD_SRCS
185140
libraries/SD/src/SD.cpp
186141
libraries/SD/src/sd_diskio.cpp
187142
libraries/SD/src/sd_diskio_crc.c)
188143

189-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
190-
191-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
192-
193144
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
194145

195146
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -214,10 +165,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
214165
libraries/WebServer/src/Parsing.cpp
215166
libraries/WebServer/src/detail/mimetable.cpp)
216167

217-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
218-
libraries/NetworkClientSecure/src/ssl_client.cpp
219-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
220-
221168
set(ARDUINO_LIBRARY_Network_SRCS
222169
libraries/Network/src/NetworkInterface.cpp
223170
libraries/Network/src/NetworkEvents.cpp
@@ -236,43 +183,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
236183
libraries/WiFi/src/STA.cpp
237184
libraries/WiFi/src/AP.cpp)
238185

239-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
240-
241186
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
242187

243-
set(ARDUINO_LIBRARY_BLE_SRCS
244-
libraries/BLE/src/BLE2901.cpp
245-
libraries/BLE/src/BLE2902.cpp
246-
libraries/BLE/src/BLE2904.cpp
247-
libraries/BLE/src/BLEAddress.cpp
248-
libraries/BLE/src/BLEAdvertisedDevice.cpp
249-
libraries/BLE/src/BLEAdvertising.cpp
250-
libraries/BLE/src/BLEBeacon.cpp
251-
libraries/BLE/src/BLECharacteristic.cpp
252-
libraries/BLE/src/BLECharacteristicMap.cpp
253-
libraries/BLE/src/BLEClient.cpp
254-
libraries/BLE/src/BLEDescriptor.cpp
255-
libraries/BLE/src/BLEDescriptorMap.cpp
256-
libraries/BLE/src/BLEDevice.cpp
257-
libraries/BLE/src/BLEEddystoneTLM.cpp
258-
libraries/BLE/src/BLEEddystoneURL.cpp
259-
libraries/BLE/src/BLEExceptions.cpp
260-
libraries/BLE/src/BLEHIDDevice.cpp
261-
libraries/BLE/src/BLERemoteCharacteristic.cpp
262-
libraries/BLE/src/BLERemoteDescriptor.cpp
263-
libraries/BLE/src/BLERemoteService.cpp
264-
libraries/BLE/src/BLEScan.cpp
265-
libraries/BLE/src/BLESecurity.cpp
266-
libraries/BLE/src/BLEServer.cpp
267-
libraries/BLE/src/BLEService.cpp
268-
libraries/BLE/src/BLEServiceMap.cpp
269-
libraries/BLE/src/BLEUtils.cpp
270-
libraries/BLE/src/BLEUUID.cpp
271-
libraries/BLE/src/BLEValue.cpp
272-
libraries/BLE/src/FreeRTOS.cpp
273-
libraries/BLE/src/GeneralUtils.cpp
274-
)
275-
276188
set(ARDUINO_LIBRARIES_SRCS)
277189
set(ARDUINO_LIBRARIES_REQUIRES)
278190
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -293,16 +205,8 @@ endforeach()
293205
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
294206
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
295207
set(priv_includes cores/esp32/libb64)
296-
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser espressif__network_provisioning)
297-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
298-
299-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
300-
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
301-
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
302-
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2") # Sadly only this works
303-
list(APPEND requires openthread)
304-
endif()
305-
endif()
208+
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser esp_ringbuf esp_driver_gptimer esp_driver_usb_serial_jtag driver)
209+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
306210

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

Diff for: ‎Kconfig.projbuild

-31
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,6 @@ config ARDUINO_SELECTIVE_SD_MMC
301301
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
302302
default y
303303

304-
config ARDUINO_SELECTIVE_SPIFFS
305-
bool "Enable SPIFFS"
306-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
307-
default y
308-
309304
config ARDUINO_SELECTIVE_FFat
310305
bool "Enable FFat"
311306
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
@@ -355,7 +350,6 @@ config ARDUINO_SELECTIVE_ESPmDNS
355350
config ARDUINO_SELECTIVE_HTTPClient
356351
bool "Enable HTTPClient"
357352
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
358-
select ARDUINO_SELECTIVE_NetworkClientSecure
359353
default y
360354

361355
config ARDUINO_SELECTIVE_NetBIOS
@@ -374,29 +368,4 @@ config ARDUINO_SELECTIVE_WiFi
374368
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
375369
default y
376370

377-
config ARDUINO_SELECTIVE_NetworkClientSecure
378-
bool "Enable NetworkClientSecure"
379-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
380-
default y
381-
382-
config ARDUINO_SELECTIVE_WiFiProv
383-
bool "Enable WiFiProv"
384-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network && ARDUINO_SELECTIVE_WiFi
385-
default y
386-
387-
config ARDUINO_SELECTIVE_BLE
388-
bool "Enable BLE"
389-
depends on ARDUINO_SELECTIVE_COMPILATION
390-
default y
391-
392-
config ARDUINO_SELECTIVE_BluetoothSerial
393-
bool "Enable BluetoothSerial"
394-
depends on ARDUINO_SELECTIVE_COMPILATION
395-
default y
396-
397-
config ARDUINO_SELECTIVE_SimpleBLE
398-
bool "Enable SimpleBLE"
399-
depends on ARDUINO_SELECTIVE_COMPILATION
400-
default y
401-
402371
endmenu

0 commit comments

Comments
 (0)