Skip to content

Commit 3d436f0

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
1 parent 491e2d2 commit 3d436f0

Some content is hidden

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

44 files changed

+109
-324609
lines changed

‎CMakeLists.txt‎

Lines changed: 35 additions & 187 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
@@ -45,8 +44,7 @@ set(CORE_SRCS
4544
cores/esp32/esp32-hal-sigmadelta.c
4645
cores/esp32/esp32-hal-spi.c
4746
cores/esp32/esp32-hal-time.c
48-
cores/esp32/esp32-hal-timer.c
49-
cores/esp32/esp32-hal-tinyusb.c
47+
cores/esp32/esp32-hal-timer.c
5048
cores/esp32/esp32-hal-touch.c
5149
cores/esp32/esp32-hal-touch-ng.c
5250
cores/esp32/esp32-hal-uart.c
@@ -69,83 +67,59 @@ set(CORE_SRCS
6967
cores/esp32/StreamString.cpp
7068
cores/esp32/Tone.cpp
7169
cores/esp32/HWCDC.cpp
72-
cores/esp32/USB.cpp
73-
cores/esp32/USBCDC.cpp
74-
cores/esp32/USBMSC.cpp
7570
cores/esp32/FirmwareMSC.cpp
7671
cores/esp32/firmware_msc_fat.c
7772
cores/esp32/wiring_pulse.c
7873
cores/esp32/wiring_shift.c
7974
cores/esp32/WMath.cpp
8075
cores/esp32/WString.cpp
8176
)
77+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
78+
list(APPEND CORE_SRCS
79+
cores/esp32/esp32-hal-tinyusb.c
80+
cores/esp32/USB.cpp
81+
cores/esp32/USBCDC.cpp
82+
cores/esp32/USBMSC.cpp)
83+
endif()
8284

8385
set(ARDUINO_ALL_LIBRARIES
8486
ArduinoOTA
8587
AsyncUDP
86-
BLE
87-
BluetoothSerial
8888
DNSServer
8989
EEPROM
90-
ESP_I2S
91-
ESP_NOW
92-
ESP_SR
9390
ESPmDNS
9491
Ethernet
9592
FFat
9693
FS
9794
Hash
9895
HTTPClient
9996
HTTPUpdate
100-
Insights
10197
LittleFS
102-
Matter
10398
NetBIOS
10499
Network
105-
OpenThread
106100
PPP
107101
Preferences
108-
RainMaker
109102
SD_MMC
110103
SD
111-
SimpleBLE
112-
SPIFFS
113104
SPI
114105
Ticker
115106
Update
116-
USB
117107
WebServer
118-
NetworkClientSecure
119108
WiFi
120-
WiFiProv
121109
Wire
122-
Zigbee
123110
)
111+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
112+
list(APPEND ARDUINO_ALL_LIBRARIES USB)
113+
endif()
124114

125115
set(ARDUINO_LIBRARY_ArduinoOTA_SRCS libraries/ArduinoOTA/src/ArduinoOTA.cpp)
126116

127117
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
128118

129-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
130-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
131-
libraries/BluetoothSerial/src/BTAddress.cpp
132-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
133-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
134-
135119
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
136120

137121
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
138122

139-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
140-
141-
set(ARDUINO_LIBRARY_ESP_NOW_SRCS
142-
libraries/ESP_NOW/src/ESP32_NOW.cpp
143-
libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp)
144-
145-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
146-
libraries/ESP_SR/src/ESP_SR.cpp
147-
libraries/ESP_SR/src/esp32-hal-sr.c)
148-
149123
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
150124

151125
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -160,69 +134,29 @@ set(ARDUINO_LIBRARY_Hash_SRCS
160134
libraries/Hash/src/SHA1Builder.cpp
161135
libraries/Hash/src/SHA2Builder.cpp
162136
libraries/Hash/src/SHA3Builder.cpp
163-
libraries/Hash/src/PBKDF2_HMACBuilder.cpp
164-
)
137+
libraries/Hash/src/PBKDF2_HMACBuilder.cpp)
165138

166139
set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
167140

168141
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
169142

170-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
171-
172143
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
173144

174145
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
175146

176-
set(ARDUINO_LIBRARY_OpenThread_SRCS
177-
libraries/OpenThread/src/OThread.cpp
178-
libraries/OpenThread/src/OThreadCLI.cpp
179-
libraries/OpenThread/src/OThreadCLI_Util.cpp)
180-
181-
set(ARDUINO_LIBRARY_Matter_SRCS
182-
libraries/Matter/src/MatterEndpoints/MatterGenericSwitch.cpp
183-
libraries/Matter/src/MatterEndpoints/MatterOnOffLight.cpp
184-
libraries/Matter/src/MatterEndpoints/MatterDimmableLight.cpp
185-
libraries/Matter/src/MatterEndpoints/MatterColorTemperatureLight.cpp
186-
libraries/Matter/src/MatterEndpoints/MatterColorLight.cpp
187-
libraries/Matter/src/MatterEndpoints/MatterEnhancedColorLight.cpp
188-
libraries/Matter/src/MatterEndpoints/MatterFan.cpp
189-
libraries/Matter/src/MatterEndpoints/MatterTemperatureSensor.cpp
190-
libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp
191-
libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp
192-
libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp
193-
libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp
194-
libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
195-
libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp
196-
libraries/Matter/src/Matter.cpp
197-
libraries/Matter/src/MatterEndPoint.cpp)
198-
199147
set(ARDUINO_LIBRARY_PPP_SRCS
200148
libraries/PPP/src/PPP.cpp
201149
libraries/PPP/src/ppp.c)
202150

203151
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
204152

205-
set(ARDUINO_LIBRARY_RainMaker_SRCS
206-
libraries/RainMaker/src/RMaker.cpp
207-
libraries/RainMaker/src/RMakerNode.cpp
208-
libraries/RainMaker/src/RMakerParam.cpp
209-
libraries/RainMaker/src/RMakerDevice.cpp
210-
libraries/RainMaker/src/RMakerType.cpp
211-
libraries/RainMaker/src/RMakerQR.cpp
212-
libraries/RainMaker/src/RMakerUtils.cpp
213-
libraries/RainMaker/src/AppInsights.cpp)
214-
215153
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
216154

217155
set(ARDUINO_LIBRARY_SD_SRCS
218156
libraries/SD/src/SD.cpp
219157
libraries/SD/src/sd_diskio.cpp
220158
libraries/SD/src/sd_diskio_crc.c)
221159

222-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
223-
224-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
225-
226160
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
227161

228162
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -231,26 +165,28 @@ set(ARDUINO_LIBRARY_Update_SRCS
231165
libraries/Update/src/Updater.cpp
232166
libraries/Update/src/HttpsOTAUpdate.cpp)
233167

234-
set(ARDUINO_LIBRARY_USB_SRCS
235-
libraries/USB/src/USBHID.cpp
236-
libraries/USB/src/USBMIDI.cpp
237-
libraries/USB/src/USBHIDMouse.cpp
238-
libraries/USB/src/USBHIDKeyboard.cpp
239-
libraries/USB/src/keyboardLayout/KeyboardLayout_da_DK.cpp
240-
libraries/USB/src/keyboardLayout/KeyboardLayout_de_DE.cpp
241-
libraries/USB/src/keyboardLayout/KeyboardLayout_en_US.cpp
242-
libraries/USB/src/keyboardLayout/KeyboardLayout_es_ES.cpp
243-
libraries/USB/src/keyboardLayout/KeyboardLayout_fr_FR.cpp
244-
libraries/USB/src/keyboardLayout/KeyboardLayout_hu_HU.cpp
245-
libraries/USB/src/keyboardLayout/KeyboardLayout_it_IT.cpp
246-
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_BR.cpp
247-
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_PT.cpp
248-
libraries/USB/src/keyboardLayout/KeyboardLayout_sv_SE.cpp
249-
libraries/USB/src/USBHIDGamepad.cpp
250-
libraries/USB/src/USBHIDConsumerControl.cpp
251-
libraries/USB/src/USBHIDSystemControl.cpp
252-
libraries/USB/src/USBHIDVendor.cpp
253-
libraries/USB/src/USBVendor.cpp)
168+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
169+
set(ARDUINO_LIBRARY_USB_SRCS
170+
libraries/USB/src/USBHID.cpp
171+
libraries/USB/src/USBMIDI.cpp
172+
libraries/USB/src/USBHIDMouse.cpp
173+
libraries/USB/src/USBHIDKeyboard.cpp
174+
libraries/USB/src/keyboardLayout/KeyboardLayout_da_DK.cpp
175+
libraries/USB/src/keyboardLayout/KeyboardLayout_de_DE.cpp
176+
libraries/USB/src/keyboardLayout/KeyboardLayout_en_US.cpp
177+
libraries/USB/src/keyboardLayout/KeyboardLayout_es_ES.cpp
178+
libraries/USB/src/keyboardLayout/KeyboardLayout_fr_FR.cpp
179+
libraries/USB/src/keyboardLayout/KeyboardLayout_hu_HU.cpp
180+
libraries/USB/src/keyboardLayout/KeyboardLayout_it_IT.cpp
181+
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_BR.cpp
182+
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_PT.cpp
183+
libraries/USB/src/keyboardLayout/KeyboardLayout_sv_SE.cpp
184+
libraries/USB/src/USBHIDGamepad.cpp
185+
libraries/USB/src/USBHIDConsumerControl.cpp
186+
libraries/USB/src/USBHIDSystemControl.cpp
187+
libraries/USB/src/USBHIDVendor.cpp
188+
libraries/USB/src/USBVendor.cpp)
189+
endif()
254190

255191
set(ARDUINO_LIBRARY_WebServer_SRCS
256192
libraries/WebServer/src/WebServer.cpp
@@ -261,10 +197,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
261197
libraries/WebServer/src/middleware/CorsMiddleware.cpp
262198
libraries/WebServer/src/middleware/LoggingMiddleware.cpp)
263199

264-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
265-
libraries/NetworkClientSecure/src/ssl_client.cpp
266-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
267-
268200
set(ARDUINO_LIBRARY_Network_SRCS
269201
libraries/Network/src/NetworkInterface.cpp
270202
libraries/Network/src/NetworkEvents.cpp
@@ -283,75 +215,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
283215
libraries/WiFi/src/STA.cpp
284216
libraries/WiFi/src/AP.cpp)
285217

286-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
287-
288218
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
289219

290-
set(ARDUINO_LIBRARY_Zigbee_SRCS
291-
libraries/Zigbee/src/ZigbeeCore.cpp
292-
libraries/Zigbee/src/ZigbeeEP.cpp
293-
libraries/Zigbee/src/ZigbeeHandlers.cpp
294-
libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
295-
libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
296-
libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp
297-
libraries/Zigbee/src/ep/ZigbeeLight.cpp
298-
libraries/Zigbee/src/ep/ZigbeeSwitch.cpp
299-
libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp
300-
libraries/Zigbee/src/ep/ZigbeeThermostat.cpp
301-
libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
302-
libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
303-
libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp
304-
libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
305-
libraries/Zigbee/src/ep/ZigbeeContactSwitch.cpp
306-
libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.cpp
307-
libraries/Zigbee/src/ep/ZigbeeWindowCovering.cpp
308-
libraries/Zigbee/src/ep/ZigbeeVibrationSensor.cpp
309-
libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
310-
libraries/Zigbee/src/ep/ZigbeeRangeExtender.cpp
311-
libraries/Zigbee/src/ep/ZigbeeGateway.cpp
312-
libraries/Zigbee/src/ep/ZigbeeWindSpeedSensor.cpp
313-
libraries/Zigbee/src/ep/ZigbeeIlluminanceSensor.cpp
314-
libraries/Zigbee/src/ep/ZigbeePM25Sensor.cpp
315-
libraries/Zigbee/src/ep/ZigbeeElectricalMeasurement.cpp
316-
libraries/Zigbee/src/ep/ZigbeeBinary.cpp
317-
libraries/Zigbee/src/ep/ZigbeePowerOutlet.cpp
318-
libraries/Zigbee/src/ep/ZigbeeFanControl.cpp
319-
libraries/Zigbee/src/ep/ZigbeeMultistate.cpp
320-
)
321-
322-
set(ARDUINO_LIBRARY_BLE_SRCS
323-
libraries/BLE/src/BLE2901.cpp
324-
libraries/BLE/src/BLE2902.cpp
325-
libraries/BLE/src/BLE2904.cpp
326-
libraries/BLE/src/BLEAddress.cpp
327-
libraries/BLE/src/BLEAdvertisedDevice.cpp
328-
libraries/BLE/src/BLEAdvertising.cpp
329-
libraries/BLE/src/BLEBeacon.cpp
330-
libraries/BLE/src/BLECharacteristic.cpp
331-
libraries/BLE/src/BLECharacteristicMap.cpp
332-
libraries/BLE/src/BLEClient.cpp
333-
libraries/BLE/src/BLEDescriptor.cpp
334-
libraries/BLE/src/BLEDescriptorMap.cpp
335-
libraries/BLE/src/BLEDevice.cpp
336-
libraries/BLE/src/BLEEddystoneTLM.cpp
337-
libraries/BLE/src/BLEEddystoneURL.cpp
338-
libraries/BLE/src/BLEExceptions.cpp
339-
libraries/BLE/src/BLEHIDDevice.cpp
340-
libraries/BLE/src/BLERemoteCharacteristic.cpp
341-
libraries/BLE/src/BLERemoteDescriptor.cpp
342-
libraries/BLE/src/BLERemoteService.cpp
343-
libraries/BLE/src/BLEScan.cpp
344-
libraries/BLE/src/BLESecurity.cpp
345-
libraries/BLE/src/BLEServer.cpp
346-
libraries/BLE/src/BLEService.cpp
347-
libraries/BLE/src/BLEServiceMap.cpp
348-
libraries/BLE/src/BLEUtils.cpp
349-
libraries/BLE/src/BLEUUID.cpp
350-
libraries/BLE/src/BLEValue.cpp
351-
libraries/BLE/src/FreeRTOS.cpp
352-
libraries/BLE/src/GeneralUtils.cpp
353-
)
354-
355220
set(ARDUINO_LIBRARIES_SRCS)
356221
set(ARDUINO_LIBRARIES_REQUIRES)
357222
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -373,15 +238,7 @@ set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRA
373238
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
374239
set(priv_includes cores/esp32/libb64)
375240
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)
376-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
377-
378-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
379-
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
380-
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
381-
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2" OR IDF_TARGET STREQUAL "esp32c5") # Sadly only this works
382-
list(APPEND requires openthread)
383-
endif()
384-
endif()
241+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
385242

386243
if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET STREQUAL "esp32s3" OR IDF_TARGET STREQUAL "esp32p4")
387244
list(APPEND requires esp_driver_touch_sens)
@@ -432,15 +289,6 @@ endif()
432289
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)
433290
maybe_add_component(esp_https_ota)
434291
endif()
435-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ESP_SR)
436-
maybe_add_component(espressif__esp_sr)
437-
endif()
438-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_Matter)
439-
maybe_add_component(espressif__esp_matter)
440-
endif()
441292
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LittleFS)
442293
maybe_add_component(joltwallet__littlefs)
443294
endif()
444-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv)
445-
maybe_add_component(espressif__network_provisioning)
446-
endif()

0 commit comments

Comments
 (0)