Skip to content

Commit dfba2ee

Browse files
tannewttannewt
authored
Merge pull request adafruit#5342 from tannewt/rename_esp32s2_to_espressif
Rename esp32s2 port to espressif
2 parents 8520c43 + 6d43dd0 commit dfba2ee

File tree

352 files changed

+171
-750
lines changed

Some content is hidden

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

352 files changed

+171
-750
lines changed

‎.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
outputs:
1919
arm-boards: ${{ steps.set-matrix.outputs.arm-boards }}
2020
riscv-boards: ${{ steps.set-matrix.outputs.riscv-boards }}
21-
xtensa-boards: ${{ steps.set-matrix.outputs.xtensa-boards }}
21+
espressif-boards: ${{ steps.set-matrix.outputs.espressif-boards }}
2222
steps:
2323
- name: Dump GitHub context
2424
env:
@@ -322,14 +322,14 @@ jobs:
322322
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
323323
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
324324
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
325-
build-xtensa:
325+
build-espressif:
326326
runs-on: ubuntu-20.04
327327
needs: test
328328
strategy:
329329
fail-fast: false
330330
matrix:
331-
board: ${{ fromJSON(needs.test.outputs.xtensa-boards) }}
332-
if: ${{ needs.test.outputs.xtensa-boards != '[]' }}
331+
board: ${{ fromJSON(needs.test.outputs.espressif-boards) }}
332+
if: ${{ needs.test.outputs.espressif-boards != '[]' }}
333333

334334
steps:
335335
- name: Set up Python 3.8
@@ -348,28 +348,28 @@ jobs:
348348
id: idf-cache
349349
with:
350350
path: ${{ github.workspace }}/.idf_tools
351-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210716
351+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210716
352352
- name: Clone IDF submodules
353353
run: |
354354
(cd $IDF_PATH && git submodule update --init)
355355
env:
356-
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
356+
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
357357
- name: Install IDF tools
358358
run: |
359359
$IDF_PATH/tools/idf_tools.py --non-interactive install required
360360
$IDF_PATH/tools/idf_tools.py --non-interactive install cmake
361361
$IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
362362
rm -rf $IDF_TOOLS_PATH/dist
363363
env:
364-
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
364+
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
365365
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
366366
- name: Install CircuitPython deps
367367
run: |
368368
source $IDF_PATH/export.sh
369369
pip install -r requirements-dev.txt
370370
sudo apt-get install -y gettext ninja-build
371371
env:
372-
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
372+
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
373373
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
374374
- name: Versions
375375
run: |
@@ -381,7 +381,7 @@ jobs:
381381
cmake --version
382382
shell: bash
383383
env:
384-
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
384+
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
385385
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
386386
- name: mpy-cross
387387
run: make -C mpy-cross -j2
@@ -394,7 +394,7 @@ jobs:
394394
working-directory: tools
395395
shell: bash
396396
env:
397-
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
397+
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
398398
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
399399
BOARDS: ${{ matrix.board }}
400400
- uses: actions/upload-artifact@v2

‎.github/workflows/ports_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ jobs:
9999
# https://github.com/espressif/esp-idf/issues/7062
100100
#
101101
# - name: prepare esp
102-
# run: ports/esp32s2/esp-idf/install.bat
102+
# run: ports/espressif/esp-idf/install.bat
103103
# shell: cmd
104104
#
105105
# - name: build esp
106-
# run: . ports/esp32s2/esp-idf/export.sh && make -j2 -C ports/esp32s2 BOARD=adafruit_metro_esp32s2
106+
# run: . ports/espressif/esp-idf/export.sh && make -j2 -C ports/espressif BOARD=adafruit_metro_esp32s2

‎.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@
150150
[submodule "frozen/Adafruit_CircuitPython_RFM69"]
151151
path = frozen/Adafruit_CircuitPython_RFM69
152152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
153-
[submodule "ports/esp32s2/esp-idf"]
154-
path = ports/esp32s2/esp-idf
153+
[submodule "ports/espressif/esp-idf"]
154+
path = ports/espressif/esp-idf
155155
url = https://github.com/espressif/esp-idf.git
156156
branch = release/v4.3
157-
[submodule "ports/esp32s2/certificates/nina-fw"]
158-
path = ports/esp32s2/certificates/nina-fw
157+
[submodule "ports/espressif/certificates/nina-fw"]
158+
path = ports/espressif/certificates/nina-fw
159159
url = https://github.com/adafruit/nina-fw.git
160160
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
161161
path = frozen/Adafruit_CircuitPython_ST7789

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer
11-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/esp32s2/esp-idf-config/.*|ports/esp32s2/boards/.*/sdkconfig)'
11+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
1212
- id: trailing-whitespace
1313
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
1414
- repo: local

‎Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
4040
# the i18n builder cannot share the environment and doctrees with the others
4141
I18NSPHINXOPTS = $(BASEOPTS)
4242

43-
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/esp32s2 ports/mimxrt10xx ports/nrf ports/raspberrypi ports/stm py shared-bindings shared-module supervisor
43+
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/espressif ports/mimxrt10xx ports/nrf ports/raspberrypi ports/stm py shared-bindings shared-module supervisor
4444
# Paths to exclude from TRANSLATE_SOURCES
4545
# Each must be preceded by "-path"; if any wildcards, enclose in quotes.
4646
# Separate by "-o" (Find's "or" operand)
4747
TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \
4848
-o -path "ports/*/build" \
4949
-o -path ports/atmel-samd/asf4 \
5050
-o -path ports/cxd56/spresense-exported-sdk \
51-
-o -path ports/esp32s2/esp-idf \
51+
-o -path ports/espressif/esp-idf \
5252
-o -path ports/mimxrt10xx/sdk \
5353
-o -path ports/raspberrypi/sdk \
5454
-o -path ports/stm/st_driver \
@@ -283,8 +283,8 @@ samd21:
283283
samd51:
284284
$(MAKE) -C ports/atmel-samd BOARD=feather_m4_express
285285

286-
esp32s2:
287-
$(MAKE) -C ports/esp32s2 BOARD=espressif_saola_1_wroom
286+
espressif:
287+
$(MAKE) -C ports/espressif BOARD=espressif_saola_1_wroom
288288

289289
litex:
290290
$(MAKE) -C ports/litex BOARD=fomu
@@ -298,16 +298,16 @@ nrf:
298298
stm:
299299
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express
300300

301-
clean-one-of-each: clean-samd21 clean-samd51 clean-esp32s2 clean-litex clean-mimxrt10xx clean-nrf clean-stm
301+
clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nrf clean-stm
302302

303303
clean-samd21:
304304
$(MAKE) -C ports/atmel-samd BOARD=trinket_m0 clean
305305

306306
clean-samd51:
307307
$(MAKE) -C ports/atmel-samd BOARD=feather_m4_express clean
308308

309-
clean-esp32s2:
310-
$(MAKE) -C ports/esp32s2 BOARD=espressif_saola_1_wroom clean
309+
clean-espressif:
310+
$(MAKE) -C ports/espressif BOARD=espressif_saola_1_wroom clean
311311

312312
clean-litex:
313313
$(MAKE) -C ports/litex BOARD=fomu clean

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Supported Support status
213213
================ ============================================================
214214
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
215215
cxd56 stable
216-
esp32s2 stable
216+
espressif stable
217217
litex alpha
218218
mimxrt10xx alpha
219219
nrf stable

‎WEBUSB_README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
66

77
# WebUSB Serial Support
88

9-
To date, this has only been tested on one port (esp32s2), on one board (espressif_kaluga_1).
9+
To date, this has only been tested on one port (espressif), on one board (espressif_kaluga_1).
1010

1111
## What it does
1212

‎conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ def autoapi_prepare_jinja_env(jinja_env):
188188
"ports/atmel-samd/tools",
189189
"ports/cxd56/mkspk",
190190
"ports/cxd56/spresense-exported-sdk",
191-
"ports/esp32s2/certificates",
192-
"ports/esp32s2/esp-idf",
193-
"ports/esp32s2/.idf_tools",
194-
"ports/esp32s2/peripherals",
191+
"ports/espressif/certificates",
192+
"ports/espressif/esp-idf",
193+
"ports/espressif/.idf_tools",
194+
"ports/espressif/peripherals",
195195
"ports/litex/hw",
196196
"ports/minimal",
197197
"ports/mimxrt10xx/peripherals",

‎docs/shared_bindings_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from concurrent.futures import ThreadPoolExecutor
3232

33-
SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
33+
SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
3434

3535
aliases_by_board = {
3636
"circuitplayground_express": [

‎docs/supported_ports.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ is limited.
1313

1414
../ports/atmel-samd/README
1515
../ports/cxd56/README
16-
../ports/esp32s2/README
16+
../ports/espressif/README
1717
../ports/litex/README
1818
../ports/mimxrt10xx/README
1919
../ports/nrf/README

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy