Skip to content

Commit f78e9cb

Browse files
Jason2866Jason2866
authored
Tasmota changes (#319)
1 parent 9258a8c commit f78e9cb

File tree

11 files changed

+40
-281
lines changed

11 files changed

+40
-281
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,8 @@ set(CORE_SRCS
7777
set(LIBRARY_SRCS
7878
libraries/ArduinoOTA/src/ArduinoOTA.cpp
7979
libraries/AsyncUDP/src/AsyncUDP.cpp
80-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
81-
libraries/BluetoothSerial/src/BTAddress.cpp
82-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
83-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp
8480
libraries/DNSServer/src/DNSServer.cpp
8581
libraries/EEPROM/src/EEPROM.cpp
86-
libraries/ESP_I2S/src/ESP_I2S.cpp
87-
libraries/ESP_SR/src/ESP_SR.cpp
88-
libraries/ESP_SR/src/esp32-hal-sr.c
8982
libraries/ESPmDNS/src/ESPmDNS.cpp
9083
libraries/Ethernet/src/ETH.cpp
9184
libraries/FFat/src/FFat.cpp
@@ -94,23 +87,12 @@ set(LIBRARY_SRCS
9487
libraries/HTTPClient/src/HTTPClient.cpp
9588
libraries/HTTPUpdate/src/HTTPUpdate.cpp
9689
libraries/LittleFS/src/LittleFS.cpp
97-
libraries/Insights/src/Insights.cpp
9890
libraries/NetBIOS/src/NetBIOS.cpp
9991
libraries/Preferences/src/Preferences.cpp
100-
libraries/RainMaker/src/RMaker.cpp
101-
libraries/RainMaker/src/RMakerNode.cpp
102-
libraries/RainMaker/src/RMakerParam.cpp
103-
libraries/RainMaker/src/RMakerDevice.cpp
104-
libraries/RainMaker/src/RMakerType.cpp
105-
libraries/RainMaker/src/RMakerQR.cpp
106-
libraries/RainMaker/src/RMakerUtils.cpp
107-
libraries/RainMaker/src/AppInsights.cpp
10892
libraries/SD_MMC/src/SD_MMC.cpp
10993
libraries/SD/src/SD.cpp
11094
libraries/SD/src/sd_diskio.cpp
11195
libraries/SD/src/sd_diskio_crc.c
112-
libraries/SimpleBLE/src/SimpleBLE.cpp
113-
libraries/SPIFFS/src/SPIFFS.cpp
11496
libraries/SPI/src/SPI.cpp
11597
libraries/Ticker/src/Ticker.cpp
11698
libraries/Update/src/Updater.cpp
@@ -127,8 +109,6 @@ set(LIBRARY_SRCS
127109
libraries/WebServer/src/WebServer.cpp
128110
libraries/WebServer/src/Parsing.cpp
129111
libraries/WebServer/src/detail/mimetable.cpp
130-
libraries/WiFiClientSecure/src/ssl_client.cpp
131-
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
132112
libraries/WiFi/src/WiFiAP.cpp
133113
libraries/WiFi/src/WiFiClient.cpp
134114
libraries/WiFi/src/WiFi.cpp
@@ -138,84 +118,40 @@ set(LIBRARY_SRCS
138118
libraries/WiFi/src/WiFiServer.cpp
139119
libraries/WiFi/src/WiFiSTA.cpp
140120
libraries/WiFi/src/WiFiUdp.cpp
141-
libraries/WiFiProv/src/WiFiProv.cpp
142121
libraries/Wire/src/Wire.cpp
143122
)
144123

145-
set(BLE_SRCS
146-
libraries/BLE/src/BLE2902.cpp
147-
libraries/BLE/src/BLE2904.cpp
148-
libraries/BLE/src/BLEAddress.cpp
149-
libraries/BLE/src/BLEAdvertisedDevice.cpp
150-
libraries/BLE/src/BLEAdvertising.cpp
151-
libraries/BLE/src/BLEBeacon.cpp
152-
libraries/BLE/src/BLECharacteristic.cpp
153-
libraries/BLE/src/BLECharacteristicMap.cpp
154-
libraries/BLE/src/BLEClient.cpp
155-
libraries/BLE/src/BLEDescriptor.cpp
156-
libraries/BLE/src/BLEDescriptorMap.cpp
157-
libraries/BLE/src/BLEDevice.cpp
158-
libraries/BLE/src/BLEEddystoneTLM.cpp
159-
libraries/BLE/src/BLEEddystoneURL.cpp
160-
libraries/BLE/src/BLEExceptions.cpp
161-
libraries/BLE/src/BLEHIDDevice.cpp
162-
libraries/BLE/src/BLERemoteCharacteristic.cpp
163-
libraries/BLE/src/BLERemoteDescriptor.cpp
164-
libraries/BLE/src/BLERemoteService.cpp
165-
libraries/BLE/src/BLEScan.cpp
166-
libraries/BLE/src/BLESecurity.cpp
167-
libraries/BLE/src/BLEServer.cpp
168-
libraries/BLE/src/BLEService.cpp
169-
libraries/BLE/src/BLEServiceMap.cpp
170-
libraries/BLE/src/BLEUtils.cpp
171-
libraries/BLE/src/BLEUUID.cpp
172-
libraries/BLE/src/BLEValue.cpp
173-
libraries/BLE/src/FreeRTOS.cpp
174-
libraries/BLE/src/GeneralUtils.cpp
175-
)
176-
177124
set(includedirs
178125
variants/${CONFIG_ARDUINO_VARIANT}/
179126
cores/esp32/
180127
libraries/ArduinoOTA/src
181128
libraries/AsyncUDP/src
182-
libraries/BLE/src
183-
libraries/BluetoothSerial/src
184129
libraries/DNSServer/src
185130
libraries/EEPROM/src
186-
libraries/ESP_I2S/src
187-
libraries/ESP_SR/src
188-
libraries/ESP32/src
189131
libraries/ESPmDNS/src
190132
libraries/Ethernet/src
191133
libraries/FFat/src
192134
libraries/FS/src
193135
libraries/HTTPClient/src
194136
libraries/HTTPUpdate/src
195137
libraries/LittleFS/src
196-
libraries/Insights/src
197138
libraries/NetBIOS/src
198139
libraries/Preferences/src
199-
libraries/RainMaker/src
200140
libraries/SD_MMC/src
201141
libraries/SD/src
202-
libraries/SimpleBLE/src
203-
libraries/SPIFFS/src
204142
libraries/SPI/src
205143
libraries/Ticker/src
206144
libraries/Update/src
207145
libraries/USB/src
208146
libraries/WebServer/src
209-
libraries/WiFiClientSecure/src
210147
libraries/WiFi/src
211-
libraries/WiFiProv/src
212148
libraries/Wire/src
213149
)
214150

215-
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
151+
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS})
216152
set(priv_includes cores/esp32/libb64)
217153
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
218-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid)
154+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid)
219155

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

‎README.md

Lines changed: 7 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
1-
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
1+
# Tasmota Platformio Arduino for ESP32, ESP32-S2, ESP32-S3, ESP32-C2, ESP32-C3, ESP32-C6 and ESP32-H2
22

3-
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml?link=http://https://github.com/espressif/arduino-esp32/blob/master/LIBRARIES_TEST.md)
4-
5-
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
6-
7-
## Contents
8-
9-
- [Development Status](#development-status)
10-
- [Development Planning](#development-planning)
11-
- [Documentation](#documentation)
12-
- [Supported Chips](#supported-chips)
13-
- [Decoding exceptions](#decoding-exceptions)
14-
- [Issue/Bug report template](#issuebug-report-template)
15-
- [Contributing](#contributing)
16-
17-
### Development Status
18-
19-
Latest Stable Release [![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Downloads](https://img.shields.io/github/downloads/espressif/arduino-esp32/latest/total.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/)
20-
21-
Latest Development Release [![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32/all.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/) [![Release Date](https://img.shields.io/github/release-date-pre/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/) [![Downloads](https://img.shields.io/github/downloads-pre/espressif/arduino-esp32/latest/total.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/)
22-
23-
### Development Planning
24-
25-
Our Development is fully tracked on this public **[Roadmap 🎉](https://github.com/orgs/espressif/projects/3)**
26-
27-
For even more information you can join our **[Monthly Community Meetings 🔔](https://github.com/espressif/arduino-esp32/discussions/categories/monthly-community-meetings).**
3+
### [![GitHub Releases](https://img.shields.io/github/downloads/tasmota/arduino-esp32/total?label=downloads)](https://github.com/tasmota/arduino-esp32/releases/latest)
284

295
### Documentation
306

@@ -36,51 +12,19 @@ You can use the [Arduino-ESP32 Online Documentation](https://docs.espressif.com/
3612

3713
---
3814

39-
**APIs compatibility with ESP8266 and Arduino-CORE (Arduino.cc) is explained [here](https://docs.espressif.com/projects/arduino-esp32/en/latest/libraries.html#apis).**
40-
41-
---
42-
43-
* [Getting Started](https://docs.espressif.com/projects/arduino-esp32/en/latest/getting_started.html)
44-
* [Installing (Windows, Linux and macOS)](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html)
45-
* [Libraries](https://docs.espressif.com/projects/arduino-esp32/en/latest/libraries.html)
46-
* [Arduino as an ESP-IDF component](https://docs.espressif.com/projects/arduino-esp32/en/latest/esp-idf_component.html)
47-
* [FAQ](https://docs.espressif.com/projects/arduino-esp32/en/latest/faq.html)
48-
* [Troubleshooting](https://docs.espressif.com/projects/arduino-esp32/en/latest/troubleshooting.html)
49-
5015
### Supported Chips
5116

52-
Here are the ESP32 series supported by the Arduino-ESP32 project:
17+
Here are the ESP32 series supported by the Tasmota Arduino-ESP32 project:
5318

5419
| **SoC** | **Stable** | **Development** | **Datasheet** |
5520
|----------|:----------:|:---------------:|:-------------------------------------------------------------------------------------------------:|
56-
| ESP32 | Yes | Yes | [ESP32](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf) |
21+
| ESP32 | Yes | Yes | [ESP32](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf) |
22+
| ESP32solo1| Yes | Yes | [ESP32solo1](https://www.espressif.com/sites/default/files/documentation/esp32-solo-1_datasheet_en.pdf) |
5723
| ESP32-S2 | Yes | Yes | [ESP32-S2](https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf) |
58-
| ESP32-C3 | Yes | Yes | [ESP32-C3](https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf) |
5924
| ESP32-S3 | Yes | Yes | [ESP32-S3](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf) |
25+
| ESP32-C3 | Yes | Yes | [ESP32-C3](https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf) |
26+
| ESP32-C2 | No | Yes | [ESP32-C2](https://www.espressif.com/sites/default/files/documentation/esp8684_datasheet_en.pdf) |
6027
| ESP32-C6 | No | Yes | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
6128
| ESP32-H2 | No | Yes | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
6229

6330
For more details visit the [supported chips](https://docs.espressif.com/projects/arduino-esp32/en/latest/getting_started.html#supported-soc-s) documentation page.
64-
65-
### Decoding exceptions
66-
67-
You can use [EspExceptionDecoder](https://github.com/me-no-dev/EspExceptionDecoder) to get meaningful call trace.
68-
69-
### Issue/Bug report template
70-
71-
Before reporting an issue, make sure you've searched for similar one that was already created. Also make sure to go through all the issues labelled as [Type: For reference](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue+label%3A%22Type%3A+For+reference%22+).
72-
73-
Finally, if you are sure no one else had the issue, follow the **Issue template** or **Feature request template** while reporting any [new Issue](https://github.com/espressif/arduino-esp32/issues/new/choose).
74-
75-
### External libraries compilation test
76-
77-
We have set-up CI testing for external libraries for ESP32 Arduino core. You can check test results in the file [LIBRARIES_TEST](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md).
78-
For more information and how to add your library to the test see [external library testing](https://docs.espressif.com/projects/arduino-esp32/en/latest/external_libraries_test.html) in the documentation.
79-
80-
### Contributing
81-
82-
We welcome contributions to the Arduino ESP32 project!
83-
84-
See [contributing](https://docs.espressif.com/projects/arduino-esp32/en/latest/contributing.html) in the documentation for more information on how to contribute to the project.
85-
86-
> We would like to have this repository in a polite and friendly atmosphere, so please be kind and respectful to others. For more details, look at [Code of Conduct](https://github.com/espressif/arduino-esp32/blob/master/CODE_OF_CONDUCT.md).

‎cores/esp32/Esp.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ String EspClass::getSketchMD5()
248248
md5.add(pb, readBytes);
249249
lengthLeft -= readBytes;
250250
offset += readBytes;
251+
252+
#if CONFIG_FREERTOS_UNICORE
253+
delay(1); // Fix solo WDT
254+
#endif
251255
}
252256
free(pb);
253257
md5.calculate();

‎idf_component.yml

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,5 @@ dependencies:
4545
idf: ">=5.1"
4646
# mdns 1.2.1 is necessary to build H2 with no WiFi
4747
mdns: "1.2.1"
48-
chmorgan/esp-libhelix-mp3:
49-
version: "1.0.3"
50-
require: public
51-
espressif/esp-zboss-lib:
52-
version: "^1.0.1"
53-
rules:
54-
- if: "target != esp32c2"
55-
espressif/esp-zigbee-lib:
56-
version: "^1.0.1"
57-
rules:
58-
- if: "target != esp32c2"
59-
esp-dsp:
60-
version: "^1.3.4"
61-
rules:
62-
- if: "target != esp32c2"
63-
espressif/esp_rainmaker:
64-
version: "^1.0.0"
65-
rules:
66-
- if: "target != esp32c2"
67-
espressif/rmaker_common:
68-
version: "^1.4.3"
69-
rules:
70-
- if: "target != esp32c2"
71-
espressif/esp_insights:
72-
version: "^1.0.1"
73-
rules:
74-
- if: "target != esp32c2"
75-
espressif/qrcode:
76-
version: "^0.1.0~1"
77-
rules:
78-
- if: "target != esp32c2"
79-
joltwallet/littlefs: "^1.10.2"
80-
espressif/esp-sr:
81-
version: "^1.4.2"
82-
rules:
83-
- if: "target in [esp32s3]"
84-
examples:
85-
- path: ./idf_component_examples/Hello_world
48+
joltwallet/littlefs: "^1.11.0"
8649

‎libraries/Ethernet/src/ETH.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ bool ETHClass::begin(eth_phy_type_t type, uint8_t phy_addr, int mdc, int mdio, i
149149
case ETH_PHY_DP83848:
150150
phy = esp_eth_phy_new_dp83848(&phy_config);
151151
break;
152+
case ETH_PHY_JL1101:
153+
phy = esp_eth_phy_new_jl1101(&phy_config);
154+
break;
152155
case ETH_PHY_KSZ8041:
153156
phy = esp_eth_phy_new_ksz80xx(&phy_config);
154157
break;

‎libraries/Ethernet/src/ETH.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ typedef enum { ETH_CLOCK_GPIO0_IN, ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ET
8989

9090
typedef enum {
9191
#if CONFIG_ETH_USE_ESP32_EMAC
92-
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
92+
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_JL1101, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
9393
#endif /* CONFIG_ETH_USE_ESP32_EMAC */
9494
#if CONFIG_ETH_SPI_ETHERNET_DM9051
9595
ETH_PHY_DM9051,

0 commit comments

Comments
 (0)