Skip to content

Commit 3842246

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 * remove FS log which is just littering
1 parent 6359af9 commit 3842246

File tree

16 files changed

+98
-402
lines changed

16 files changed

+98
-402
lines changed

‎CMakeLists.txt‎

Lines changed: 34 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ set(CORE_SRCS
2626
cores/esp32/base64.cpp
2727
cores/esp32/cbuf.cpp
2828
cores/esp32/ColorFormat.c
29-
cores/esp32/chip-debug-report.cpp
3029
cores/esp32/esp32-hal-adc.c
3130
cores/esp32/esp32-hal-bt.c
3231
cores/esp32/esp32-hal-cpu.c
@@ -44,8 +43,7 @@ set(CORE_SRCS
4443
cores/esp32/esp32-hal-sigmadelta.c
4544
cores/esp32/esp32-hal-spi.c
4645
cores/esp32/esp32-hal-time.c
47-
cores/esp32/esp32-hal-timer.c
48-
cores/esp32/esp32-hal-tinyusb.c
46+
cores/esp32/esp32-hal-timer.c
4947
cores/esp32/esp32-hal-touch.c
5048
cores/esp32/esp32-hal-touch-ng.c
5149
cores/esp32/esp32-hal-uart.c
@@ -68,82 +66,58 @@ set(CORE_SRCS
6866
cores/esp32/StreamString.cpp
6967
cores/esp32/Tone.cpp
7068
cores/esp32/HWCDC.cpp
71-
cores/esp32/USB.cpp
72-
cores/esp32/USBCDC.cpp
73-
cores/esp32/USBMSC.cpp
7469
cores/esp32/FirmwareMSC.cpp
7570
cores/esp32/firmware_msc_fat.c
7671
cores/esp32/wiring_pulse.c
7772
cores/esp32/wiring_shift.c
7873
cores/esp32/WMath.cpp
7974
cores/esp32/WString.cpp
8075
)
76+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
77+
list(APPEND CORE_SRCS
78+
cores/esp32/esp32-hal-tinyusb.c
79+
cores/esp32/USB.cpp
80+
cores/esp32/USBCDC.cpp
81+
cores/esp32/USBMSC.cpp)
82+
endif()
8183

8284
set(ARDUINO_ALL_LIBRARIES
8385
ArduinoOTA
8486
AsyncUDP
85-
BLE
86-
BluetoothSerial
8787
DNSServer
8888
EEPROM
89-
ESP_I2S
90-
ESP_NOW
91-
ESP_SR
9289
ESPmDNS
9390
Ethernet
9491
FFat
9592
FS
9693
HTTPClient
9794
HTTPUpdate
98-
Insights
9995
LittleFS
100-
Matter
10196
NetBIOS
10297
Network
103-
OpenThread
10498
PPP
10599
Preferences
106-
RainMaker
107100
SD_MMC
108101
SD
109-
SimpleBLE
110-
SPIFFS
111102
SPI
112103
Ticker
113104
Update
114-
USB
115105
WebServer
116-
NetworkClientSecure
117106
WiFi
118-
WiFiProv
119107
Wire
120-
Zigbee
121108
)
109+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
110+
list(APPEND ARDUINO_ALL_LIBRARIES USB)
111+
endif()
122112

123113
set(ARDUINO_LIBRARY_ArduinoOTA_SRCS libraries/ArduinoOTA/src/ArduinoOTA.cpp)
124114

125115
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
126116

127-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
128-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
129-
libraries/BluetoothSerial/src/BTAddress.cpp
130-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
131-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
132-
133117
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
134118

135119
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
136120

137-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
138-
139-
set(ARDUINO_LIBRARY_ESP_NOW_SRCS
140-
libraries/ESP_NOW/src/ESP32_NOW.cpp
141-
libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp)
142-
143-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
144-
libraries/ESP_SR/src/ESP_SR.cpp
145-
libraries/ESP_SR/src/esp32-hal-sr.c)
146-
147121
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
148122

149123
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -158,62 +132,23 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
158132

159133
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
160134

161-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
162-
163135
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
164136

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

167-
set(ARDUINO_LIBRARY_OpenThread_SRCS
168-
libraries/OpenThread/src/OThread.cpp
169-
libraries/OpenThread/src/OThreadCLI.cpp
170-
libraries/OpenThread/src/OThreadCLI_Util.cpp)
171-
172-
set(ARDUINO_LIBRARY_Matter_SRCS
173-
libraries/Matter/src/MatterEndpoints/MatterGenericSwitch.cpp
174-
libraries/Matter/src/MatterEndpoints/MatterOnOffLight.cpp
175-
libraries/Matter/src/MatterEndpoints/MatterDimmableLight.cpp
176-
libraries/Matter/src/MatterEndpoints/MatterColorTemperatureLight.cpp
177-
libraries/Matter/src/MatterEndpoints/MatterColorLight.cpp
178-
libraries/Matter/src/MatterEndpoints/MatterEnhancedColorLight.cpp
179-
libraries/Matter/src/MatterEndpoints/MatterFan.cpp
180-
libraries/Matter/src/MatterEndpoints/MatterTemperatureSensor.cpp
181-
libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp
182-
libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp
183-
libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp
184-
libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp
185-
libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
186-
libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp
187-
libraries/Matter/src/Matter.cpp
188-
libraries/Matter/src/MatterEndPoint.cpp)
189-
190139
set(ARDUINO_LIBRARY_PPP_SRCS
191140
libraries/PPP/src/PPP.cpp
192141
libraries/PPP/src/ppp.c)
193142

194143
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
195144

196-
set(ARDUINO_LIBRARY_RainMaker_SRCS
197-
libraries/RainMaker/src/RMaker.cpp
198-
libraries/RainMaker/src/RMakerNode.cpp
199-
libraries/RainMaker/src/RMakerParam.cpp
200-
libraries/RainMaker/src/RMakerDevice.cpp
201-
libraries/RainMaker/src/RMakerType.cpp
202-
libraries/RainMaker/src/RMakerQR.cpp
203-
libraries/RainMaker/src/RMakerUtils.cpp
204-
libraries/RainMaker/src/AppInsights.cpp)
205-
206145
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
207146

208147
set(ARDUINO_LIBRARY_SD_SRCS
209148
libraries/SD/src/SD.cpp
210149
libraries/SD/src/sd_diskio.cpp
211150
libraries/SD/src/sd_diskio_crc.c)
212151

213-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
214-
215-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
216-
217152
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
218153

219154
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -222,26 +157,28 @@ set(ARDUINO_LIBRARY_Update_SRCS
222157
libraries/Update/src/Updater.cpp
223158
libraries/Update/src/HttpsOTAUpdate.cpp)
224159

225-
set(ARDUINO_LIBRARY_USB_SRCS
226-
libraries/USB/src/USBHID.cpp
227-
libraries/USB/src/USBMIDI.cpp
228-
libraries/USB/src/USBHIDMouse.cpp
229-
libraries/USB/src/USBHIDKeyboard.cpp
230-
libraries/USB/src/keyboardLayout/KeyboardLayout_da_DK.cpp
231-
libraries/USB/src/keyboardLayout/KeyboardLayout_de_DE.cpp
232-
libraries/USB/src/keyboardLayout/KeyboardLayout_en_US.cpp
233-
libraries/USB/src/keyboardLayout/KeyboardLayout_es_ES.cpp
234-
libraries/USB/src/keyboardLayout/KeyboardLayout_fr_FR.cpp
235-
libraries/USB/src/keyboardLayout/KeyboardLayout_hu_HU.cpp
236-
libraries/USB/src/keyboardLayout/KeyboardLayout_it_IT.cpp
237-
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_BR.cpp
238-
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_PT.cpp
239-
libraries/USB/src/keyboardLayout/KeyboardLayout_sv_SE.cpp
240-
libraries/USB/src/USBHIDGamepad.cpp
241-
libraries/USB/src/USBHIDConsumerControl.cpp
242-
libraries/USB/src/USBHIDSystemControl.cpp
243-
libraries/USB/src/USBHIDVendor.cpp
244-
libraries/USB/src/USBVendor.cpp)
160+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
161+
set(ARDUINO_LIBRARY_USB_SRCS
162+
libraries/USB/src/USBHID.cpp
163+
libraries/USB/src/USBMIDI.cpp
164+
libraries/USB/src/USBHIDMouse.cpp
165+
libraries/USB/src/USBHIDKeyboard.cpp
166+
libraries/USB/src/keyboardLayout/KeyboardLayout_da_DK.cpp
167+
libraries/USB/src/keyboardLayout/KeyboardLayout_de_DE.cpp
168+
libraries/USB/src/keyboardLayout/KeyboardLayout_en_US.cpp
169+
libraries/USB/src/keyboardLayout/KeyboardLayout_es_ES.cpp
170+
libraries/USB/src/keyboardLayout/KeyboardLayout_fr_FR.cpp
171+
libraries/USB/src/keyboardLayout/KeyboardLayout_hu_HU.cpp
172+
libraries/USB/src/keyboardLayout/KeyboardLayout_it_IT.cpp
173+
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_BR.cpp
174+
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_PT.cpp
175+
libraries/USB/src/keyboardLayout/KeyboardLayout_sv_SE.cpp
176+
libraries/USB/src/USBHIDGamepad.cpp
177+
libraries/USB/src/USBHIDConsumerControl.cpp
178+
libraries/USB/src/USBHIDSystemControl.cpp
179+
libraries/USB/src/USBHIDVendor.cpp
180+
libraries/USB/src/USBVendor.cpp)
181+
endif()
245182

246183
set(ARDUINO_LIBRARY_WebServer_SRCS
247184
libraries/WebServer/src/WebServer.cpp
@@ -252,10 +189,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
252189
libraries/WebServer/src/middleware/CorsMiddleware.cpp
253190
libraries/WebServer/src/middleware/LoggingMiddleware.cpp)
254191

255-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
256-
libraries/NetworkClientSecure/src/ssl_client.cpp
257-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
258-
259192
set(ARDUINO_LIBRARY_Network_SRCS
260193
libraries/Network/src/NetworkInterface.cpp
261194
libraries/Network/src/NetworkEvents.cpp
@@ -274,74 +207,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
274207
libraries/WiFi/src/STA.cpp
275208
libraries/WiFi/src/AP.cpp)
276209

277-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
278-
279210
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
280211

281-
set(ARDUINO_LIBRARY_Zigbee_SRCS
282-
libraries/Zigbee/src/ZigbeeCore.cpp
283-
libraries/Zigbee/src/ZigbeeEP.cpp
284-
libraries/Zigbee/src/ZigbeeHandlers.cpp
285-
libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
286-
libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
287-
libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp
288-
libraries/Zigbee/src/ep/ZigbeeLight.cpp
289-
libraries/Zigbee/src/ep/ZigbeeSwitch.cpp
290-
libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp
291-
libraries/Zigbee/src/ep/ZigbeeThermostat.cpp
292-
libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
293-
libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
294-
libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp
295-
libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
296-
libraries/Zigbee/src/ep/ZigbeeContactSwitch.cpp
297-
libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.cpp
298-
libraries/Zigbee/src/ep/ZigbeeWindowCovering.cpp
299-
libraries/Zigbee/src/ep/ZigbeeVibrationSensor.cpp
300-
libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
301-
libraries/Zigbee/src/ep/ZigbeeRangeExtender.cpp
302-
libraries/Zigbee/src/ep/ZigbeeGateway.cpp
303-
libraries/Zigbee/src/ep/ZigbeeWindSpeedSensor.cpp
304-
libraries/Zigbee/src/ep/ZigbeeIlluminanceSensor.cpp
305-
libraries/Zigbee/src/ep/ZigbeePM25Sensor.cpp
306-
libraries/Zigbee/src/ep/ZigbeeElectricalMeasurement.cpp
307-
libraries/Zigbee/src/ep/ZigbeeBinary.cpp
308-
libraries/Zigbee/src/ep/ZigbeePowerOutlet.cpp
309-
libraries/Zigbee/src/ep/ZigbeeFanControl.cpp
310-
)
311-
312-
set(ARDUINO_LIBRARY_BLE_SRCS
313-
libraries/BLE/src/BLE2901.cpp
314-
libraries/BLE/src/BLE2902.cpp
315-
libraries/BLE/src/BLE2904.cpp
316-
libraries/BLE/src/BLEAddress.cpp
317-
libraries/BLE/src/BLEAdvertisedDevice.cpp
318-
libraries/BLE/src/BLEAdvertising.cpp
319-
libraries/BLE/src/BLEBeacon.cpp
320-
libraries/BLE/src/BLECharacteristic.cpp
321-
libraries/BLE/src/BLECharacteristicMap.cpp
322-
libraries/BLE/src/BLEClient.cpp
323-
libraries/BLE/src/BLEDescriptor.cpp
324-
libraries/BLE/src/BLEDescriptorMap.cpp
325-
libraries/BLE/src/BLEDevice.cpp
326-
libraries/BLE/src/BLEEddystoneTLM.cpp
327-
libraries/BLE/src/BLEEddystoneURL.cpp
328-
libraries/BLE/src/BLEExceptions.cpp
329-
libraries/BLE/src/BLEHIDDevice.cpp
330-
libraries/BLE/src/BLERemoteCharacteristic.cpp
331-
libraries/BLE/src/BLERemoteDescriptor.cpp
332-
libraries/BLE/src/BLERemoteService.cpp
333-
libraries/BLE/src/BLEScan.cpp
334-
libraries/BLE/src/BLESecurity.cpp
335-
libraries/BLE/src/BLEServer.cpp
336-
libraries/BLE/src/BLEService.cpp
337-
libraries/BLE/src/BLEServiceMap.cpp
338-
libraries/BLE/src/BLEUtils.cpp
339-
libraries/BLE/src/BLEUUID.cpp
340-
libraries/BLE/src/BLEValue.cpp
341-
libraries/BLE/src/FreeRTOS.cpp
342-
libraries/BLE/src/GeneralUtils.cpp
343-
)
344-
345212
set(ARDUINO_LIBRARIES_SRCS)
346213
set(ARDUINO_LIBRARIES_REQUIRES)
347214
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -363,15 +230,7 @@ set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRA
363230
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
364231
set(priv_includes cores/esp32/libb64)
365232
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 esp_http_client esp_https_ota)
366-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
367-
368-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
369-
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
370-
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
371-
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2" OR IDF_TARGET STREQUAL "esp32c5") # Sadly only this works
372-
list(APPEND requires openthread)
373-
endif()
374-
endif()
233+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
375234

376235
if(IDF_TARGET STREQUAL "esp32p4")
377236
list(APPEND requires esp_driver_touch_sens)
@@ -422,15 +281,6 @@ endif()
422281
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)
423282
maybe_add_component(esp_https_ota)
424283
endif()
425-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ESP_SR)
426-
maybe_add_component(espressif__esp_sr)
427-
endif()
428-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_Matter)
429-
maybe_add_component(espressif__esp_matter)
430-
endif()
431284
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LittleFS)
432285
maybe_add_component(joltwallet__littlefs)
433286
endif()
434-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv)
435-
maybe_add_component(espressif__network_provisioning)
436-
endif()

0 commit comments

Comments
 (0)