Skip to content

Commit 3b6558a

Browse files
Jason2866Jason2866
authored
Tasmota changes
1 parent 1a504a6 commit 3b6558a

35 files changed

+898
-256
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -90,24 +90,13 @@ set(LIBRARY_SRCS
9090
libraries/HTTPClient/src/HTTPClient.cpp
9191
libraries/HTTPUpdate/src/HTTPUpdate.cpp
9292
libraries/LittleFS/src/LittleFS.cpp
93-
libraries/Insights/src/Insights.cpp
9493
libraries/I2S/src/I2S.cpp
9594
libraries/NetBIOS/src/NetBIOS.cpp
9695
libraries/Preferences/src/Preferences.cpp
97-
libraries/RainMaker/src/RMaker.cpp
98-
libraries/RainMaker/src/RMakerNode.cpp
99-
libraries/RainMaker/src/RMakerParam.cpp
100-
libraries/RainMaker/src/RMakerDevice.cpp
101-
libraries/RainMaker/src/RMakerType.cpp
102-
libraries/RainMaker/src/RMakerQR.cpp
103-
libraries/RainMaker/src/RMakerUtils.cpp
104-
libraries/RainMaker/src/AppInsights.cpp
10596
libraries/SD_MMC/src/SD_MMC.cpp
10697
libraries/SD/src/SD.cpp
10798
libraries/SD/src/sd_diskio.cpp
10899
libraries/SD/src/sd_diskio_crc.c
109-
libraries/SimpleBLE/src/SimpleBLE.cpp
110-
libraries/SPIFFS/src/SPIFFS.cpp
111100
libraries/SPI/src/SPI.cpp
112101
libraries/Ticker/src/Ticker.cpp
113102
libraries/Update/src/Updater.cpp
@@ -134,83 +123,43 @@ set(LIBRARY_SRCS
134123
libraries/WiFi/src/WiFiServer.cpp
135124
libraries/WiFi/src/WiFiSTA.cpp
136125
libraries/WiFi/src/WiFiUdp.cpp
137-
libraries/WiFiProv/src/WiFiProv.cpp
138126
libraries/Wire/src/Wire.cpp
139127
)
140128

141-
set(BLE_SRCS
142-
libraries/BLE/src/BLE2902.cpp
143-
libraries/BLE/src/BLE2904.cpp
144-
libraries/BLE/src/BLEAddress.cpp
145-
libraries/BLE/src/BLEAdvertisedDevice.cpp
146-
libraries/BLE/src/BLEAdvertising.cpp
147-
libraries/BLE/src/BLEBeacon.cpp
148-
libraries/BLE/src/BLECharacteristic.cpp
149-
libraries/BLE/src/BLECharacteristicMap.cpp
150-
libraries/BLE/src/BLEClient.cpp
151-
libraries/BLE/src/BLEDescriptor.cpp
152-
libraries/BLE/src/BLEDescriptorMap.cpp
153-
libraries/BLE/src/BLEDevice.cpp
154-
libraries/BLE/src/BLEEddystoneTLM.cpp
155-
libraries/BLE/src/BLEEddystoneURL.cpp
156-
libraries/BLE/src/BLEExceptions.cpp
157-
libraries/BLE/src/BLEHIDDevice.cpp
158-
libraries/BLE/src/BLERemoteCharacteristic.cpp
159-
libraries/BLE/src/BLERemoteDescriptor.cpp
160-
libraries/BLE/src/BLERemoteService.cpp
161-
libraries/BLE/src/BLEScan.cpp
162-
libraries/BLE/src/BLESecurity.cpp
163-
libraries/BLE/src/BLEServer.cpp
164-
libraries/BLE/src/BLEService.cpp
165-
libraries/BLE/src/BLEServiceMap.cpp
166-
libraries/BLE/src/BLEUtils.cpp
167-
libraries/BLE/src/BLEUUID.cpp
168-
libraries/BLE/src/BLEValue.cpp
169-
libraries/BLE/src/FreeRTOS.cpp
170-
libraries/BLE/src/GeneralUtils.cpp
171-
)
172-
173129
set(includedirs
174130
variants/${CONFIG_ARDUINO_VARIANT}/
175131
cores/esp32/
176132
libraries/ArduinoOTA/src
177133
libraries/AsyncUDP/src
178-
libraries/BLE/src
179134
libraries/BluetoothSerial/src
180135
libraries/DNSServer/src
181136
libraries/EEPROM/src
182-
libraries/ESP32/src
183137
libraries/ESPmDNS/src
184138
libraries/Ethernet/src
185139
libraries/FFat/src
186140
libraries/FS/src
187141
libraries/HTTPClient/src
188142
libraries/HTTPUpdate/src
189143
libraries/LittleFS/src
190-
libraries/Insights/src
191144
libraries/I2S/src
192145
libraries/NetBIOS/src
193146
libraries/Preferences/src
194-
libraries/RainMaker/src
195147
libraries/SD_MMC/src
196148
libraries/SD/src
197-
libraries/SimpleBLE/src
198-
libraries/SPIFFS/src
199149
libraries/SPI/src
200150
libraries/Ticker/src
201151
libraries/Update/src
202152
libraries/USB/src
203153
libraries/WebServer/src
204154
libraries/WiFiClientSecure/src
205155
libraries/WiFi/src
206-
libraries/WiFiProv/src
207156
libraries/Wire/src
208157
)
209158

210-
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
159+
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS})
211160
set(priv_includes cores/esp32/libb64)
212161
set(requires spi_flash mbedtls mdns wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
213-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid)
162+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid)
214163

215164
idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
216165

@@ -253,13 +202,6 @@ endfunction()
253202

254203
maybe_add_component(esp-dsp)
255204

256-
if(CONFIG_ESP_INSIGHTS_ENABLED)
257-
maybe_add_component(esp_insights)
258-
endif()
259-
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
260-
maybe_add_component(esp_rainmaker)
261-
maybe_add_component(qrcode)
262-
endif()
263205
if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
264206
maybe_add_component(arduino_tinyusb)
265207
endif()

‎boards.txt

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,159 @@ esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
590590

591591
##############################################################
592592

593+
esp32c2.name=ESP32C2 Dev Module
594+
595+
esp32c2.bootloader.tool=esptool_py
596+
esp32c2.bootloader.tool.default=esptool_py
597+
598+
esp32c2.upload.tool=esptool_py
599+
esp32c2.upload.tool.default=esptool_py
600+
esp32c2.upload.tool.network=esp_ota
601+
602+
esp32c2.upload.maximum_size=1310720
603+
esp32c2.upload.maximum_data_size=262144
604+
esp32c2.upload.flags=
605+
esp32c2.upload.extra_flags=
606+
esp32c2.upload.use_1200bps_touch=false
607+
esp32c2.upload.wait_for_upload_port=false
608+
609+
esp32c2.serial.disableDTR=false
610+
esp32c2.serial.disableRTS=false
611+
612+
esp32c2.build.tarch=riscv32
613+
esp32c2.build.target=esp
614+
esp32c2.build.mcu=esp32c2
615+
esp32c2.build.core=esp32
616+
esp32c2.build.variant=esp32c2
617+
esp32c2.build.board=ESP32C2_DEV
618+
esp32c2.build.bootloader_addr=0x0
619+
620+
esp32c2.build.cdc_on_boot=0
621+
esp32c2.build.f_cpu=120000000L
622+
esp32c2.build.flash_size=4MB
623+
esp32c2.build.flash_freq=60m
624+
esp32c2.build.flash_mode=qio
625+
esp32c2.build.boot=qio
626+
esp32c2.build.partitions=default
627+
esp32c2.build.defines=
628+
629+
## IDE 2.0 Seems to not update the value
630+
esp32c2.menu.JTAGAdapter.default=Disabled
631+
esp32c2.menu.JTAGAdapter.default.build.copy_jtag_files=0
632+
esp32c2.menu.JTAGAdapter.external=FTDI Adapter
633+
esp32c2.menu.JTAGAdapter.external.build.openocdscript=esp32c2-ftdi.cfg
634+
esp32c2.menu.JTAGAdapter.external.build.copy_jtag_files=1
635+
esp32c2.menu.JTAGAdapter.bridge=ESP USB Bridge
636+
esp32c2.menu.JTAGAdapter.bridge.build.openocdscript=esp32c2-bridge.cfg
637+
esp32c2.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
638+
639+
esp32c2.menu.CDCOnBoot.default=Disabled
640+
esp32c2.menu.CDCOnBoot.default.build.cdc_on_boot=0
641+
esp32c2.menu.CDCOnBoot.cdc=Enabled
642+
esp32c2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
643+
644+
esp32c2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
645+
esp32c2.menu.PartitionScheme.default.build.partitions=default
646+
esp32c2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
647+
esp32c2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
648+
esp32c2.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
649+
esp32c2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
650+
esp32c2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
651+
esp32c2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
652+
esp32c2.menu.PartitionScheme.minimal.build.partitions=minimal
653+
esp32c2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
654+
esp32c2.menu.PartitionScheme.no_ota.build.partitions=no_ota
655+
esp32c2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
656+
esp32c2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
657+
esp32c2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
658+
esp32c2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
659+
esp32c2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
660+
esp32c2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
661+
esp32c2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
662+
esp32c2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
663+
esp32c2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
664+
esp32c2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
665+
esp32c2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
666+
esp32c2.menu.PartitionScheme.huge_app.build.partitions=huge_app
667+
esp32c2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
668+
esp32c2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
669+
esp32c2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
670+
esp32c2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
671+
esp32c2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
672+
esp32c2.menu.PartitionScheme.fatflash.build.partitions=ffat
673+
esp32c2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
674+
esp32c2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
675+
esp32c2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
676+
esp32c2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
677+
esp32c2.menu.PartitionScheme.rainmaker=RainMaker
678+
esp32c2.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
679+
esp32c2.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
680+
681+
esp32c2.menu.CPUFreq.120=120MHz
682+
esp32c2.menu.CPUFreq.120.build.f_cpu=120000000L
683+
esp32c2.menu.CPUFreq.80=80MHz
684+
esp32c2.menu.CPUFreq.80.build.f_cpu=80000000L
685+
686+
esp32c2.menu.FlashMode.qio=QIO
687+
esp32c2.menu.FlashMode.qio.build.flash_mode=dio
688+
esp32c2.menu.FlashMode.qio.build.boot=qio
689+
esp32c2.menu.FlashMode.dio=DIO
690+
esp32c2.menu.FlashMode.dio.build.flash_mode=dio
691+
esp32c2.menu.FlashMode.dio.build.boot=dio
692+
esp32c2.menu.FlashMode.qout=QOUT
693+
esp32c2.menu.FlashMode.qout.build.flash_mode=dout
694+
esp32c2.menu.FlashMode.qout.build.boot=qout
695+
esp32c2.menu.FlashMode.dout=DOUT
696+
esp32c2.menu.FlashMode.dout.build.flash_mode=dout
697+
esp32c2.menu.FlashMode.dout.build.boot=dout
698+
699+
esp32c2.menu.FlashFreq.60=60MHz
700+
esp32c2.menu.FlashFreq.60.build.flash_freq=60m
701+
esp32c2.menu.FlashFreq.30=30MHz
702+
esp32c2.menu.FlashFreq.30.build.flash_freq=30m
703+
704+
esp32c2.menu.FlashSize.4M=4MB (32Mb)
705+
esp32c2.menu.FlashSize.4M.build.flash_size=4MB
706+
esp32c2.menu.FlashSize.2M=2MB (16Mb)
707+
esp32c2.menu.FlashSize.2M.build.flash_size=2MB
708+
esp32c2.menu.FlashSize.2M.build.partitions=minimal
709+
710+
711+
esp32c2.menu.UploadSpeed.921600=921600
712+
esp32c2.menu.UploadSpeed.921600.upload.speed=921600
713+
esp32c2.menu.UploadSpeed.115200=115200
714+
esp32c2.menu.UploadSpeed.115200.upload.speed=115200
715+
esp32c2.menu.UploadSpeed.256000.windows=256000
716+
esp32c2.menu.UploadSpeed.256000.upload.speed=256000
717+
esp32c2.menu.UploadSpeed.230400.windows.upload.speed=256000
718+
esp32c2.menu.UploadSpeed.230400=230400
719+
esp32c2.menu.UploadSpeed.230400.upload.speed=230400
720+
esp32c2.menu.UploadSpeed.460800.linux=460800
721+
esp32c2.menu.UploadSpeed.460800.macosx=460800
722+
esp32c2.menu.UploadSpeed.460800.upload.speed=460800
723+
esp32c2.menu.UploadSpeed.512000.windows=512000
724+
esp32c2.menu.UploadSpeed.512000.upload.speed=512000
725+
726+
esp32c2.menu.DebugLevel.none=None
727+
esp32c2.menu.DebugLevel.none.build.code_debug=0
728+
esp32c2.menu.DebugLevel.error=Error
729+
esp32c2.menu.DebugLevel.error.build.code_debug=1
730+
esp32c2.menu.DebugLevel.warn=Warn
731+
esp32c2.menu.DebugLevel.warn.build.code_debug=2
732+
esp32c2.menu.DebugLevel.info=Info
733+
esp32c2.menu.DebugLevel.info.build.code_debug=3
734+
esp32c2.menu.DebugLevel.debug=Debug
735+
esp32c2.menu.DebugLevel.debug.build.code_debug=4
736+
esp32c2.menu.DebugLevel.verbose=Verbose
737+
esp32c2.menu.DebugLevel.verbose.build.code_debug=5
738+
739+
esp32c2.menu.EraseFlash.none=Disabled
740+
esp32c2.menu.EraseFlash.none.upload.erase_cmd=
741+
esp32c2.menu.EraseFlash.all=Enabled
742+
esp32c2.menu.EraseFlash.all.upload.erase_cmd=-e
743+
744+
##############################################################
745+
593746
esp32c3.name=ESP32C3 Dev Module
594747
esp32c3.vid.0=0x303a
595748
esp32c3.pid.0=0x1001

‎cores/esp32/Esp.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ extern "C" {
4848
#include "esp32s3/rom/spi_flash.h"
4949
#include "soc/efuse_reg.h"
5050
#define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32s3 is located at 0x0000
51+
#elif CONFIG_IDF_TARGET_ESP32C2
52+
#include "esp32c2/rom/spi_flash.h"
53+
#define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c2 is located at 0x0000
5154
#elif CONFIG_IDF_TARGET_ESP32C3
5255
#include "esp32c3/rom/spi_flash.h"
5356
#define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c3 is located at 0x0000
@@ -245,6 +248,10 @@ String EspClass::getSketchMD5()
245248
md5.add(buf.get(), readBytes);
246249
lengthLeft -= readBytes;
247250
offset += readBytes;
251+
252+
#if CONFIG_FREERTOS_UNICORE
253+
delay(1); // Fix solo WDT
254+
#endif
248255
}
249256
md5.calculate();
250257
result = md5.toString();
@@ -366,7 +373,7 @@ FlashMode_t EspClass::getFlashChipMode(void)
366373
#if CONFIG_IDF_TARGET_ESP32S2
367374
uint32_t spi_ctrl = REG_READ(PERIPHS_SPI_FLASH_CTRL);
368375
#else
369-
#if CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C6
376+
#if CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6
370377
uint32_t spi_ctrl = REG_READ(DR_REG_SPI0_BASE + 0x8);
371378
#else
372379
uint32_t spi_ctrl = REG_READ(SPI_CTRL_REG(0));

‎cores/esp32/HardwareSerial.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#define SOC_RX0 3
2828
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
2929
#define SOC_RX0 44
30+
#elif CONFIG_IDF_TARGET_ESP32C2
31+
#define SOC_RX0 19
3032
#elif CONFIG_IDF_TARGET_ESP32C3
3133
#define SOC_RX0 20
3234
#elif CONFIG_IDF_TARGET_ESP32C6
@@ -41,6 +43,8 @@
4143
#define SOC_TX0 1
4244
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
4345
#define SOC_TX0 43
46+
#elif CONFIG_IDF_TARGET_ESP32C2
47+
#define SOC_TX0 20
4448
#elif CONFIG_IDF_TARGET_ESP32C3
4549
#define SOC_TX0 21
4650
#elif CONFIG_IDF_TARGET_ESP32C6
@@ -60,6 +64,8 @@ void serialEvent(void) {}
6064
#define RX1 9
6165
#elif CONFIG_IDF_TARGET_ESP32S2
6266
#define RX1 18
67+
#elif CONFIG_IDF_TARGET_ESP32C2
68+
#define RX1 9
6369
#elif CONFIG_IDF_TARGET_ESP32C3
6470
#define RX1 18
6571
#elif CONFIG_IDF_TARGET_ESP32S3
@@ -76,6 +82,8 @@ void serialEvent(void) {}
7682
#define TX1 10
7783
#elif CONFIG_IDF_TARGET_ESP32S2
7884
#define TX1 17
85+
#elif CONFIG_IDF_TARGET_ESP32C2
86+
#define TX1 10
7987
#elif CONFIG_IDF_TARGET_ESP32C3
8088
#define TX1 19
8189
#elif CONFIG_IDF_TARGET_ESP32S3

0 commit comments

Comments
 (0)