Skip to content

Commit 13e7a9a

Browse files
Jason2866Jason2866
authored
Tasmota changes (#330)
* rm WPA2 Enterprise AP connect support (#324) * Revert crypt update PR espressif#5807 (#326)
1 parent 48072ee commit 13e7a9a

File tree

12 files changed

+34
-595
lines changed

12 files changed

+34
-595
lines changed

Diff for: ‎CMakeLists.txt

+1-77
Original file line numberDiff line numberDiff line change
@@ -77,35 +77,25 @@ set(CORE_SRCS
7777
set(ARDUINO_ALL_LIBRARIES
7878
ArduinoOTA
7979
AsyncUDP
80-
BLE
81-
BluetoothSerial
8280
DNSServer
8381
EEPROM
84-
ESP_I2S
85-
ESP_SR
8682
ESPmDNS
8783
Ethernet
8884
FFat
8985
FS
9086
HTTPClient
9187
HTTPUpdate
92-
Insights
9388
LittleFS
9489
NetBIOS
9590
Preferences
96-
RainMaker
9791
SD_MMC
9892
SD
99-
SimpleBLE
100-
SPIFFS
10193
SPI
10294
Ticker
10395
Update
10496
USB
10597
WebServer
106-
WiFiClientSecure
10798
WiFi
108-
WiFiProv
10999
Wire
110100
)
111101

@@ -114,22 +104,10 @@ set(ARDUINO_LIBRARY_ArduinoOTA_REQUIRES esp_https_ota)
114104

115105
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
116106

117-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
118-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
119-
libraries/BluetoothSerial/src/BTAddress.cpp
120-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
121-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
122-
123107
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
124108

125109
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
126110

127-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
128-
129-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
130-
libraries/ESP_SR/src/ESP_SR.cpp
131-
libraries/ESP_SR/src/esp32-hal-sr.c)
132-
133111
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
134112

135113
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -144,35 +122,19 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
144122

145123
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
146124

147-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
148-
149125
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
150126

151127
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
152128

153129
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
154130

155-
set(ARDUINO_LIBRARY_RainMaker_SRCS
156-
libraries/RainMaker/src/RMaker.cpp
157-
libraries/RainMaker/src/RMakerNode.cpp
158-
libraries/RainMaker/src/RMakerParam.cpp
159-
libraries/RainMaker/src/RMakerDevice.cpp
160-
libraries/RainMaker/src/RMakerType.cpp
161-
libraries/RainMaker/src/RMakerQR.cpp
162-
libraries/RainMaker/src/RMakerUtils.cpp
163-
libraries/RainMaker/src/AppInsights.cpp)
164-
165131
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
166132

167133
set(ARDUINO_LIBRARY_SD_SRCS
168134
libraries/SD/src/SD.cpp
169135
libraries/SD/src/sd_diskio.cpp
170136
libraries/SD/src/sd_diskio_crc.c)
171137

172-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
173-
174-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
175-
176138
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
177139

178140
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -197,10 +159,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
197159
libraries/WebServer/src/Parsing.cpp
198160
libraries/WebServer/src/detail/mimetable.cpp)
199161

200-
set(ARDUINO_LIBRARY_WiFiClientSecure_SRCS
201-
libraries/WiFiClientSecure/src/ssl_client.cpp
202-
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp)
203-
204162
set(ARDUINO_LIBRARY_WiFi_SRCS
205163
libraries/WiFi/src/WiFiAP.cpp
206164
libraries/WiFi/src/WiFiClient.cpp
@@ -212,42 +170,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
212170
libraries/WiFi/src/WiFiSTA.cpp
213171
libraries/WiFi/src/WiFiUdp.cpp)
214172

215-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
216-
217173
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
218174

219-
set(ARDUINO_LIBRARY_BLE_SRCS
220-
libraries/BLE/src/BLE2902.cpp
221-
libraries/BLE/src/BLE2904.cpp
222-
libraries/BLE/src/BLEAddress.cpp
223-
libraries/BLE/src/BLEAdvertisedDevice.cpp
224-
libraries/BLE/src/BLEAdvertising.cpp
225-
libraries/BLE/src/BLEBeacon.cpp
226-
libraries/BLE/src/BLECharacteristic.cpp
227-
libraries/BLE/src/BLECharacteristicMap.cpp
228-
libraries/BLE/src/BLEClient.cpp
229-
libraries/BLE/src/BLEDescriptor.cpp
230-
libraries/BLE/src/BLEDescriptorMap.cpp
231-
libraries/BLE/src/BLEDevice.cpp
232-
libraries/BLE/src/BLEEddystoneTLM.cpp
233-
libraries/BLE/src/BLEEddystoneURL.cpp
234-
libraries/BLE/src/BLEExceptions.cpp
235-
libraries/BLE/src/BLEHIDDevice.cpp
236-
libraries/BLE/src/BLERemoteCharacteristic.cpp
237-
libraries/BLE/src/BLERemoteDescriptor.cpp
238-
libraries/BLE/src/BLERemoteService.cpp
239-
libraries/BLE/src/BLEScan.cpp
240-
libraries/BLE/src/BLESecurity.cpp
241-
libraries/BLE/src/BLEServer.cpp
242-
libraries/BLE/src/BLEService.cpp
243-
libraries/BLE/src/BLEServiceMap.cpp
244-
libraries/BLE/src/BLEUtils.cpp
245-
libraries/BLE/src/BLEUUID.cpp
246-
libraries/BLE/src/BLEValue.cpp
247-
libraries/BLE/src/FreeRTOS.cpp
248-
libraries/BLE/src/GeneralUtils.cpp
249-
)
250-
251175
set(ARDUINO_LIBRARIES_SRCS)
252176
set(ARDUINO_LIBRARIES_REQUIRES)
253177
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -269,7 +193,7 @@ set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRA
269193
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
270194
set(priv_includes cores/esp32/libb64)
271195
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
272-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid ${ARDUINO_LIBRARIES_REQUIRES})
196+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid ${ARDUINO_LIBRARIES_REQUIRES})
273197

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

Diff for: ‎README.md

+7-63
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).

Diff for: ‎idf_component.yml

+1-38
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

Diff for: ‎libraries/Ethernet/src/ETH.cpp

+3
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;

Diff for: ‎libraries/Ethernet/src/ETH.h

+1-1
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)