Skip to content

Commit 0c145b7

Browse files
lbouelboue
authored
Merge branch 'master' into crowpanel_7
2 parents f88a9e4 + bdabb99 commit 0c145b7

File tree

10 files changed

+147
-98
lines changed

10 files changed

+147
-98
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
2828
#git submodule update --init --recursive > /dev/null 2>&1
2929

3030
echo "Installing Platform Tools ..."
31-
cd tools && python get.py
31+
if [ "$OS_IS_WINDOWS" == "1" ]; then
32+
cd tools && ./get.exe
33+
else
34+
cd tools && python get.py
35+
fi
3236
cd $script_init_path
3337

3438
echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"

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

+15-11
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ name: Build Python Tools
33
on:
44
pull_request:
55
paths:
6-
- 'tools/get.py'
7-
- 'tools/espota.py'
8-
- 'tools/gen_esp32part.py'
9-
- 'tools/gen_insights_package.py'
6+
- '.github/workflows/build_py_tools.yml'
7+
- 'tools/get.py'
8+
- 'tools/espota.py'
9+
- 'tools/gen_esp32part.py'
10+
- 'tools/gen_insights_package.py'
1011

1112
jobs:
1213
find-changed-tools:
@@ -21,6 +22,13 @@ jobs:
2122
with:
2223
fetch-depth: 2
2324
ref: ${{ github.event.pull_request.head.ref }}
25+
26+
- name: Check if checkout failed
27+
if: failure()
28+
run: |
29+
echo "Checkout failed."
30+
echo "Make sure you are using a branch inside the repository and not a fork."
31+
2432
- name: Verify Python Tools Changed
2533
uses: tj-actions/changed-files@v41
2634
id: verify-changed-files
@@ -47,7 +55,7 @@ jobs:
4755
strategy:
4856
fail-fast: false
4957
matrix:
50-
os: [windows-latest, macos-latest, ubuntu-20.04, ARM, ARM64]
58+
os: [windows-latest, macos-latest, ubuntu-20.04, ARM]
5159
include:
5260
- os: windows-latest
5361
TARGET: win64
@@ -63,10 +71,6 @@ jobs:
6371
CONTAINER: python:3.8-bullseye
6472
TARGET: arm
6573
SEPARATOR: ':'
66-
- os: ARM64
67-
CONTAINER: python:3.8-bullseye
68-
TARGET: arm64
69-
SEPARATOR: ':'
7074
container: ${{ matrix.CONTAINER }} # use python container on ARM
7175
env:
7276
DISTPATH: pytools-${{ matrix.TARGET }}
@@ -93,7 +97,7 @@ jobs:
9397
ref: ${{ github.event.pull_request.head.ref }}
9498
- name: Set up Python 3.8
9599
# Skip setting python on ARM because of missing compatibility: https://github.com/actions/setup-python/issues/108
96-
if: matrix.os != 'ARM' && matrix.os != 'ARM64'
100+
if: matrix.os != 'ARM'
97101
uses: actions/setup-python@master
98102
with:
99103
python-version: 3.8
@@ -108,7 +112,7 @@ jobs:
108112
pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=.github/pytools/espressif.ico tools/$tool.py
109113
done
110114
- name: Sign binaries
111-
if: matrix.os == 'windows-latest' && env.CERTIFICATE != '' && env.CERTIFICATE_PASSWORD != ''
115+
if: matrix.os == 'windows-latest'
112116
env:
113117
CERTIFICATE: ${{ secrets.CERTIFICATE }}
114118
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}

Diff for: ‎boards.txt

+41-8
Original file line numberDiff line numberDiff line change
@@ -21731,12 +21731,25 @@ heltec_wifi_kit_32.build.defines=
2173121731
heltec_wifi_kit_32.build.band=LoRaWAN_NONE
2173221732
heltec_wifi_kit_32.build.LoRaWanDebugLevel=0
2173321733

21734-
heltec_wifi_kit_32.menu.PSRAM.disabled=Disabled
21735-
heltec_wifi_kit_32.menu.PSRAM.disabled.build.defines=
21736-
heltec_wifi_kit_32.menu.PSRAM.disabled.build.extra_libs=
21737-
heltec_wifi_kit_32.menu.PSRAM.enabled=Enabled
21738-
heltec_wifi_kit_32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
21739-
heltec_wifi_kit_32.menu.PSRAM.enabled.build.extra_libs=
21734+
heltec_wifi_kit_32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
21735+
heltec_wifi_kit_32.menu.PartitionScheme.default.build.partitions=default
21736+
heltec_wifi_kit_32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
21737+
heltec_wifi_kit_32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
21738+
heltec_wifi_kit_32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
21739+
heltec_wifi_kit_32.menu.PartitionScheme.no_ota.build.partitions=no_ota
21740+
heltec_wifi_kit_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
21741+
heltec_wifi_kit_32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
21742+
heltec_wifi_kit_32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
21743+
heltec_wifi_kit_32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
21744+
heltec_wifi_kit_32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
21745+
heltec_wifi_kit_32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
21746+
heltec_wifi_kit_32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
21747+
heltec_wifi_kit_32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
21748+
heltec_wifi_kit_32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
21749+
heltec_wifi_kit_32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
21750+
heltec_wifi_kit_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
21751+
heltec_wifi_kit_32.menu.PartitionScheme.huge_app.build.partitions=huge_app
21752+
heltec_wifi_kit_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2174021753

2174121754
heltec_wifi_kit_32.menu.CPUFreq.240=240MHz (WiFi/BT)
2174221755
heltec_wifi_kit_32.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -21907,14 +21920,34 @@ heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32
2190721920
heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32
2190821921

2190921922
heltec_wifi_lora_32.build.f_cpu=240000000L
21910-
heltec_wifi_lora_32.build.flash_size=8MB
21923+
heltec_wifi_lora_32.build.flash_size=4MB
2191121924
heltec_wifi_lora_32.build.flash_freq=80m
2191221925
heltec_wifi_lora_32.build.flash_mode=dio
2191321926
heltec_wifi_lora_32.build.boot=qio
21914-
heltec_wifi_lora_32.build.partitions=default_8MB
21927+
heltec_wifi_lora_32.build.partitions=default
2191521928
heltec_wifi_lora_32.build.psram=
2191621929
heltec_wifi_lora_32.build.defines=-D{build.band} -DMCU_ESP32_D0 -DWIFI_LORA_32 -DHELTEC_BOARD=1 -DRADIO_CHIP_SX127X -DSLOW_CLK_TPYE=0 -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} -DLORAWAN_PREAMBLE_LENGTH={build.LORAWAN_PREAMBLE_LENGTH} -DLORAWAN_DEVEUI_AUTO={build.LORAWAN_DEVEUI_AUTO} {build.psram}
2191721930

21931+
heltec_wifi_lora_32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
21932+
heltec_wifi_lora_32.menu.PartitionScheme.default.build.partitions=default
21933+
heltec_wifi_lora_32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
21934+
heltec_wifi_lora_32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
21935+
heltec_wifi_lora_32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
21936+
heltec_wifi_lora_32.menu.PartitionScheme.no_ota.build.partitions=no_ota
21937+
heltec_wifi_lora_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
21938+
heltec_wifi_lora_32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
21939+
heltec_wifi_lora_32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
21940+
heltec_wifi_lora_32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
21941+
heltec_wifi_lora_32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
21942+
heltec_wifi_lora_32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
21943+
heltec_wifi_lora_32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
21944+
heltec_wifi_lora_32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
21945+
heltec_wifi_lora_32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
21946+
heltec_wifi_lora_32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
21947+
heltec_wifi_lora_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
21948+
heltec_wifi_lora_32.menu.PartitionScheme.huge_app.build.partitions=huge_app
21949+
heltec_wifi_lora_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
21950+
2191821951
heltec_wifi_lora_32.menu.CPUFreq.240=240MHz (WiFi/BT)
2191921952
heltec_wifi_lora_32.menu.CPUFreq.240.build.f_cpu=240000000L
2192021953
heltec_wifi_lora_32.menu.CPUFreq.160=160MHz (WiFi/BT)

Diff for: ‎docs/en/api/preferences.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ Arduino-esp32 Preferences API
524524

525525
.. code-block:: arduino
526526
527-
uint8_t getUChar(const char* key, uint8_t defaultValue = 0);
527+
bool getBool(const char* key, bool defaultValue = false);
528528
529529
..
530530

Diff for: ‎libraries/ESP32/examples/Time/SimpleTime/SimpleTime.ino

+9-8
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ void setup() {
3333
// First step is to configure WiFi STA and connect in order to get the current time and date.
3434
Serial.printf("Connecting to %s ", ssid);
3535
WiFi.begin(ssid, password);
36-
while (WiFi.status() != WL_CONNECTED) {
37-
delay(500);
38-
Serial.print(".");
39-
}
40-
Serial.println(" CONNECTED");
41-
42-
// set notification call-back function
43-
sntp_set_time_sync_notification_cb(timeavailable);
4436

4537
/**
4638
* NTP server address could be acquired via DHCP,
@@ -52,6 +44,15 @@ void setup() {
5244
*/
5345
esp_sntp_servermode_dhcp(1); // (optional)
5446

47+
while (WiFi.status() != WL_CONNECTED) {
48+
delay(500);
49+
Serial.print(".");
50+
}
51+
Serial.println(" CONNECTED");
52+
53+
// set notification call-back function
54+
sntp_set_time_sync_notification_cb(timeavailable);
55+
5556
/**
5657
* This will set configured ntp servers and constant TimeZone/daylightOffset
5758
* should be OK if your time zone does not need to adjust daylightOffset twice a year,

Diff for: ‎package/package_esp32_index.template.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
"packager": "esp32",
4444
"name": "esp32-arduino-libs",
45-
"version": "idf-release_v5.1-3f9ab2d6a6"
45+
"version": "idf-release_v5.1-c00dad83c1"
4646
},
4747
{
4848
"packager": "esp32",
@@ -105,63 +105,63 @@
105105
"tools": [
106106
{
107107
"name": "esp32-arduino-libs",
108-
"version": "idf-release_v5.1-3f9ab2d6a6",
108+
"version": "idf-release_v5.1-c00dad83c1",
109109
"systems": [
110110
{
111111
"host": "i686-mingw32",
112-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
113-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
114-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
115-
"size": "297521768"
112+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
113+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
114+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
115+
"size": "307795199"
116116
},
117117
{
118118
"host": "x86_64-mingw32",
119-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
120-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
121-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
122-
"size": "297521768"
119+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
120+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
121+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
122+
"size": "307795199"
123123
},
124124
{
125125
"host": "arm64-apple-darwin",
126-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
127-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
128-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
129-
"size": "297521768"
126+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
127+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
128+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
129+
"size": "307795199"
130130
},
131131
{
132132
"host": "x86_64-apple-darwin",
133-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
134-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
135-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
136-
"size": "297521768"
133+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
134+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
135+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
136+
"size": "307795199"
137137
},
138138
{
139139
"host": "x86_64-pc-linux-gnu",
140-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
141-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
142-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
143-
"size": "297521768"
140+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
141+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
142+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
143+
"size": "307795199"
144144
},
145145
{
146146
"host": "i686-pc-linux-gnu",
147-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
148-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
149-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
150-
"size": "297521768"
147+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
148+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
149+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
150+
"size": "307795199"
151151
},
152152
{
153153
"host": "aarch64-linux-gnu",
154-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
155-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
156-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
157-
"size": "297521768"
154+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
155+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
156+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
157+
"size": "307795199"
158158
},
159159
{
160160
"host": "arm-linux-gnueabihf",
161-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/a6dac936bfcfa4c11468e003f550b41c76efeae6",
162-
"archiveFileName": "esp32-arduino-libs-a6dac936bfcfa4c11468e003f550b41c76efeae6.zip",
163-
"checksum": "SHA-256:b9173333fca2c6caa265dab050c62f1bb71e52dcb7cf21bd91b7fe1c37b3b444",
164-
"size": "297521768"
161+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/946521b2ad18b0b22c19133c00bfa53105e9832d",
162+
"archiveFileName": "esp32-arduino-libs-946521b2ad18b0b22c19133c00bfa53105e9832d.zip",
163+
"checksum": "SHA-256:4c7b3b21ccc375e10e69fb6ef344067799d44f250214125d43e129fbe00e5937",
164+
"size": "307795199"
165165
}
166166
]
167167
},

Diff for: ‎tools/get.exe

-7.38 KB
Binary file not shown.

0 commit comments

Comments
 (0)