Skip to content

Commit

Permalink
Merge branch 'master' into wificlient_remove_assignment_operator
Browse files Browse the repository at this point in the history
  • Loading branch information
me-no-dev authored Jan 16, 2024
2 parents cc6da05 + 5063cdd commit 368648b
Show file tree
Hide file tree
Showing 151 changed files with 1,168 additions and 891 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_py_tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fetch-depth: 2
ref: ${{ github.event.pull_request.head.ref }}
- name: Verify Python Tools Changed
uses: tj-actions/changed-files@v36
uses: tj-actions/changed-files@v41
id: verify-changed-files
with:
fetch_depth: '2'
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/docs.yml → .github/workflows/docs_build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ReadTheDocs CI
name: Documentation Build and Deploy CI

on:
push:
Expand All @@ -16,7 +16,7 @@ on:
jobs:

build-docs:
name: Build ReadTheDocs
name: Build ESP-Docs
runs-on: ubuntu-22.04
defaults:
run:
Expand All @@ -34,5 +34,12 @@ jobs:
sudo apt install python3-pip python3-setuptools
# GitHub CI installs pip3 and setuptools outside the path.
# Update the path to include them and run.
PATH=/home/runner/.local/bin:$PATH pip3 install --user -r ./docs/requirements.txt
cd ./docs && PATH=/home/runner/.local/bin:$PATH SPHINXOPTS="-W" make html
cd ./docs
PATH=/home/runner/.local/bin:$PATH pip3 install -r requirements.txt --prefer-binary
PATH=/home/runner/.local/bin:$PATH SPHINXOPTS="-W" build-docs -l en
- name: Archive Docs
uses: actions/upload-artifact@v2
with:
name: docs
path: docs

49 changes: 49 additions & 0 deletions .github/workflows/docs_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Documentation Build and Production Deploy CI

on:
push:
branches:
- release/*
paths:
- 'docs/**'
- '.github/workflows/docs.yml'

jobs:

deploy-prod-docs:
name: Deploy Documentation on Production
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Deploy Documentation
env:
# Deploy to production server
# DOCS_BUILD_DIR: "./docs/_build/"
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }}
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
# Deploy to preview server
run: |
sudo apt update
sudo apt install python3-pip python3-setuptools
source ./docs/utils.sh
add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
export GIT_VER=$(git describe --always)
echo "PIP install requirements..."
pip3 install --user -r ./docs/requirements.txt
echo "Building the Docs..."
cd ./docs && build-docs -l en
echo "Deploy the Docs..."
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/
cd $GITHUB_WORKSPACE/docs
deploy-docs
48 changes: 48 additions & 0 deletions .github/workflows/docs_preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Documentation Build and Preview Deploy CI

on:
push:
branches:
- master
paths:
- 'docs/**'
- '.github/workflows/docs.yml'

jobs:

deploy-preview-docs:
name: Deploy Documentation
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Deploy Preview
env:
# Deploy to preview server
# DOCS_BUILD_DIR: "./docs/_build"
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
run: |
sudo apt update
sudo apt install python3-pip python3-setuptools
source ./docs/utils.sh
add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
export GIT_VER=$(git describe --always)
echo "PIP install requirements..."
pip3 install --user -r ./docs/requirements.txt
echo "Building the Docs..."
cd ./docs && build-docs -l en
echo "Deploy the Docs..."
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/
cd $GITHUB_WORKSPACE/docs
deploy-docs
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ set(CORE_SRCS
cores/esp32/FunctionalInterrupt.cpp
cores/esp32/HardwareSerial.cpp
cores/esp32/IPAddress.cpp
cores/esp32/IPv6Address.cpp
cores/esp32/libb64/cdecode.c
cores/esp32/libb64/cencode.c
cores/esp32/main.cpp
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2

![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)
[![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)
![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)

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

Expand Down
45 changes: 14 additions & 31 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29364,7 +29364,7 @@ esp32s3_powerfeather.build.variant=esp32s3_powerfeather
esp32s3_powerfeather.build.board=ESP32S3_POWERFEATHER

esp32s3_powerfeather.build.usb_mode=1
esp32s3_powerfeather.build.cdc_on_boot=0
esp32s3_powerfeather.build.cdc_on_boot=1
esp32s3_powerfeather.build.msc_on_boot=0
esp32s3_powerfeather.build.dfu_on_boot=0
esp32s3_powerfeather.build.f_cpu=240000000L
Expand All @@ -29377,8 +29377,9 @@ esp32s3_powerfeather.build.partitions=default_8MB
esp32s3_powerfeather.build.defines=
esp32s3_powerfeather.build.loop_core=
esp32s3_powerfeather.build.event_core=
esp32s3_powerfeather.build.flash_type=qio
esp32s3_powerfeather.build.psram_type=qspi
esp32s3_powerfeather.build.memory_type={build.boot}_{build.psram_type}
esp32s3_powerfeather.build.memory_type={build.flash_type}_{build.psram_type}

esp32s3_powerfeather.menu.PSRAM.disabled=Disabled
esp32s3_powerfeather.menu.PSRAM.disabled.build.defines=
Expand Down Expand Up @@ -29418,10 +29419,10 @@ esp32s3_powerfeather.menu.USBMode.hwcdc.build.usb_mode=1
esp32s3_powerfeather.menu.USBMode.default=USB-OTG (TinyUSB)
esp32s3_powerfeather.menu.USBMode.default.build.usb_mode=0

esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
esp32s3_powerfeather.menu.CDCOnBoot.cdc=Enabled
esp32s3_powerfeather.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0

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

esp32s3_powerfeather.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.default.build.partitions=default
esp32s3_powerfeather.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
esp32s3_powerfeather.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
esp32s3_powerfeather.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
esp32s3_powerfeather.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
esp32s3_powerfeather.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.minimal.build.partitions=minimal
esp32s3_powerfeather.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.no_ota.build.partitions=no_ota
esp32s3_powerfeather.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
esp32s3_powerfeather.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
esp32s3_powerfeather.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
esp32s3_powerfeather.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
esp32s3_powerfeather.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.huge_app.build.partitions=huge_app
esp32s3_powerfeather.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
esp32s3_powerfeather.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB=8M with ffat (3MB APP/1.5MB FATFS)
esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.build.partitions=default_ffat_8MB
esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.upload.maximum_size=3342336
esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP/5.3MB SPIFFS)
esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB=Large FFAT (1.2MB APP/5.3MB FATFS)
esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.build.partitions=large_ffat_8MB
esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.upload.maximum_size=1310720
esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB=Maximum APP (7.9MB APP No OTA/No FS)
esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.build.partitions=max_app_8MB
esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.upload.maximum_size=8257536
esp32s3_powerfeather.menu.PartitionScheme.rainmaker=RainMaker
esp32s3_powerfeather.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
esp32s3_powerfeather.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728

esp32s3_powerfeather.menu.CPUFreq.240=240MHz (WiFi)
esp32s3_powerfeather.menu.CPUFreq.240.build.f_cpu=240000000L
Expand Down
2 changes: 1 addition & 1 deletion cores/esp32/Esp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ unsigned long long operator"" _GB(unsigned long long x)

EspClass ESP;

void EspClass::deepSleep(uint32_t time_us)
void EspClass::deepSleep(uint64_t time_us)
{
esp_deep_sleep(time_us);
}
Expand Down
2 changes: 1 addition & 1 deletion cores/esp32/Esp.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class EspClass
const char * getSdkVersion(); //version of ESP-IDF
const char * getCoreVersion();//version of this core

void deepSleep(uint32_t time_us);
void deepSleep(uint64_t time_us);

uint32_t getFlashChipSize();
uint32_t getFlashChipSpeed();
Expand Down
Loading

0 comments on commit 368648b

Please sign in to comment.