Skip to content

Commit bfad05b

Browse files
Jason2866Jason2866
authored
Merge pull request #225 from tasmota/revert-224-release/v2.x
Revert "Update PR to upstream" since it messed up
2 parents a6b17e2 + 85e1d4e commit bfad05b

File tree

1,313 files changed

+10254
-19282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,313 files changed

+10254
-19282
lines changed

‎.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/tasmota/arduino-esp32.git esp32 > /dev/null 2>&1
23+
git clone https://github.com/espressif/arduino-esp32.git esp32 > /dev/null 2>&1
2424
fi
2525

2626
#echo "Updating Submodules ..."

‎.github/scripts/install-platformio-esp32.sh

100644100755
+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/tasmota/platform-espressif32.git"
4+
PLATFORMIO_ESP32_URL="https://github.com/platformio/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" == "tasmota/arduino-esp32" ]; then
43+
if [ "$GITHUB_REPOSITORY" == "espressif/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/tasmota/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
48+
git clone --recursive https://github.com/espressif/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
4949
fi
5050

5151
echo "PlatformIO for ESP32 has been installed"

‎.github/scripts/on-release.sh

-2
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,7 @@ sed "s/version=.*/version=$ver$extent/g" | \
200200
sed 's/tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf/tools.xtensa-esp32-elf-gcc.path=\{runtime.tools.xtensa-esp32-elf-gcc.path\}/g' | \
201201
sed 's/tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s2-elf/tools.xtensa-esp32s2-elf-gcc.path=\{runtime.tools.xtensa-esp32s2-elf-gcc.path\}/g' | \
202202
sed 's/tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s3-elf/tools.xtensa-esp32s3-elf-gcc.path=\{runtime.tools.xtensa-esp32s3-elf-gcc.path\}/g' | \
203-
sed 's/tools.xtensa-esp-elf-gdb.path={runtime.platform.path}\/tools\/xtensa-esp-elf-gdb/tools.xtensa-esp-elf-gdb.path=\{runtime.tools.xtensa-esp-elf-gdb.path\}/g' | \
204203
sed 's/tools.riscv32-esp-elf-gcc.path={runtime.platform.path}\/tools\/riscv32-esp-elf/tools.riscv32-esp-elf-gcc.path=\{runtime.tools.riscv32-esp-elf-gcc.path\}/g' | \
205-
sed 's/tools.riscv32-esp-elf-gdb.path={runtime.platform.path}\/tools\/riscv32-esp-elf-gdb/tools.riscv32-esp-elf-gdb.path=\{runtime.tools.riscv32-esp-elf-gdb.path\}/g' | \
206204
sed 's/tools.esptool_py.path={runtime.platform.path}\/tools\/esptool/tools.esptool_py.path=\{runtime.tools.esptool_py.path\}/g' | \
207205
sed 's/debug.server.openocd.path={runtime.platform.path}\/tools\/openocd-esp32\/bin\/openocd/debug.server.openocd.path=\{runtime.tools.openocd-esp32.path\}\/bin\/openocd/g' | \
208206
sed 's/debug.server.openocd.scripts_dir={runtime.platform.path}\/tools\/openocd-esp32\/share\/openocd\/scripts\//debug.server.openocd.scripts_dir=\{runtime.tools.openocd-esp32.path\}\/share\/openocd\/scripts\//g' | \

‎.github/workflows/push.yml

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ 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+
1624
# Ubuntu
1725
build-arduino-linux:
1826
name: Arduino ${{ matrix.chunk }} on ubuntu-latest

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
tools/xtensa-esp32-elf
22
tools/xtensa-esp32s2-elf
33
tools/xtensa-esp32s3-elf
4-
tools/xtensa-esp-elf-gdb
54
tools/riscv32-esp-elf
6-
tools/riscv32-esp-elf-gdb
75
tools/dist
86
tools/esptool
97
tools/esptool.exe

‎CMakeLists.txt

+15
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,18 @@ 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
9192
libraries/I2S/src/I2S.cpp
9293
libraries/NetBIOS/src/NetBIOS.cpp
9394
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
102+
libraries/RainMaker/src/AppInsights.cpp
94103
libraries/SD_MMC/src/SD_MMC.cpp
95104
libraries/SD/src/SD.cpp
96105
libraries/SD/src/sd_diskio.cpp
@@ -177,9 +186,11 @@ set(includedirs
177186
libraries/HTTPClient/src
178187
libraries/HTTPUpdate/src
179188
libraries/LittleFS/src
189+
libraries/Insights/src
180190
libraries/I2S/src
181191
libraries/NetBIOS/src
182192
libraries/Preferences/src
193+
libraries/RainMaker/src
183194
libraries/SD_MMC/src
184195
libraries/SD/src
185196
libraries/SimpleBLE/src
@@ -241,6 +252,10 @@ endfunction()
241252

242253
maybe_add_component(esp-dsp)
243254

255+
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
256+
maybe_add_component(esp_rainmaker)
257+
maybe_add_component(qrcode)
258+
endif()
244259
if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
245260
maybe_add_component(arduino_tinyusb)
246261
endif()

‎README.md

+46-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
1-
# Tasmota Arduino core for the ESP32, ESP32-S2, ESP32-S3 and ESP32-C3
1+
# 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)
4+
[![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)
35

4-
### [![GitHub Releases](https://img.shields.io/github/downloads/tasmota/arduino-esp32/total?label=downloads)](https://github.com/tasmota/arduino-esp32/releases/latest)
6+
### 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)
7+
8+
## Contents
9+
10+
- [Development Status](#development-status)
11+
- [Development Planning](#development-planning)
12+
- [Documentation](#documentation)
13+
- [Supported Chips](#supported-chips)
14+
- [Decoding exceptions](#decoding-exceptions)
15+
- [Issue/Bug report template](#issuebug-report-template)
16+
- [Contributing](#contributing)
17+
18+
### Development Status
19+
20+
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/)
21+
22+
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/)
23+
24+
### Development Planning
25+
26+
Our Development is fully tracked on this public **[Roadmap 🎉](https://github.com/orgs/espressif/projects/3)**
27+
28+
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)
529

630
### Documentation
731

@@ -20,4 +44,23 @@ Visit the [supported chips](https://docs.espressif.com/projects/arduino-esp32/en
2044

2145
### Decoding exceptions
2246

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

0 commit comments

Comments
 (0)