Skip to content

Commit c768275

Browse files
Jason2866Jason2866
authored
Tasmota changes
* optional Ethernet support (JL1101 driver added) * esp-modem only esp32, esp32s2 and esp32s3 * remove `OpenThread` * remove all BT 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 9cad83b commit c768275

File tree

21 files changed

+98
-528
lines changed

21 files changed

+98
-528
lines changed

‎CMakeLists.txt

Lines changed: 34 additions & 179 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ 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
31-
cores/esp32/esp32-hal-bt.c
3230
cores/esp32/esp32-hal-cpu.c
3331
cores/esp32/esp32-hal-dac.c
3432
cores/esp32/esp32-hal-gpio.c
@@ -44,8 +42,7 @@ set(CORE_SRCS
4442
cores/esp32/esp32-hal-sigmadelta.c
4543
cores/esp32/esp32-hal-spi.c
4644
cores/esp32/esp32-hal-time.c
47-
cores/esp32/esp32-hal-timer.c
48-
cores/esp32/esp32-hal-tinyusb.c
45+
cores/esp32/esp32-hal-timer.c
4946
cores/esp32/esp32-hal-touch.c
5047
cores/esp32/esp32-hal-touch-ng.c
5148
cores/esp32/esp32-hal-uart.c
@@ -68,82 +65,58 @@ set(CORE_SRCS
6865
cores/esp32/StreamString.cpp
6966
cores/esp32/Tone.cpp
7067
cores/esp32/HWCDC.cpp
71-
cores/esp32/USB.cpp
72-
cores/esp32/USBCDC.cpp
73-
cores/esp32/USBMSC.cpp
7468
cores/esp32/FirmwareMSC.cpp
7569
cores/esp32/firmware_msc_fat.c
7670
cores/esp32/wiring_pulse.c
7771
cores/esp32/wiring_shift.c
7872
cores/esp32/WMath.cpp
7973
cores/esp32/WString.cpp
8074
)
75+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
76+
list(APPEND CORE_SRCS
77+
cores/esp32/esp32-hal-tinyusb.c
78+
cores/esp32/USB.cpp
79+
cores/esp32/USBCDC.cpp
80+
cores/esp32/USBMSC.cpp)
81+
endif()
8182

8283
set(ARDUINO_ALL_LIBRARIES
8384
ArduinoOTA
8485
AsyncUDP
85-
BLE
86-
BluetoothSerial
8786
DNSServer
8887
EEPROM
89-
ESP_I2S
90-
ESP_NOW
91-
ESP_SR
9288
ESPmDNS
9389
Ethernet
9490
FFat
9591
FS
9692
HTTPClient
9793
HTTPUpdate
98-
Insights
9994
LittleFS
100-
Matter
10195
NetBIOS
10296
Network
103-
OpenThread
10497
PPP
10598
Preferences
106-
RainMaker
10799
SD_MMC
108100
SD
109-
SimpleBLE
110-
SPIFFS
111101
SPI
112102
Ticker
113103
Update
114-
USB
115104
WebServer
116-
NetworkClientSecure
117105
WiFi
118-
WiFiProv
119106
Wire
120-
Zigbee
121107
)
108+
if(IDF_TARGET MATCHES "esp32s2|esp32s3|esp32p4" AND CONFIG_TINYUSB_ENABLED)
109+
list(APPEND ARDUINO_ALL_LIBRARIES USB)
110+
endif()
122111

123112
set(ARDUINO_LIBRARY_ArduinoOTA_SRCS libraries/ArduinoOTA/src/ArduinoOTA.cpp)
124113

125114
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
126115

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-
133116
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
134117

135118
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
136119

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-
147120
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
148121

149122
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -158,60 +131,23 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
158131

159132
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
160133

161-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
162-
163134
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
164135

165136
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
166137

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

192142
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
193143

194-
set(ARDUINO_LIBRARY_RainMaker_SRCS
195-
libraries/RainMaker/src/RMaker.cpp
196-
libraries/RainMaker/src/RMakerNode.cpp
197-
libraries/RainMaker/src/RMakerParam.cpp
198-
libraries/RainMaker/src/RMakerDevice.cpp
199-
libraries/RainMaker/src/RMakerType.cpp
200-
libraries/RainMaker/src/RMakerQR.cpp
201-
libraries/RainMaker/src/RMakerUtils.cpp
202-
libraries/RainMaker/src/AppInsights.cpp)
203-
204144
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
205145

206146
set(ARDUINO_LIBRARY_SD_SRCS
207147
libraries/SD/src/SD.cpp
208148
libraries/SD/src/sd_diskio.cpp
209149
libraries/SD/src/sd_diskio_crc.c)
210150

211-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
212-
213-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
214-
215151
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
216152

217153
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -220,26 +156,28 @@ set(ARDUINO_LIBRARY_Update_SRCS
220156
libraries/Update/src/Updater.cpp
221157
libraries/Update/src/HttpsOTAUpdate.cpp)
222158

223-
set(ARDUINO_LIBRARY_USB_SRCS
224-
libraries/USB/src/USBHID.cpp
225-
libraries/USB/src/USBMIDI.cpp
226-
libraries/USB/src/USBHIDMouse.cpp
227-
libraries/USB/src/USBHIDKeyboard.cpp
228-
libraries/USB/src/keyboardLayout/KeyboardLayout_da_DK.cpp
229-
libraries/USB/src/keyboardLayout/KeyboardLayout_de_DE.cpp
230-
libraries/USB/src/keyboardLayout/KeyboardLayout_en_US.cpp
231-
libraries/USB/src/keyboardLayout/KeyboardLayout_es_ES.cpp
232-
libraries/USB/src/keyboardLayout/KeyboardLayout_fr_FR.cpp
233-
libraries/USB/src/keyboardLayout/KeyboardLayout_hu_HU.cpp
234-
libraries/USB/src/keyboardLayout/KeyboardLayout_it_IT.cpp
235-
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_BR.cpp
236-
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_PT.cpp
237-
libraries/USB/src/keyboardLayout/KeyboardLayout_sv_SE.cpp
238-
libraries/USB/src/USBHIDGamepad.cpp
239-
libraries/USB/src/USBHIDConsumerControl.cpp
240-
libraries/USB/src/USBHIDSystemControl.cpp
241-
libraries/USB/src/USBHIDVendor.cpp
242-
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/keyboardLayout/KeyboardLayout_da_DK.cpp
166+
libraries/USB/src/keyboardLayout/KeyboardLayout_de_DE.cpp
167+
libraries/USB/src/keyboardLayout/KeyboardLayout_en_US.cpp
168+
libraries/USB/src/keyboardLayout/KeyboardLayout_es_ES.cpp
169+
libraries/USB/src/keyboardLayout/KeyboardLayout_fr_FR.cpp
170+
libraries/USB/src/keyboardLayout/KeyboardLayout_hu_HU.cpp
171+
libraries/USB/src/keyboardLayout/KeyboardLayout_it_IT.cpp
172+
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_BR.cpp
173+
libraries/USB/src/keyboardLayout/KeyboardLayout_pt_PT.cpp
174+
libraries/USB/src/keyboardLayout/KeyboardLayout_sv_SE.cpp
175+
libraries/USB/src/USBHIDGamepad.cpp
176+
libraries/USB/src/USBHIDConsumerControl.cpp
177+
libraries/USB/src/USBHIDSystemControl.cpp
178+
libraries/USB/src/USBHIDVendor.cpp
179+
libraries/USB/src/USBVendor.cpp)
180+
endif()
243181

244182
set(ARDUINO_LIBRARY_WebServer_SRCS
245183
libraries/WebServer/src/WebServer.cpp
@@ -250,10 +188,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
250188
libraries/WebServer/src/middleware/CorsMiddleware.cpp
251189
libraries/WebServer/src/middleware/LoggingMiddleware.cpp)
252190

253-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
254-
libraries/NetworkClientSecure/src/ssl_client.cpp
255-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
256-
257191
set(ARDUINO_LIBRARY_Network_SRCS
258192
libraries/Network/src/NetworkInterface.cpp
259193
libraries/Network/src/NetworkEvents.cpp
@@ -272,70 +206,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
272206
libraries/WiFi/src/STA.cpp
273207
libraries/WiFi/src/AP.cpp)
274208

275-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
276-
277209
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
278210

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

370234
if(IDF_TARGET STREQUAL "esp32p4")
371235
list(APPEND requires esp_driver_touch_sens)
@@ -416,15 +280,6 @@ endif()
416280
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)
417281
maybe_add_component(esp_https_ota)
418282
endif()
419-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ESP_SR)
420-
maybe_add_component(espressif__esp_sr)
421-
endif()
422-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_Matter)
423-
maybe_add_component(espressif__esp_matter)
424-
endif()
425283
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LittleFS)
426284
maybe_add_component(joltwallet__littlefs)
427285
endif()
428-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv)
429-
maybe_add_component(espressif__network_provisioning)
430-
endif()

0 commit comments

Comments
 (0)