Merge branch 'main' into board-bus

Author: microdev1

.github/workflows/build.yml

@@ -30,10 +30,10 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py test ${{ github.sha }}
     - name: CircuitPython version
@@ -136,10 +136,10 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
     - name: CircuitPython version
@@ -202,10 +202,10 @@ jobs:
       run: |
         git describe --dirty --tags
         echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -241,7 +241,7 @@ jobs:
         zip -9r circuitpython-stubs.zip circuitpython-stubs
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
     - name: Upload stubs to PyPi
-      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'))
+      if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
       env:
         TWINE_USERNAME: ${{ secrets.pypi_username }}
         TWINE_PASSWORD: ${{ secrets.pypi_password }}
@@ -260,10 +260,10 @@ jobs:
         board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
     if: ${{ needs.test.outputs.boards-arm != '[]' }}
     steps:
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - uses: actions/[email protected]
       with:
         submodules: false
@@ -312,10 +312,10 @@ jobs:
         board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
     if: ${{ needs.test.outputs.boards-riscv != '[]' }}
     steps:
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - uses: actions/[email protected]
       with:
         submodules: false
@@ -364,10 +364,10 @@ jobs:
         board: ${{ fromJSON(needs.test.outputs.boards-espressif) }}
     if: ${{ needs.test.outputs.boards-espressif != '[]' }}
     steps:
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - uses: actions/[email protected]
       with:
         submodules: false
@@ -451,10 +451,10 @@ jobs:
         board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
     if: ${{ needs.test.outputs.boards-aarch != '[]' }}
     steps:
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - uses: actions/[email protected]
       with:
         submodules: false

.github/workflows/create_website_pr.yml

@@ -20,10 +20,10 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py website ${{ github.sha }}
     - name: Install deps

.github/workflows/pre-commit.yml

@@ -13,7 +13,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/[email protected]
-    - uses: actions/setup-python@v1
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.x"
     - name: Install deps
       run: |
         sudo apt-add-repository -y -u ppa:pybricks/ppa

.gitmodules

@@ -148,7 +148,7 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
-	url = https://github.com/espressif/esp-idf.git
+	url = https://github.com/adafruit/esp-idf.git
 	branch = release/v4.4
 [submodule "ports/espressif/certificates/nina-fw"]
 	path = ports/espressif/certificates/nina-fw

.pre-commit-config.yaml

@@ -4,7 +4,7 @@
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.0.1
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer

.readthedocs.yml

@@ -11,7 +11,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.9"
+    python: "3"
 
 submodules:
     include:
@@ -22,4 +22,4 @@ formats:
 
 python:
     install:
-        - requirements: docs/requirements.txt
+        - requirements: requirements-doc.txt

BUILDING.md

@@ -15,7 +15,7 @@ https://learn.adafruit.com/building-circuitpython/
 
 ## Setup
 
-Please ensure you setup your build environment appropriately, as per the guide.  You will need:
+Please ensure you set up your build environment appropriately, as per the guide.  You will need:
 
 * Linux: https://learn.adafruit.com/building-circuitpython/linux
 * MacOS: https://learn.adafruit.com/building-circuitpython/macos
@@ -25,8 +25,9 @@ Please ensure you setup your build environment appropriately, as per the guide.
 
 This project has a bunch of git submodules.  You will need to update them regularly.
 
-    git submodule sync
-    git submodule update --init
+In the root folder of the CircuitPython repository, execute the following:
+
+    make fetch-submodules
 
 ### Required Python Packages
 
@@ -100,7 +101,7 @@ We apply code quality checks using pre-commit.  Install pre-commit once per syst
 
 Activate it once per git clone with
 
-    pre-commit --install
+    pre-commit install
 
 Pre-commit also requires some additional programs to be installed through your package manager:
 

docs/library/re.rst

@@ -95,11 +95,11 @@ Supported operators and special sequences are:
 
 Example::
 
-    import ure
+    import re
 
-    # As ure doesn't support escapes itself, use of r"" strings is not
+    # As re doesn't support escapes itself, use of r"" strings is not
     # recommended.
-    regex = ure.compile("[\r\n]")
+    regex = re.compile("[\r\n]")
 
     regex.split("line1\rline2\nline3\r\n")
 

docs/requirements.txt

@@ -0,0 +1,4 @@
+{%- extends "sphinx_rtd_theme/breadcrumbs.html" %}
+
+{% block breadcrumbs_aside %}
+{% endblock %}

docs/templates/breadcrumbs.html

@@ -420,7 +420,10 @@ static sdmmc_err_t cis_tuple_func_manfid(const void* p, uint8_t* data, FILE* fp)
     int size = *(data++);
     fprintf(fp, "TUPLE: %s, size: %d\n", tuple->name, size);
     CIS_CHECK_SIZE(size, 4);
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wcast-align"
     fprintf(fp, "  MANF: %04X, CARD: %04X\n", *(uint16_t*)(data), *(uint16_t*)(data+2));
+    #pragma GCC diagnostic pop
     return SDMMC_OK;
 }
 
@@ -480,7 +483,10 @@ static sdmmc_err_t cis_tuple_func_cftable_entry(const void* p, uint8_t* data, FI
         CIS_CHECK_SIZE(size, 2);
         size-=2;
         CIS_CHECK_UNSUPPORTED(mem_space==1); //other cases not handled yet
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wcast-align"
         int len = *(uint16_t*)data;
+        #pragma GCC diagnostic pop
         fprintf(fp, "  LEN: %04X\n", len);
         data+=2;
     }