Skip to content

Commit 368648b

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into wificlient_remove_assignment_operator
2 parents cc6da05 + 5063cdd commit 368648b

File tree

151 files changed

+1168
-891
lines changed

Some content is hidden

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

151 files changed

+1168
-891
lines changed

‎.github/workflows/build_py_tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 2
2323
ref: ${{ github.event.pull_request.head.ref }}
2424
- name: Verify Python Tools Changed
25-
uses: tj-actions/changed-files@v36
25+
uses: tj-actions/changed-files@v41
2626
id: verify-changed-files
2727
with:
2828
fetch_depth: '2'

‎.github/workflows/docs.yml renamed to ‎.github/workflows/docs_build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ReadTheDocs CI
1+
name: Documentation Build and Deploy CI
22

33
on:
44
push:
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717

1818
build-docs:
19-
name: Build ReadTheDocs
19+
name: Build ESP-Docs
2020
runs-on: ubuntu-22.04
2121
defaults:
2222
run:
@@ -34,5 +34,12 @@ jobs:
3434
sudo apt install python3-pip python3-setuptools
3535
# GitHub CI installs pip3 and setuptools outside the path.
3636
# Update the path to include them and run.
37-
PATH=/home/runner/.local/bin:$PATH pip3 install --user -r ./docs/requirements.txt
38-
cd ./docs && PATH=/home/runner/.local/bin:$PATH SPHINXOPTS="-W" make html
37+
cd ./docs
38+
PATH=/home/runner/.local/bin:$PATH pip3 install -r requirements.txt --prefer-binary
39+
PATH=/home/runner/.local/bin:$PATH SPHINXOPTS="-W" build-docs -l en
40+
- name: Archive Docs
41+
uses: actions/upload-artifact@v2
42+
with:
43+
name: docs
44+
path: docs
45+

‎.github/workflows/docs_deploy.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Documentation Build and Production Deploy CI
2+
3+
on:
4+
push:
5+
branches:
6+
- release/*
7+
paths:
8+
- 'docs/**'
9+
- '.github/workflows/docs.yml'
10+
11+
jobs:
12+
13+
deploy-prod-docs:
14+
name: Deploy Documentation on Production
15+
runs-on: ubuntu-22.04
16+
defaults:
17+
run:
18+
shell: bash
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
submodules: true
23+
- uses: actions/setup-python@v4
24+
with:
25+
python-version: '3.10'
26+
- name: Deploy Documentation
27+
env:
28+
# Deploy to production server
29+
# DOCS_BUILD_DIR: "./docs/_build/"
30+
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }}
31+
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }}
32+
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
33+
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }}
34+
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
35+
# Deploy to preview server
36+
run: |
37+
sudo apt update
38+
sudo apt install python3-pip python3-setuptools
39+
source ./docs/utils.sh
40+
add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
41+
export GIT_VER=$(git describe --always)
42+
echo "PIP install requirements..."
43+
pip3 install --user -r ./docs/requirements.txt
44+
echo "Building the Docs..."
45+
cd ./docs && build-docs -l en
46+
echo "Deploy the Docs..."
47+
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/
48+
cd $GITHUB_WORKSPACE/docs
49+
deploy-docs

‎.github/workflows/docs_preview.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Documentation Build and Preview Deploy CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- 'docs/**'
9+
- '.github/workflows/docs.yml'
10+
11+
jobs:
12+
13+
deploy-preview-docs:
14+
name: Deploy Documentation
15+
runs-on: ubuntu-22.04
16+
defaults:
17+
run:
18+
shell: bash
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
submodules: true
23+
- uses: actions/setup-python@v4
24+
with:
25+
python-version: '3.10'
26+
- name: Deploy Preview
27+
env:
28+
# Deploy to preview server
29+
# DOCS_BUILD_DIR: "./docs/_build"
30+
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
31+
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
32+
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
33+
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
34+
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
35+
run: |
36+
sudo apt update
37+
sudo apt install python3-pip python3-setuptools
38+
source ./docs/utils.sh
39+
add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
40+
export GIT_VER=$(git describe --always)
41+
echo "PIP install requirements..."
42+
pip3 install --user -r ./docs/requirements.txt
43+
echo "Building the Docs..."
44+
cd ./docs && build-docs -l en
45+
echo "Deploy the Docs..."
46+
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/
47+
cd $GITHUB_WORKSPACE/docs
48+
deploy-docs

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ set(CORE_SRCS
5151
cores/esp32/FunctionalInterrupt.cpp
5252
cores/esp32/HardwareSerial.cpp
5353
cores/esp32/IPAddress.cpp
54-
cores/esp32/IPv6Address.cpp
5554
cores/esp32/libb64/cdecode.c
5655
cores/esp32/libb64/cencode.c
5756
cores/esp32/main.cpp

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
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)
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)
54

65
### 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)
76

‎boards.txt

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29364,7 +29364,7 @@ esp32s3_powerfeather.build.variant=esp32s3_powerfeather
2936429364
esp32s3_powerfeather.build.board=ESP32S3_POWERFEATHER
2936529365

2936629366
esp32s3_powerfeather.build.usb_mode=1
29367-
esp32s3_powerfeather.build.cdc_on_boot=0
29367+
esp32s3_powerfeather.build.cdc_on_boot=1
2936829368
esp32s3_powerfeather.build.msc_on_boot=0
2936929369
esp32s3_powerfeather.build.dfu_on_boot=0
2937029370
esp32s3_powerfeather.build.f_cpu=240000000L
@@ -29377,8 +29377,9 @@ esp32s3_powerfeather.build.partitions=default_8MB
2937729377
esp32s3_powerfeather.build.defines=
2937829378
esp32s3_powerfeather.build.loop_core=
2937929379
esp32s3_powerfeather.build.event_core=
29380+
esp32s3_powerfeather.build.flash_type=qio
2938029381
esp32s3_powerfeather.build.psram_type=qspi
29381-
esp32s3_powerfeather.build.memory_type={build.boot}_{build.psram_type}
29382+
esp32s3_powerfeather.build.memory_type={build.flash_type}_{build.psram_type}
2938229383

2938329384
esp32s3_powerfeather.menu.PSRAM.disabled=Disabled
2938429385
esp32s3_powerfeather.menu.PSRAM.disabled.build.defines=
@@ -29418,10 +29419,10 @@ esp32s3_powerfeather.menu.USBMode.hwcdc.build.usb_mode=1
2941829419
esp32s3_powerfeather.menu.USBMode.default=USB-OTG (TinyUSB)
2941929420
esp32s3_powerfeather.menu.USBMode.default.build.usb_mode=0
2942029421

29421-
esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
29422-
esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
2942329422
esp32s3_powerfeather.menu.CDCOnBoot.cdc=Enabled
2942429423
esp32s3_powerfeather.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
29424+
esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
29425+
esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
2942529426

2942629427
esp32s3_powerfeather.menu.MSCOnBoot.default=Disabled
2942729428
esp32s3_powerfeather.menu.MSCOnBoot.default.build.msc_on_boot=0
@@ -29440,39 +29441,21 @@ esp32s3_powerfeather.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
2944029441
esp32s3_powerfeather.menu.UploadMode.cdc.upload.use_1200bps_touch=true
2944129442
esp32s3_powerfeather.menu.UploadMode.cdc.upload.wait_for_upload_port=true
2944229443

29443-
esp32s3_powerfeather.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
29444-
esp32s3_powerfeather.menu.PartitionScheme.default.build.partitions=default
29445-
esp32s3_powerfeather.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
29446-
esp32s3_powerfeather.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
2944729444
esp32s3_powerfeather.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
2944829445
esp32s3_powerfeather.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
2944929446
esp32s3_powerfeather.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
29450-
esp32s3_powerfeather.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
29451-
esp32s3_powerfeather.menu.PartitionScheme.minimal.build.partitions=minimal
29452-
esp32s3_powerfeather.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
29453-
esp32s3_powerfeather.menu.PartitionScheme.no_ota.build.partitions=no_ota
29454-
esp32s3_powerfeather.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
29455-
esp32s3_powerfeather.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
29456-
esp32s3_powerfeather.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
29457-
esp32s3_powerfeather.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
29458-
esp32s3_powerfeather.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
29459-
esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
29460-
esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
29461-
esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
29462-
esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
29463-
esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
29464-
esp32s3_powerfeather.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
29465-
esp32s3_powerfeather.menu.PartitionScheme.huge_app.build.partitions=huge_app
29466-
esp32s3_powerfeather.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
29467-
esp32s3_powerfeather.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
29468-
esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
29469-
esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
29447+
esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB=8M with ffat (3MB APP/1.5MB FATFS)
29448+
esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.build.partitions=default_ffat_8MB
29449+
esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.upload.maximum_size=3342336
29450+
esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP/5.3MB SPIFFS)
29451+
esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
29452+
esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
29453+
esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB=Large FFAT (1.2MB APP/5.3MB FATFS)
29454+
esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.build.partitions=large_ffat_8MB
29455+
esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.upload.maximum_size=1310720
2947029456
esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB=Maximum APP (7.9MB APP No OTA/No FS)
2947129457
esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.build.partitions=max_app_8MB
2947229458
esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.upload.maximum_size=8257536
29473-
esp32s3_powerfeather.menu.PartitionScheme.rainmaker=RainMaker
29474-
esp32s3_powerfeather.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
29475-
esp32s3_powerfeather.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
2947629459

2947729460
esp32s3_powerfeather.menu.CPUFreq.240=240MHz (WiFi)
2947829461
esp32s3_powerfeather.menu.CPUFreq.240.build.f_cpu=240000000L

‎cores/esp32/Esp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ unsigned long long operator"" _GB(unsigned long long x)
131131

132132
EspClass ESP;
133133

134-
void EspClass::deepSleep(uint32_t time_us)
134+
void EspClass::deepSleep(uint64_t time_us)
135135
{
136136
esp_deep_sleep(time_us);
137137
}

‎cores/esp32/Esp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class EspClass
8686
const char * getSdkVersion(); //version of ESP-IDF
8787
const char * getCoreVersion();//version of this core
8888

89-
void deepSleep(uint32_t time_us);
89+
void deepSleep(uint64_t time_us);
9090

9191
uint32_t getFlashChipSize();
9292
uint32_t getFlashChipSpeed();

0 commit comments

Comments
 (0)