Skip to content

Commit 34ed419

Browse files
Jason2866Jason2866
authored
Tasmota changes
1 parent 7e893e9 commit 34ed419

31 files changed

+40
-2617
lines changed

Diff for: ‎CMakeLists.txt

+1-78
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525
set(CORE_SRCS
2626
cores/esp32/base64.cpp
2727
cores/esp32/cbuf.cpp
28-
cores/esp32/chip-debug-report.cpp
2928
cores/esp32/esp32-hal-adc.c
3029
cores/esp32/esp32-hal-bt.c
3130
cores/esp32/esp32-hal-cpu.c
@@ -78,36 +77,26 @@ set(CORE_SRCS
7877
set(ARDUINO_ALL_LIBRARIES
7978
ArduinoOTA
8079
AsyncUDP
81-
BLE
82-
BluetoothSerial
8380
DNSServer
8481
EEPROM
85-
ESP_I2S
86-
ESP_SR
8782
ESPmDNS
8883
Ethernet
8984
FFat
9085
FS
9186
HTTPClient
9287
HTTPUpdate
93-
Insights
9488
LittleFS
9589
NetBIOS
9690
Network
9791
Preferences
98-
RainMaker
9992
SD_MMC
10093
SD
101-
SimpleBLE
102-
SPIFFS
10394
SPI
10495
Ticker
10596
Update
10697
USB
10798
WebServer
108-
NetworkClientSecure
10999
WiFi
110-
WiFiProv
111100
Wire
112101
)
113102

@@ -116,22 +105,10 @@ set(ARDUINO_LIBRARY_ArduinoOTA_REQUIRES esp_https_ota)
116105

117106
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
118107

119-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
120-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
121-
libraries/BluetoothSerial/src/BTAddress.cpp
122-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
123-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
124-
125108
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
126109

127110
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
128111

129-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
130-
131-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
132-
libraries/ESP_SR/src/ESP_SR.cpp
133-
libraries/ESP_SR/src/esp32-hal-sr.c)
134-
135112
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
136113

137114
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -146,35 +123,19 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
146123

147124
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
148125

149-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
150-
151126
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
152127

153128
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
154129

155130
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
156131

157-
set(ARDUINO_LIBRARY_RainMaker_SRCS
158-
libraries/RainMaker/src/RMaker.cpp
159-
libraries/RainMaker/src/RMakerNode.cpp
160-
libraries/RainMaker/src/RMakerParam.cpp
161-
libraries/RainMaker/src/RMakerDevice.cpp
162-
libraries/RainMaker/src/RMakerType.cpp
163-
libraries/RainMaker/src/RMakerQR.cpp
164-
libraries/RainMaker/src/RMakerUtils.cpp
165-
libraries/RainMaker/src/AppInsights.cpp)
166-
167132
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
168133

169134
set(ARDUINO_LIBRARY_SD_SRCS
170135
libraries/SD/src/SD.cpp
171136
libraries/SD/src/sd_diskio.cpp
172137
libraries/SD/src/sd_diskio_crc.c)
173138

174-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
175-
176-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
177-
178139
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
179140

180141
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -199,10 +160,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
199160
libraries/WebServer/src/Parsing.cpp
200161
libraries/WebServer/src/detail/mimetable.cpp)
201162

202-
set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
203-
libraries/NetworkClientSecure/src/ssl_client.cpp
204-
libraries/NetworkClientSecure/src/NetworkClientSecure.cpp)
205-
206163
set(ARDUINO_LIBRARY_Network_SRCS
207164
libraries/Network/src/NetworkInterface.cpp
208165
libraries/Network/src/NetworkEvents.cpp
@@ -221,42 +178,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
221178
libraries/WiFi/src/STA.cpp
222179
libraries/WiFi/src/AP.cpp)
223180

224-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
225-
226181
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
227182

228-
set(ARDUINO_LIBRARY_BLE_SRCS
229-
libraries/BLE/src/BLE2902.cpp
230-
libraries/BLE/src/BLE2904.cpp
231-
libraries/BLE/src/BLEAddress.cpp
232-
libraries/BLE/src/BLEAdvertisedDevice.cpp
233-
libraries/BLE/src/BLEAdvertising.cpp
234-
libraries/BLE/src/BLEBeacon.cpp
235-
libraries/BLE/src/BLECharacteristic.cpp
236-
libraries/BLE/src/BLECharacteristicMap.cpp
237-
libraries/BLE/src/BLEClient.cpp
238-
libraries/BLE/src/BLEDescriptor.cpp
239-
libraries/BLE/src/BLEDescriptorMap.cpp
240-
libraries/BLE/src/BLEDevice.cpp
241-
libraries/BLE/src/BLEEddystoneTLM.cpp
242-
libraries/BLE/src/BLEEddystoneURL.cpp
243-
libraries/BLE/src/BLEExceptions.cpp
244-
libraries/BLE/src/BLEHIDDevice.cpp
245-
libraries/BLE/src/BLERemoteCharacteristic.cpp
246-
libraries/BLE/src/BLERemoteDescriptor.cpp
247-
libraries/BLE/src/BLERemoteService.cpp
248-
libraries/BLE/src/BLEScan.cpp
249-
libraries/BLE/src/BLESecurity.cpp
250-
libraries/BLE/src/BLEServer.cpp
251-
libraries/BLE/src/BLEService.cpp
252-
libraries/BLE/src/BLEServiceMap.cpp
253-
libraries/BLE/src/BLEUtils.cpp
254-
libraries/BLE/src/BLEUUID.cpp
255-
libraries/BLE/src/BLEValue.cpp
256-
libraries/BLE/src/FreeRTOS.cpp
257-
libraries/BLE/src/GeneralUtils.cpp
258-
)
259-
260183
set(ARDUINO_LIBRARIES_SRCS)
261184
set(ARDUINO_LIBRARIES_REQUIRES)
262185
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -278,7 +201,7 @@ set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRA
278201
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
279202
set(priv_includes cores/esp32/libb64)
280203
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
281-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid ${ARDUINO_LIBRARIES_REQUIRES})
204+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid ${ARDUINO_LIBRARIES_REQUIRES})
282205

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

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/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/actions/workflows/hil.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/hil.yml?query=event%3Aschedule)
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: ‎cores/esp32/main.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
#endif
1010
#endif
1111

12+
#if defined __has_include && __has_include ("chip-debug-report.h")
1213
#include "chip-debug-report.h"
14+
#endif
1315

1416
#ifndef ARDUINO_LOOP_STACK_SIZE
1517
#ifndef CONFIG_ARDUINO_LOOP_STACK_SIZE
@@ -49,20 +51,24 @@ void loopTask(void *pvParameters)
4951
// sets UART0 (default console) RX/TX pins as already configured in boot or as defined in variants/pins_arduino.h
5052
Serial0.setPins(gpioNumberToDigitalPin(SOC_RX0), gpioNumberToDigitalPin(SOC_TX0));
5153
#endif
54+
#if defined __has_include && __has_include ("chip-debug-report.h")
5255
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
5356
printBeforeSetupInfo();
5457
#else
5558
if(shouldPrintChipDebugReport()){
5659
printBeforeSetupInfo();
5760
}
61+
#endif
5862
#endif
5963
setup();
64+
#if defined __has_include && __has_include ("chip-debug-report.h")
6065
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
6166
printAfterSetupInfo();
6267
#else
6368
if(shouldPrintChipDebugReport()){
6469
printAfterSetupInfo();
6570
}
71+
#endif
6672
#endif
6773
for(;;) {
6874
#if CONFIG_FREERTOS_UNICORE

Diff for: ‎idf_component.yml

+2-40
Original file line numberDiff line numberDiff line change
@@ -43,44 +43,6 @@ files:
4343
- "programmers.txt"
4444
dependencies:
4545
idf: ">=5.1"
46-
# mdns 1.2.1 is necessary to build H2 with no WiFi
46+
# mdns 1.2.3 is necessary to build H2 with no WiFi
4747
mdns: "^1.2.3"
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
86-
48+
joltwallet/littlefs: "^1.14.1"

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

+3
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, i
226226
case ETH_PHY_DP83848:
227227
phy = esp_eth_phy_new_dp83848(&phy_config);
228228
break;
229+
case ETH_PHY_JL1101:
230+
phy = esp_eth_phy_new_jl1101(&phy_config);
231+
break;
229232
case ETH_PHY_KSZ8041:
230233
phy = esp_eth_phy_new_ksz80xx(&phy_config);
231234
break;

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
// This will be uncommented once custom SPI support is available in ESP-IDF
6464
#define ETH_SPI_SUPPORTS_CUSTOM 1
6565

66+
// This will be removed when the support is backported to official IDF 5.1
67+
#define ETH_SPI_SUPPORTS_NO_IRQ 1
68+
6669
#include "Network.h"
6770

6871
#if ETH_SPI_SUPPORTS_CUSTOM
@@ -92,7 +95,7 @@ typedef enum { ETH_CLOCK_GPIO0_IN, ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ET
9295

9396
typedef enum {
9497
#if CONFIG_ETH_USE_ESP32_EMAC
95-
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
98+
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_JL1101, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
9699
#endif /* CONFIG_ETH_USE_ESP32_EMAC */
97100
#if CONFIG_ETH_SPI_ETHERNET_DM9051
98101
ETH_PHY_DM9051,

0 commit comments

Comments
 (0)