Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5b04646

Browse filesBrowse 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 72a582b commit 5b04646
Copy full SHA for 5b04646

File tree

Expand file treeCollapse file tree

16 files changed

+95
-394
lines changed
Filter options
Expand file treeCollapse file tree

16 files changed

+95
-394
lines changed

‎CMakeLists.txt

Copy file name to clipboardExpand all lines: CMakeLists.txt
+34-181Lines changed: 34 additions & 181 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,60 +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/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-
188139
set(ARDUINO_LIBRARY_PPP_SRCS
189140
libraries/PPP/src/PPP.cpp
190141
libraries/PPP/src/ppp.c)
191142

192143
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
193144

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-
204145
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
205146

206147
set(ARDUINO_LIBRARY_SD_SRCS
207148
libraries/SD/src/SD.cpp
208149
libraries/SD/src/sd_diskio.cpp
209150
libraries/SD/src/sd_diskio_crc.c)
210151

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

217154
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -220,26 +157,28 @@ set(ARDUINO_LIBRARY_Update_SRCS
220157
libraries/Update/src/Updater.cpp
221158
libraries/Update/src/HttpsOTAUpdate.cpp)
222159

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)
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()
243182

244183
set(ARDUINO_LIBRARY_WebServer_SRCS
245184
libraries/WebServer/src/WebServer.cpp
@@ -250,10 +189,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
250189
libraries/WebServer/src/middleware/CorsMiddleware.cpp
251190
libraries/WebServer/src/middleware/LoggingMiddleware.cpp)
252191

253-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
254-
libraries/NetworkClientSecure/src/ssl_client.cpp
255-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
256-
257192
set(ARDUINO_LIBRARY_Network_SRCS
258193
libraries/Network/src/NetworkInterface.cpp
259194
libraries/Network/src/NetworkEvents.cpp
@@ -272,73 +207,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
272207
libraries/WiFi/src/STA.cpp
273208
libraries/WiFi/src/AP.cpp)
274209

275-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
276-
277210
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
278211

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-
libraries/Zigbee/src/ep/ZigbeeElectricalMeasurement.cpp
305-
libraries/Zigbee/src/ep/ZigbeeBinary.cpp
306-
libraries/Zigbee/src/ep/ZigbeePowerOutlet.cpp
307-
)
308-
309-
set(ARDUINO_LIBRARY_BLE_SRCS
310-
libraries/BLE/src/BLE2901.cpp
311-
libraries/BLE/src/BLE2902.cpp
312-
libraries/BLE/src/BLE2904.cpp
313-
libraries/BLE/src/BLEAddress.cpp
314-
libraries/BLE/src/BLEAdvertisedDevice.cpp
315-
libraries/BLE/src/BLEAdvertising.cpp
316-
libraries/BLE/src/BLEBeacon.cpp
317-
libraries/BLE/src/BLECharacteristic.cpp
318-
libraries/BLE/src/BLECharacteristicMap.cpp
319-
libraries/BLE/src/BLEClient.cpp
320-
libraries/BLE/src/BLEDescriptor.cpp
321-
libraries/BLE/src/BLEDescriptorMap.cpp
322-
libraries/BLE/src/BLEDevice.cpp
323-
libraries/BLE/src/BLEEddystoneTLM.cpp
324-
libraries/BLE/src/BLEEddystoneURL.cpp
325-
libraries/BLE/src/BLEExceptions.cpp
326-
libraries/BLE/src/BLEHIDDevice.cpp
327-
libraries/BLE/src/BLERemoteCharacteristic.cpp
328-
libraries/BLE/src/BLERemoteDescriptor.cpp
329-
libraries/BLE/src/BLERemoteService.cpp
330-
libraries/BLE/src/BLEScan.cpp
331-
libraries/BLE/src/BLESecurity.cpp
332-
libraries/BLE/src/BLEServer.cpp
333-
libraries/BLE/src/BLEService.cpp
334-
libraries/BLE/src/BLEServiceMap.cpp
335-
libraries/BLE/src/BLEUtils.cpp
336-
libraries/BLE/src/BLEUUID.cpp
337-
libraries/BLE/src/BLEValue.cpp
338-
libraries/BLE/src/FreeRTOS.cpp
339-
libraries/BLE/src/GeneralUtils.cpp
340-
)
341-
342212
set(ARDUINO_LIBRARIES_SRCS)
343213
set(ARDUINO_LIBRARIES_REQUIRES)
344214
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -360,15 +230,7 @@ set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRA
360230
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
361231
set(priv_includes cores/esp32/libb64)
362232
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)
363-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
364-
365-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)
366-
#if(CONFIG_SOC_IEEE802154_SUPPORTED) # Does not work!
367-
#if(CONFIG_OPENTHREAD_ENABLED) # Does not work!
368-
if(IDF_TARGET STREQUAL "esp32c6" OR IDF_TARGET STREQUAL "esp32h2") # Sadly only this works
369-
list(APPEND requires openthread)
370-
endif()
371-
endif()
233+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
372234

373235
if(IDF_TARGET STREQUAL "esp32p4")
374236
list(APPEND requires esp_driver_touch_sens)
@@ -419,15 +281,6 @@ endif()
419281
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)
420282
maybe_add_component(esp_https_ota)
421283
endif()
422-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ESP_SR)
423-
maybe_add_component(espressif__esp_sr)
424-
endif()
425-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_Matter)
426-
maybe_add_component(espressif__esp_matter)
427-
endif()
428284
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LittleFS)
429285
maybe_add_component(joltwallet__littlefs)
430286
endif()
431-
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv)
432-
maybe_add_component(espressif__network_provisioning)
433-
endif()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.