Skip to content

Commit 91680c2

Browse files
Jason2866SuGliderPilnyTomas
authored
Tasmota changes for core 2.0.7
* Tasmota changes * Tasmota 2.0.6 with IPv6 support * IPv6 support * Ethernet driver JL1101 Co-authored-by: Danii Mirsanov <[email protected]> * Update install-platformio-esp32.sh * Fix conflicts * Tasmota repos * overlooked `timeout` change to `timeout_ms` * Sets correct code for UART baud rate detection Co-authored-by: Rodrigo Garcia <[email protected]> * General examples updates (espressif#7727) (#196) * Remove inline code comments for the struct description * Renamed ESPNow examples * Changed example from C++ class to C struct * Updated MultiHomedServers * Updated BT Serial examples * Added short overview of exaples - missing Enterprise * Added draft of Enterprise header note * Fixed note in README * Fixed compilation error * Changed FunctionalInterrupt example * Fixes * Returned FunctionalInterrupts to original state + added modified version as new example Co-authored-by: Tomáš Pilný <[email protected]> --------- Co-authored-by: Rodrigo Garcia <[email protected]> Co-authored-by: Tomáš Pilný <[email protected]>
1 parent d6a850b commit 91680c2

24 files changed

+789
-236
lines changed

Diff for: ‎.github/scripts/install-arduino-core-esp32.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
2020
ln -s $GITHUB_WORKSPACE esp32
2121
else
2222
echo "Cloning Core Repository..."
23-
git clone https://github.com/espressif/arduino-esp32.git esp32 > /dev/null 2>&1
23+
git clone https://github.com/tasmota/arduino-esp32.git esp32 > /dev/null 2>&1
2424
fi
2525

2626
#echo "Updating Submodules ..."

Diff for: ‎.github/scripts/install-platformio-esp32.sh

100755100644
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
export PLATFORMIO_ESP32_PATH="$HOME/.platformio/packages/framework-arduinoespressif32"
4-
PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"
4+
PLATFORMIO_ESP32_URL="https://github.com/tasmota/platform-espressif32.git"
55

66
TOOLCHAIN_VERSION="8.4.0+2021r2-patch5"
77
ESPTOOLPY_VERSION="~1.40400.0"
@@ -40,12 +40,12 @@ replace_script+="data['packages']['tool-esptoolpy']['version']='$ESPTOOLPY_VERSI
4040
replace_script+="fp.seek(0);fp.truncate();json.dump(data, fp, indent=2);fp.close()"
4141
python -c "$replace_script"
4242

43-
if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then
43+
if [ "$GITHUB_REPOSITORY" == "tasmota/arduino-esp32" ]; then
4444
echo "Linking Core..."
4545
ln -s $GITHUB_WORKSPACE "$PLATFORMIO_ESP32_PATH"
4646
else
4747
echo "Cloning Core Repository ..."
48-
git clone --recursive https://github.com/espressif/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
48+
git clone --recursive https://github.com/tasmota/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
4949
fi
5050

5151
echo "PlatformIO for ESP32 has been installed"

Diff for: ‎.github/workflows/push.yml

-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
jobs:
16-
17-
cmake-check:
18-
name: Check cmake file
19-
runs-on: ubuntu-latest
20-
steps:
21-
- uses: actions/checkout@v3
22-
- run: bash ./.github/scripts/check-cmakelists.sh
23-
2416
# Ubuntu
2517
build-arduino-linux:
2618
name: Arduino ${{ matrix.chunk }} on ubuntu-latest

Diff for: ‎CMakeLists.txt

-17
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,9 @@ set(LIBRARY_SRCS
8888
libraries/HTTPClient/src/HTTPClient.cpp
8989
libraries/HTTPUpdate/src/HTTPUpdate.cpp
9090
libraries/LittleFS/src/LittleFS.cpp
91-
libraries/Insights/src/Insights.cpp
9291
libraries/I2S/src/I2S.cpp
9392
libraries/NetBIOS/src/NetBIOS.cpp
9493
libraries/Preferences/src/Preferences.cpp
95-
libraries/RainMaker/src/RMaker.cpp
96-
libraries/RainMaker/src/RMakerNode.cpp
97-
libraries/RainMaker/src/RMakerParam.cpp
98-
libraries/RainMaker/src/RMakerDevice.cpp
99-
libraries/RainMaker/src/RMakerType.cpp
100-
libraries/RainMaker/src/RMakerQR.cpp
101-
libraries/RainMaker/src/RMakerUtils.cpp
10294
libraries/SD_MMC/src/SD_MMC.cpp
10395
libraries/SD/src/SD.cpp
10496
libraries/SD/src/sd_diskio.cpp
@@ -185,11 +177,9 @@ set(includedirs
185177
libraries/HTTPClient/src
186178
libraries/HTTPUpdate/src
187179
libraries/LittleFS/src
188-
libraries/Insights/src
189180
libraries/I2S/src
190181
libraries/NetBIOS/src
191182
libraries/Preferences/src
192-
libraries/RainMaker/src
193183
libraries/SD_MMC/src
194184
libraries/SD/src
195185
libraries/SimpleBLE/src
@@ -251,13 +241,6 @@ endfunction()
251241

252242
maybe_add_component(esp-dsp)
253243

254-
if(CONFIG_ESP_INSIGHTS_ENABLED)
255-
maybe_add_component(esp_insights)
256-
endif()
257-
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
258-
maybe_add_component(esp_rainmaker)
259-
maybe_add_component(qrcode)
260-
endif()
261244
if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
262245
maybe_add_component(arduino_tinyusb)
263246
endif()

Diff for: ‎README.md

+2-39
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,7 @@
1-
# Arduino core for the ESP32, ESP32-S2, ESP32-S3 and ESP32-C3
1+
# Tasmota Arduino core for the ESP32, ESP32-S2, ESP32-S3 and ESP32-C3
22

3-
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![Documentation Status](https://readthedocs.com/projects/espressif-arduino-esp32/badge/?version=latest)](https://docs.espressif.com/projects/arduino-esp32/en/latest/?badge=latest)
43

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 take a look at [Sprint Meeting notes](https://github.com/espressif/arduino-esp32/discussions/categories/sprints-meeting-notes) or join [Monthly Community Meetings 🔔](https://github.com/espressif/arduino-esp32/discussions/categories/monthly-community-meetings)
4+
### [![GitHub Releases](https://img.shields.io/github/downloads/tasmota/arduino-esp32/total?label=downloads)](https://github.com/tasmota/arduino-esp32/releases/latest)
285

296
### Documentation
307

@@ -44,17 +21,3 @@ Visit the [supported chips](https://docs.espressif.com/projects/arduino-esp32/en
4421
### Decoding exceptions
4522

4623
You can use [EspExceptionDecoder](https://github.com/me-no-dev/EspExceptionDecoder) to get meaningful call trace.
47-
48-
### Issue/Bug report template
49-
50-
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+).
51-
52-
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).
53-
54-
### Contributing
55-
56-
We welcome contributions to the Arduino ESP32 project!
57-
58-
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.
59-
60-
> 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/Esp.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ String EspClass::getSketchMD5()
240240
md5.add(buf.get(), readBytes);
241241
lengthLeft -= readBytes;
242242
offset += readBytes;
243+
244+
#if CONFIG_FREERTOS_UNICORE
245+
delay(1); // Fix solo WDT
246+
#endif
243247
}
244248
md5.calculate();
245249
result = md5.toString();

0 commit comments

Comments
 (0)