Skip to content

Commit

Permalink
Merge branch 'master' into feature/ipv6_support
Browse files Browse the repository at this point in the history
  • Loading branch information
me-no-dev committed Jan 12, 2024
2 parents aad1041 + e4d6a8a commit 04a2034
Show file tree
Hide file tree
Showing 109 changed files with 265 additions and 194 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/docs.yml → .github/workflows/docs_build.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
name: ReadTheDocs CI
name: Documentation Build and Deploy CI

on:
push:
branches:
- master
- release/*
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
pull_request:
paths:
- 'docs/**'
Expand All @@ -16,7 +9,7 @@ on:
jobs:

build-docs:
name: Build ReadTheDocs
name: Build Documentation
runs-on: ubuntu-22.04
defaults:
run:
Expand All @@ -34,5 +27,11 @@ 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
46 changes: 46 additions & 0 deletions .github/workflows/docs_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Documentation Build and Deploy Production CI

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

jobs:

deploy-prod-docs:
name: Deploy Documentation Production
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions/setup-python@v2
with:
python-version: '3.10'
- name: Deploy Preview
env:
# Deploy to production server
DOCS_BUILD_DIR: "${CI_PROJECT_DIR}/docs/_build/"
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }}
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_PROD_SERVER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }}
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..."
deploy-docs
46 changes: 46 additions & 0 deletions .github/workflows/docs_preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Documentation Build and Deploy CI

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

jobs:

deploy-preview-docs:
name: Deploy Documentation Preview
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: "${CI_PROJECT_DIR}/docs/_build/"
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
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..."
deploy-docs
28 changes: 0 additions & 28 deletions docs/Makefile

This file was deleted.

File renamed without changes
File renamed without changes
File renamed without changes
16 changes: 16 additions & 0 deletions docs/_static/arduino_versions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
var DOCUMENTATION_VERSIONS = {
DEFAULTS: { has_targets: false,
supported_targets: [ "esp32" ]
},
VERSIONS: [
{ name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32s2", "esp32s3", "esp32c3", "esp32h2", "esp32c6" ] },
],
IDF_TARGETS: [
{ text: "ESP32", value: "esp32"},
{ text: "ESP32-S2", value: "esp32s2"},
{ text: "ESP32-S3", value: "esp32s3"},
{ text: "ESP32-C3", value: "esp32c3"},
{ text: "ESP32-H2", value: "esp32h2"},
{ text: "ESP32-C6", value: "esp32c6"},
]
};
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
54 changes: 54 additions & 0 deletions docs/conf_common.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# ---------------------------------------------------------------

from esp_docs.conf_docs import * # noqa: F403,F401

languages = ["en"]

# idf_targets = [
# "esp32",
# "esp32s2",
# "esp32s3",
# "esp32c3",
# "esp32c6",
# "esp32h2",
# ]

# link roles config
github_repo = "espressif/arduino-esp32"

# context used by sphinx_idf_theme
html_context["github_user"] = "espressif"
html_context["github_repo"] = "arduino-esp32"

html_static_path = ["../_static"]

# Conditional content

extensions += ['sphinx_copybutton',
'sphinx_tabs.tabs',
'esp_docs.esp_extensions.dummy_build_system',
]

# ESP32_DOCS = [
# "index.rst",
# ]

# ESP32S2_DOCS = ESP32_DOCS
# ESP32C3_DOCS = ESP32S2_DOCS
# ESP32S3_DOCS = ESP32S2_DOCS
# ESP32C6_DOCS = ESP32S2_DOCS
# ESP32H2_DOCS = ESP32S2_DOCS

# conditional_include_dict = {
# "esp32": ESP32_DOCS,
# "esp32s2": ESP32S2_DOCS,
# "esp32c3": ESP32C3_DOCS,
# "esp32s3": ESP32S3_DOCS,
# "esp32c6": ESP32C6_DOCS,
# "esp32h2": ESP32H2_DOCS,
# }

# Extra options required by sphinx_idf_theme
project_slug = "arduino-esp32"

# versions_url = "./../_static/arduino_versions.js"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/source/api/i2c.rst → docs/en/api/i2c.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ The I2C can be used in two different modes:
* **I2C Master Mode**
* In this mode, the ESP32 generates the clock signal and initiates the communication with the slave device.

.. figure:: ../_static/arduino_i2c_master.png
.. figure:: ../../_static/arduino_i2c_master.png
:align: center
:width: 720
:figclass: align-center

* **I2C Slave Mode**
* The slave mode, the clock is generated by the master device and responds to the master if the destination address is the same as the destination.

.. figure:: ../_static/arduino_i2c_slave.png
.. figure:: ../../_static/arduino_i2c_slave.png
:align: center
:width: 520
:figclass: align-center
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/source/api/wifi.rst → docs/en/api/wifi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Working as AP
In this mode, the ESP32 is configured as an Access Point (AP) and it's capable of receiving incoming connections from other devices (stations) by providing
a Wi-Fi network.

.. figure:: ../_static/wifi_esp32_ap.png
.. figure:: ../../_static/wifi_esp32_ap.png
:align: center
:width: 520
:figclass: align-center
Expand All @@ -33,7 +33,7 @@ Working as STA

The STA mode is used to connect the ESP32 to a Wi-Fi network, provided by an Access Point.

.. figure:: ../_static/wifi_esp32_sta.png
.. figure:: ../../_static/wifi_esp32_sta.png
:align: center
:width: 520
:figclass: align-center
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ No. Name Type [1]_ Function
Pin Layout
----------

.. figure:: ../_static/esp32-c3_devkitM-1_pinlayout.png
.. figure:: ../../_static/esp32-c3_devkitM-1_pinlayout.png
:align: center
:width: 600
:alt: ESP32-C3-DevKitM-1 (click to enlarge)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ No. Name Type Function
Pin Layout
----------

.. figure:: ../_static/esp32_devkitC_pinlayout.png
.. figure:: ../../_static/esp32_devkitC_pinlayout.png
:align: center
:width: 600
:alt: ESP32-DevKitC-1 (click to enlarge)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ No. Name Type Function
Pin Layout
----------

.. figure:: ../_static/esp32-s2_saola1_pinlayout.png
.. figure:: ../../_static/esp32-s2_saola1_pinlayout.png
:align: center
:width: 600
:alt: ESP32-S2-Saola-1 (click to enlarge)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/boards/boards.rst → docs/en/boards/boards.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ For each family, we have SoC variants with some differentiation. The differences
The modules use the SoC internally, including the external flash, PSRAM (in some models) and other essential electronic components. Essentially, all
modules from the same family use the same SoC.

.. figure:: ../_static/soc-module.png
.. figure:: ../../_static/soc-module.png
:align: center
:width: 250
:alt: ESP32 SoC and Module (click to enlarge)
Expand Down Expand Up @@ -60,7 +60,7 @@ Before buying: Keep in mind that for some "must have" features when choosing the
Espressif
---------

.. figure:: ../_static/logo_espressif.png
.. figure:: ../../_static/logo_espressif.png
:align: center
:width: 250
:alt: Espressif Logo
Expand Down
File renamed without changes.
File renamed without changes.
31 changes: 31 additions & 0 deletions docs/en/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# -*- coding: utf-8 -*-
#
# English Language RTD & Sphinx config file
#
# Uses ../conf_common.py for most non-language-specific settings.

# Importing conf_common adds all the non-language-specific
# parts to this conf module

try:
from conf_common import * # noqa: F403,F401
except ImportError:
import os
import sys
sys.path.insert(0, os.path.abspath('../'))
from conf_common import * # noqa: F403,F401

import datetime
current_year = datetime.datetime.now().year

# General information about the project.
project = u'Arduino ESP32'
copyright = u'2016 - {}, Espressif Systems (Shanghai) Co., Ltd'.format(current_year)
pdf_title = u'Arduino ESP32 Documentation Guide'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
language = 'en'

# Tracking ID for Google Analytics
google_analytics_id = 'G-F58JM78930'
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ You can check the results in `LIBRARIES_TEST.md`_.

The results file example:

.. image:: _static/external_library_test_schedule.png
.. image:: ../_static/external_library_test_schedule.png
:width: 600

Pull Request test result
Expand All @@ -113,18 +113,18 @@ Pull Request test result
If the test run on Pull Request, it will compile all libraries and sketches 2 times (before/after changes in PR) to see, if the PR is breaking/fixing libraries.
In the table the results are in order ``BEFORE -> AFTER``.

.. image:: _static/external_library_test_pr.png
.. image:: ../_static/external_library_test_pr.png
:width: 600

.. |success| image:: _static/green_checkmark.png
.. |success| image:: ../_static/green_checkmark.png
:height: 2ex
:class: no-scaled-link

.. |warning| image:: _static/warning.png
.. |warning| image:: ../_static/warning.png
:height: 2ex
:class: no-scaled-link

.. |fail| image:: _static/cross.png
.. |fail| image:: ../_static/cross.png
:height: 2ex
:class: no-scaled-link

Expand Down
File renamed without changes.
Loading

0 comments on commit 04a2034

Please sign in to comment.