Skip to content

Commit 3d26d04

Browse files
Jason2866Jason2866
authored
Tasmota changes
* optional Ethernet support (JL1101 driver added) * esp-modem only esp32, esp32s2 and esp32s3 * remove `OpenThread` * remove all BT BLE libraries * remove zigbee * remove SPIFFS * remove Client Secure * remove Provisioning * remove TfLite, Insights and Rainmaker * make GPIOViewer working see arendst/Tasmota@9696118
1 parent 7f954e8 commit 3d26d04

File tree

22 files changed

+112
-344
lines changed

22 files changed

+112
-344
lines changed

‎CMakeLists.txt

Lines changed: 26 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# idf.py build
77

88
set(min_supported_idf_version "5.3.0")
9-
set(max_supported_idf_version "5.3.99")
9+
set(max_supported_idf_version "5.4.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
@@ -42,8 +41,7 @@ set(CORE_SRCS
4241
cores/esp32/esp32-hal-sigmadelta.c
4342
cores/esp32/esp32-hal-spi.c
4443
cores/esp32/esp32-hal-time.c
45-
cores/esp32/esp32-hal-timer.c
46-
cores/esp32/esp32-hal-tinyusb.c
44+
cores/esp32/esp32-hal-timer.c
4745
cores/esp32/esp32-hal-touch.c
4846
cores/esp32/esp32-hal-touch-ng.c
4947
cores/esp32/esp32-hal-uart.c
@@ -65,83 +63,59 @@ set(CORE_SRCS
6563
cores/esp32/StreamString.cpp
6664
cores/esp32/Tone.cpp
6765
cores/esp32/HWCDC.cpp
68-
cores/esp32/USB.cpp
69-
cores/esp32/USBCDC.cpp
70-
cores/esp32/USBMSC.cpp
7166
cores/esp32/FirmwareMSC.cpp
7267
cores/esp32/firmware_msc_fat.c
7368
cores/esp32/wiring_pulse.c
7469
cores/esp32/wiring_shift.c
7570
cores/esp32/WMath.cpp
7671
cores/esp32/WString.cpp
7772
)
73+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
74+
list(APPEND CORE_SRCS
75+
cores/esp32/esp32-hal-tinyusb.c
76+
cores/esp32/USB.cpp
77+
cores/esp32/USBCDC.cpp
78+
cores/esp32/USBMSC.cpp)
79+
endif()
7880

7981
set(ARDUINO_ALL_LIBRARIES
8082
ArduinoOTA
8183
AsyncUDP
82-
BLE
83-
BluetoothSerial
8484
DNSServer
8585
EEPROM
86-
ESP_I2S
87-
ESP_NOW
88-
ESP_SR
8986
ESPmDNS
9087
Ethernet
9188
FFat
9289
FS
9390
HTTPClient
9491
HTTPUpdate
95-
Insights
9692
LittleFS
97-
Matter
9893
NetBIOS
9994
Network
100-
OpenThread
10195
PPP
10296
Preferences
103-
RainMaker
10497
SD_MMC
10598
SD
106-
SimpleBLE
107-
SPIFFS
10899
SPI
109100
Ticker
110101
Update
111-
USB
112102
WebServer
113-
NetworkClientSecure
114103
WiFi
115-
WiFiProv
116104
Wire
117-
Zigbee
118105
)
106+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
107+
list(APPEND ARDUINO_ALL_LIBRARIES USB)
108+
endif()
119109

120110
set(ARDUINO_LIBRARY_ArduinoOTA_SRCS libraries/ArduinoOTA/src/ArduinoOTA.cpp)
121111
set(ARDUINO_LIBRARY_ArduinoOTA_REQUIRES esp_https_ota)
122112

123113
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
124114

125-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
126-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
127-
libraries/BluetoothSerial/src/BTAddress.cpp
128-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
129-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
130-
131115
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
132116

133117
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
134118

135-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
136-
137-
set(ARDUINO_LIBRARY_ESP_NOW_SRCS
138-
libraries/ESP_NOW/src/ESP32_NOW.cpp
139-
libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp)
140-
141-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
142-
libraries/ESP_SR/src/ESP_SR.cpp
143-
libraries/ESP_SR/src/esp32-hal-sr.c)
144-
145119
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
146120

147121
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -156,48 +130,24 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
156130

157131
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
158132

159-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
160-
161133
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
162134
set(ARDUINO_LIBRARY_LittleFS_REQUIRES joltwallet__littlefs)
163135

164136
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
165137

166-
set(ARDUINO_LIBRARY_OpenThread_SRCS
167-
libraries/OpenThread/src/OThreadCLI.cpp
168-
libraries/OpenThread/src/OThreadCLI_Util.cpp)
169-
170-
set(ARDUINO_LIBRARY_Matter_SRCS
171-
libraries/Matter/src/MatterOnOffLight.cpp
172-
libraries/Matter/src/Matter.cpp)
173-
174138
set(ARDUINO_LIBRARY_PPP_SRCS
175139
libraries/PPP/src/PPP.cpp
176140
libraries/PPP/src/ppp.c)
177141

178142
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
179143

180-
set(ARDUINO_LIBRARY_RainMaker_SRCS
181-
libraries/RainMaker/src/RMaker.cpp
182-
libraries/RainMaker/src/RMakerNode.cpp
183-
libraries/RainMaker/src/RMakerParam.cpp
184-
libraries/RainMaker/src/RMakerDevice.cpp
185-
libraries/RainMaker/src/RMakerType.cpp
186-
libraries/RainMaker/src/RMakerQR.cpp
187-
libraries/RainMaker/src/RMakerUtils.cpp
188-
libraries/RainMaker/src/AppInsights.cpp)
189-
190144
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
191145

192146
set(ARDUINO_LIBRARY_SD_SRCS
193147
libraries/SD/src/SD.cpp
194148
libraries/SD/src/sd_diskio.cpp
195149
libraries/SD/src/sd_diskio_crc.c)
196150

197-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
198-
199-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
200-
201151
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
202152

203153
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -206,26 +156,24 @@ set(ARDUINO_LIBRARY_Update_SRCS
206156
libraries/Update/src/Updater.cpp
207157
libraries/Update/src/HttpsOTAUpdate.cpp)
208158

209-
set(ARDUINO_LIBRARY_USB_SRCS
210-
libraries/USB/src/USBHID.cpp
211-
libraries/USB/src/USBMIDI.cpp
212-
libraries/USB/src/USBHIDMouse.cpp
213-
libraries/USB/src/USBHIDKeyboard.cpp
214-
libraries/USB/src/USBHIDGamepad.cpp
215-
libraries/USB/src/USBHIDConsumerControl.cpp
216-
libraries/USB/src/USBHIDSystemControl.cpp
217-
libraries/USB/src/USBHIDVendor.cpp
218-
libraries/USB/src/USBVendor.cpp)
159+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
160+
set(ARDUINO_LIBRARY_USB_SRCS
161+
libraries/USB/src/USBHID.cpp
162+
libraries/USB/src/USBMIDI.cpp
163+
libraries/USB/src/USBHIDMouse.cpp
164+
libraries/USB/src/USBHIDKeyboard.cpp
165+
libraries/USB/src/USBHIDGamepad.cpp
166+
libraries/USB/src/USBHIDConsumerControl.cpp
167+
libraries/USB/src/USBHIDSystemControl.cpp
168+
libraries/USB/src/USBHIDVendor.cpp
169+
libraries/USB/src/USBVendor.cpp)
170+
endif()
219171

220172
set(ARDUINO_LIBRARY_WebServer_SRCS
221173
libraries/WebServer/src/WebServer.cpp
222174
libraries/WebServer/src/Parsing.cpp
223175
libraries/WebServer/src/detail/mimetable.cpp)
224176

225-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
226-
libraries/NetworkClientSecure/src/ssl_client.cpp
227-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
228-
229177
set(ARDUINO_LIBRARY_Network_SRCS
230178
libraries/Network/src/NetworkInterface.cpp
231179
libraries/Network/src/NetworkEvents.cpp
@@ -244,55 +192,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
244192
libraries/WiFi/src/STA.cpp
245193
libraries/WiFi/src/AP.cpp)
246194

247-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
248-
249195
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
250196

251-
set(ARDUINO_LIBRARY_Zigbee_SRCS
252-
libraries/Zigbee/src/ZigbeeCore.cpp
253-
libraries/Zigbee/src/ZigbeeEP.cpp
254-
libraries/Zigbee/src/ZigbeeHandlers.cpp
255-
libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
256-
libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
257-
libraries/Zigbee/src/ep/ZigbeeLight.cpp
258-
libraries/Zigbee/src/ep/ZigbeeSwitch.cpp
259-
libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp
260-
libraries/Zigbee/src/ep/ZigbeeThermostat.cpp
261-
)
262-
263-
set(ARDUINO_LIBRARY_BLE_SRCS
264-
libraries/BLE/src/BLE2901.cpp
265-
libraries/BLE/src/BLE2902.cpp
266-
libraries/BLE/src/BLE2904.cpp
267-
libraries/BLE/src/BLEAddress.cpp
268-
libraries/BLE/src/BLEAdvertisedDevice.cpp
269-
libraries/BLE/src/BLEAdvertising.cpp
270-
libraries/BLE/src/BLEBeacon.cpp
271-
libraries/BLE/src/BLECharacteristic.cpp
272-
libraries/BLE/src/BLECharacteristicMap.cpp
273-
libraries/BLE/src/BLEClient.cpp
274-
libraries/BLE/src/BLEDescriptor.cpp
275-
libraries/BLE/src/BLEDescriptorMap.cpp
276-
libraries/BLE/src/BLEDevice.cpp
277-
libraries/BLE/src/BLEEddystoneTLM.cpp
278-
libraries/BLE/src/BLEEddystoneURL.cpp
279-
libraries/BLE/src/BLEExceptions.cpp
280-
libraries/BLE/src/BLEHIDDevice.cpp
281-
libraries/BLE/src/BLERemoteCharacteristic.cpp
282-
libraries/BLE/src/BLERemoteDescriptor.cpp
283-
libraries/BLE/src/BLERemoteService.cpp
284-
libraries/BLE/src/BLEScan.cpp
285-
libraries/BLE/src/BLESecurity.cpp
286-
libraries/BLE/src/BLEServer.cpp
287-
libraries/BLE/src/BLEService.cpp
288-
libraries/BLE/src/BLEServiceMap.cpp
289-
libraries/BLE/src/BLEUtils.cpp
290-
libraries/BLE/src/BLEUUID.cpp
291-
libraries/BLE/src/BLEValue.cpp
292-
libraries/BLE/src/FreeRTOS.cpp
293-
libraries/BLE/src/GeneralUtils.cpp
294-
)
295-
296197
set(ARDUINO_LIBRARIES_SRCS)
297198
set(ARDUINO_LIBRARIES_REQUIRES)
298199
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -313,16 +214,8 @@ endforeach()
313214
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
314215
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
315216
set(priv_includes cores/esp32/libb64)
316-
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 espressif__network_provisioning)
317-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
318-
319-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
320-
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
321-
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
322-
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2") # Sadly only this works
323-
list(APPEND requires openthread)
324-
endif()
325-
endif()
217+
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)
218+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
326219

327220
if(IDF_TARGET STREQUAL "esp32p4")
328221
list(APPEND requires esp_driver_touch_sens)
@@ -373,9 +266,3 @@ endif()
373266
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)
374267
maybe_add_component(esp_https_ota)
375268
endif()
376-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ESP_SR)
377-
maybe_add_component(espressif__esp_sr)
378-
endif()
379-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_Matter)
380-
maybe_add_component(espressif__esp_matter)
381-
endif()

‎Kconfig.projbuild

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,6 @@ config ARDUINO_SELECTIVE_Wire
266266
depends on ARDUINO_SELECTIVE_COMPILATION
267267
default y
268268

269-
config ARDUINO_SELECTIVE_ESP_SR
270-
bool "Enable ESP-SR"
271-
depends on ARDUINO_SELECTIVE_COMPILATION
272-
default y
273-
274269
config ARDUINO_SELECTIVE_EEPROM
275270
bool "Enable EEPROM"
276271
depends on ARDUINO_SELECTIVE_COMPILATION
@@ -291,11 +286,6 @@ config ARDUINO_SELECTIVE_Update
291286
depends on ARDUINO_SELECTIVE_COMPILATION
292287
default y
293288

294-
config ARDUINO_SELECTIVE_Zigbee
295-
bool "Enable Zigbee"
296-
depends on ARDUINO_SELECTIVE_COMPILATION
297-
default y
298-
299289
config ARDUINO_SELECTIVE_FS
300290
bool "Enable FS"
301291
depends on ARDUINO_SELECTIVE_COMPILATION
@@ -311,11 +301,6 @@ config ARDUINO_SELECTIVE_SD_MMC
311301
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
312302
default y
313303

314-
config ARDUINO_SELECTIVE_SPIFFS
315-
bool "Enable SPIFFS"
316-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
317-
default y
318-
319304
config ARDUINO_SELECTIVE_FFat
320305
bool "Enable FFat"
321306
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
@@ -365,12 +350,6 @@ config ARDUINO_SELECTIVE_ESPmDNS
365350
config ARDUINO_SELECTIVE_HTTPClient
366351
bool "Enable HTTPClient"
367352
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
368-
select ARDUINO_SELECTIVE_NetworkClientSecure
369-
default y
370-
371-
config ARDUINO_SELECTIVE_Matter
372-
bool "Enable Matter"
373-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
374353
default y
375354

376355
config ARDUINO_SELECTIVE_NetBIOS
@@ -389,44 +368,4 @@ config ARDUINO_SELECTIVE_WiFi
389368
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
390369
default y
391370

392-
config ARDUINO_SELECTIVE_NetworkClientSecure
393-
bool "Enable NetworkClientSecure"
394-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
395-
default y
396-
397-
config ARDUINO_SELECTIVE_WiFiProv
398-
bool "Enable WiFiProv"
399-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network && ARDUINO_SELECTIVE_WiFi
400-
default y
401-
402-
config ARDUINO_SELECTIVE_BLE
403-
bool "Enable BLE"
404-
depends on ARDUINO_SELECTIVE_COMPILATION
405-
default y
406-
407-
config ARDUINO_SELECTIVE_BluetoothSerial
408-
bool "Enable BluetoothSerial"
409-
depends on ARDUINO_SELECTIVE_COMPILATION
410-
default y
411-
412-
config ARDUINO_SELECTIVE_SimpleBLE
413-
bool "Enable SimpleBLE"
414-
depends on ARDUINO_SELECTIVE_COMPILATION
415-
default y
416-
417-
config ARDUINO_SELECTIVE_RainMaker
418-
bool "Enable RainMaker"
419-
depends on ARDUINO_SELECTIVE_COMPILATION
420-
default y
421-
422-
config ARDUINO_SELECTIVE_OpenThread
423-
bool "Enable OpenThread"
424-
depends on ARDUINO_SELECTIVE_COMPILATION
425-
default y
426-
427-
config ARDUINO_SELECTIVE_Insights
428-
bool "Enable Insights"
429-
depends on ARDUINO_SELECTIVE_COMPILATION
430-
default y
431-
432371
endmenu

0 commit comments

Comments
 (0)