Merge pull request #5342 from tannewt/rename_esp32s2_to_espressif

Rename esp32s2 port to espressif

Author: tannewt

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
     outputs:
       arm-boards: ${{ steps.set-matrix.outputs.arm-boards }}
       riscv-boards: ${{ steps.set-matrix.outputs.riscv-boards }}
-      xtensa-boards: ${{ steps.set-matrix.outputs.xtensa-boards }}
+      espressif-boards: ${{ steps.set-matrix.outputs.espressif-boards }}
     steps:
     - name: Dump GitHub context
       env:
@@ -322,14 +322,14 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       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'))
-  build-xtensa:
+  build-espressif:
     runs-on: ubuntu-20.04
     needs: test
     strategy:
       fail-fast: false
       matrix:
-        board: ${{ fromJSON(needs.test.outputs.xtensa-boards) }}
-    if: ${{ needs.test.outputs.xtensa-boards != '[]' }}
+        board: ${{ fromJSON(needs.test.outputs.espressif-boards) }}
+    if: ${{ needs.test.outputs.espressif-boards != '[]' }}
 
     steps:
     - name: Set up Python 3.8
@@ -348,28 +348,28 @@ jobs:
       id: idf-cache
       with:
         path: ${{ github.workspace }}/.idf_tools
-        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210716
+        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210716
     - name: Clone IDF submodules
       run: |
         (cd $IDF_PATH && git submodule update --init)
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
     - name: Install IDF tools
       run: |
         $IDF_PATH/tools/idf_tools.py --non-interactive install required
         $IDF_PATH/tools/idf_tools.py --non-interactive install cmake
         $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
         rm -rf $IDF_TOOLS_PATH/dist
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Install CircuitPython deps
       run: |
         source $IDF_PATH/export.sh
         pip install -r requirements-dev.txt
         sudo apt-get install -y gettext ninja-build
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Versions
       run: |
@@ -381,7 +381,7 @@ jobs:
         cmake --version
       shell: bash
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: mpy-cross
       run: make -C mpy-cross -j2
@@ -394,7 +394,7 @@ jobs:
       working-directory: tools
       shell: bash
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
         BOARDS: ${{ matrix.board }}
     - uses: actions/upload-artifact@v2

.github/workflows/ports_windows.yml

@@ -99,8 +99,8 @@ jobs:
 # https://github.com/espressif/esp-idf/issues/7062
 #
 #    - name: prepare esp
-#      run: ports/esp32s2/esp-idf/install.bat
+#      run: ports/espressif/esp-idf/install.bat
 #      shell: cmd
 #
 #    - name: build esp
-#      run: . ports/esp32s2/esp-idf/export.sh && make -j2 -C ports/esp32s2 BOARD=adafruit_metro_esp32s2
+#      run: . ports/espressif/esp-idf/export.sh && make -j2 -C ports/espressif BOARD=adafruit_metro_esp32s2

.gitmodules

@@ -150,12 +150,12 @@
 [submodule "frozen/Adafruit_CircuitPython_RFM69"]
 	path = frozen/Adafruit_CircuitPython_RFM69
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
-[submodule "ports/esp32s2/esp-idf"]
-	path = ports/esp32s2/esp-idf
+[submodule "ports/espressif/esp-idf"]
+	path = ports/espressif/esp-idf
 	url = https://github.com/espressif/esp-idf.git
 	branch = release/v4.3
-[submodule "ports/esp32s2/certificates/nina-fw"]
-	path = ports/esp32s2/certificates/nina-fw
+[submodule "ports/espressif/certificates/nina-fw"]
+	path = ports/espressif/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
 [submodule "frozen/Adafruit_CircuitPython_ST7789"]
 	path = frozen/Adafruit_CircuitPython_ST7789

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/esp32s2/esp-idf-config/.*|ports/esp32s2/boards/.*/sdkconfig)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
         exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
 -   repo: local

Makefile

@@ -40,15 +40,15 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(BASEOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(BASEOPTS)
 
-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
+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
 # Paths to exclude from TRANSLATE_SOURCES
 # Each must be preceded by "-path"; if any wildcards, enclose in quotes.
 # Separate by "-o" (Find's "or" operand)
 TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \
 	-o -path "ports/*/build" \
 	-o -path ports/atmel-samd/asf4 \
 	-o -path ports/cxd56/spresense-exported-sdk \
-	-o -path ports/esp32s2/esp-idf \
+	-o -path ports/espressif/esp-idf \
 	-o -path ports/mimxrt10xx/sdk \
 	-o -path ports/raspberrypi/sdk \
 	-o -path ports/stm/st_driver \
@@ -283,8 +283,8 @@ samd21:
 samd51:
 	$(MAKE) -C ports/atmel-samd BOARD=feather_m4_express
 
-esp32s2:
-	$(MAKE) -C ports/esp32s2 BOARD=espressif_saola_1_wroom
+espressif:
+	$(MAKE) -C ports/espressif BOARD=espressif_saola_1_wroom
 
 litex:
 	$(MAKE) -C ports/litex BOARD=fomu
@@ -298,16 +298,16 @@ nrf:
 stm:
 	$(MAKE) -C ports/stm BOARD=feather_stm32f405_express
 
-clean-one-of-each: clean-samd21 clean-samd51 clean-esp32s2 clean-litex clean-mimxrt10xx clean-nrf clean-stm
+clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nrf clean-stm
 
 clean-samd21:
 	$(MAKE) -C ports/atmel-samd BOARD=trinket_m0 clean
 
 clean-samd51:
 	$(MAKE) -C ports/atmel-samd BOARD=feather_m4_express clean
 
-clean-esp32s2:
-	$(MAKE) -C ports/esp32s2 BOARD=espressif_saola_1_wroom clean
+clean-espressif:
+	$(MAKE) -C ports/espressif BOARD=espressif_saola_1_wroom clean
 
 clean-litex:
 	$(MAKE) -C ports/litex BOARD=fomu clean

README.rst

@@ -213,7 +213,7 @@ Supported         Support status
 ================  ============================================================
 atmel-samd        ``SAMD21`` stable | ``SAMD51`` stable
 cxd56             stable
-esp32s2           stable
+espressif         stable
 litex             alpha
 mimxrt10xx        alpha
 nrf               stable

WEBUSB_README.md

@@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
 
 # WebUSB Serial Support
 
-To date, this has only been tested on one port (esp32s2), on one board (espressif_kaluga_1).
+To date, this has only been tested on one port (espressif), on one board (espressif_kaluga_1).
 
 ## What it does
 

conf.py

@@ -188,10 +188,10 @@ def autoapi_prepare_jinja_env(jinja_env):
                     "ports/atmel-samd/tools",
                     "ports/cxd56/mkspk",
                     "ports/cxd56/spresense-exported-sdk",
-                    "ports/esp32s2/certificates",
-                    "ports/esp32s2/esp-idf",
-                    "ports/esp32s2/.idf_tools",
-                    "ports/esp32s2/peripherals",
+                    "ports/espressif/certificates",
+                    "ports/espressif/esp-idf",
+                    "ports/espressif/.idf_tools",
+                    "ports/espressif/peripherals",
                     "ports/litex/hw",
                     "ports/minimal",
                     "ports/mimxrt10xx/peripherals",

docs/shared_bindings_matrix.py

@@ -30,7 +30,7 @@
 
 from concurrent.futures import ThreadPoolExecutor
 
-SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
+SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
 
 aliases_by_board = {
     "circuitplayground_express": [

docs/supported_ports.rst

@@ -13,7 +13,7 @@ is limited.
 
     ../ports/atmel-samd/README
     ../ports/cxd56/README
-    ../ports/esp32s2/README
+    ../ports/espressif/README
     ../ports/litex/README
     ../ports/mimxrt10xx/README
     ../ports/nrf/README