Merge pull request #2 from adafruit/main

Merge main

Author: fonix232

.devcontainer/Readme.md

@@ -0,0 +1,31 @@
+Build CircuitPython in a Github-Devcontainer
+============================================
+
+To build CircuitPython within a Github-Devcontainer, you need to perform
+the following steps.
+
+  1. checkout the code to a devcontainer
+
+    - click on the green "<> Code"-button
+    - select the Codespaces-tab
+    - choose "+ new with options..." from the "..."-menu
+    - in the following screen select the branch and then
+    - select ".devcontainer/cortex-m/devcontainer.json" instead
+      of "Default Codespaces configuration"
+    - update region as necessary
+    - finally, click on the green "Create codespace" button
+
+  2. Your codespace is created. Cloning the images is quite fast, but
+     preparing it for CircuitPython-development takes about 10 minutes.
+     Note that this is a one-time task.
+
+  3. During creation, you can run the command
+     `tail -f /workspaces/.codespaces/.persistedshare/creation.log`
+     to see what is going on.
+
+  4. To actually build CircuitPython, run
+
+         cd ports/raspberrypi
+         make -j $(nproc) BOARD=whatever TRANSLATION=xx_XX
+
+     This takes about 2m40s.

.devcontainer/cortex-m/devcontainer.json

@@ -0,0 +1,23 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/universal
+{
+	"name": "CircuitPython Cortex-M Build-Environment (base: Default Linux Universal)",
+	"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
+	"postCreateCommand": ".devcontainer/cortex-m/on-create.sh",
+	"remoteEnv": { "PATH": "/workspaces/gcc-arm-none-eabi/bin:${containerEnv:PATH}" }
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.devcontainer/cortex-m/on-create.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# on-create.sh: postCreateCommand-hook for devcontainer.json (Cortex-M build)
+#
+# Author: Bernhard Bablok
+#
+# -----------------------------------------------------------------------------
+
+echo -e "[on-create.sh] downloading and installing gcc-arm-non-eabi toolchain"
+cd /workspaces
+wget -qO gcc-arm-none-eabi.tar.bz2 https://adafru.it/Pid
+tar -xjf  gcc-arm-none-eabi.tar.bz2
+ln -s gcc-arm-none-eabi-10-2020-q4-major gcc-arm-none-eabi
+rm -f /workspaces/gcc-arm-none-eabi.tar.bz2
+export PATH=/workspaces/gcc-arm-none-eabi/bin:$PATH
+
+# add repository and install tools
+echo -e "[on-create.sh] adding pybricks/ppa"
+sudo add-apt-repository -y ppa:pybricks/ppa
+echo -e "[on-create.sh] installing uncrustify and mtools"
+sudo apt-get -y install uncrustify mtools
+
+# dosfstools >= 4.2 needed, standard repo only has 4.1
+echo -e "[on-create.sh] downloading and installing dosfstools"
+wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+tar -xzf dosfstools-4.2.tar.gz
+cd dosfstools-4.2/
+./configure
+make -j $(nproc)
+sudo make install
+cd /workspaces
+rm -fr /workspaces/dosfstools-4.2 /workspaces/dosfstools-4.2.tar.gz
+
+# prepare source-code tree
+cd /workspaces/circuitpython/
+echo -e "[on-create.sh] fetching submodules"
+make fetch-submodules
+echo -e "[on-create.sh] fetching tags"
+git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD
+
+# additional python requirements
+echo -e "[on-create.sh] pip-installing requirements"
+pip install --upgrade -r requirements-dev.txt
+pip install --upgrade -r requirements-doc.txt
+
+# add pre-commit
+echo -e "[on-create.sh] installing pre-commit"
+pre-commit install
+
+# create cross-compiler
+echo -e "[on-create.sh] building mpy-cross"
+make -j $(nproc) -C mpy-cross                   # time: about 36 sec
+
+# that's it!
+echo -e "[on-create.sh] setup complete"
+
+#commands to actually build CP:
+#cd ports/raspberrypi
+#time make -j $(nproc) BOARD=pimoroni_tufty2040 TRANSLATION=de_DE

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: false
-        fetch-depth: 1
+        fetch-depth: 0
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
@@ -125,20 +125,30 @@ jobs:
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
-    - name: "Get changes"
+    - name: Get last commit with checks
+      id: get-last-commit-with-checks
+      if: github.event_name == 'pull_request'
+      working-directory: tools
+      env:
+        REPO: ${{ github.repository }}
+        PULL: ${{ github.event.number }}
+        GITHUB_TOKEN: ${{ github.token }}
+        EXCLUDE_COMMIT: ${{ github.event.after }}
+      run: python3 -u ci_changes_per_commit.py
+    - name: Get changes
+      id: get-changes
       if: github.event_name == 'pull_request'
-      uses: dorny/paths-filter@v2
-      id: filter
-      with:
-        list-files: json
-        filters: |
-          changed:
-            - '**'
-    - name: "Set matrix"
+      uses: tj-actions/[email protected]
+      with:
+        json: true
+        sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}
+        base_sha: ${{ steps.get-last-commit-with-checks.outputs.commit }}
+    - name: Set matrix
       id: set-matrix
       working-directory: tools
       env:
-        CHANGED_FILES: ${{ steps.filter.outputs.changed_files }}
+        CHANGED_FILES: ${{ steps.get-changes.outputs.all_changed_and_modified_files }}
+        LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.checkruns }}
       run: python3 -u ci_set_matrix.py
 
 
@@ -156,7 +166,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
     - name: CircuitPython version
@@ -220,7 +230,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -278,7 +288,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -331,7 +341,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -384,7 +394,7 @@ jobs:
       id: py3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false
@@ -473,7 +483,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.x"
+        python-version: "3.10"
     - uses: actions/checkout@v3
       with:
         submodules: false

.gitignore

@@ -9,6 +9,7 @@
 !atmel-samd/asf/**/*.a
 *.elf
 *.bin
+!*.toml.bin
 *.map
 *.hex
 *.dis

.gitmodules

@@ -146,7 +146,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython8
+	branch = release/v4.4-circuitpython
 [submodule "ports/espressif/certificates/nina-fw"]
 	path = lib/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
@@ -310,12 +310,21 @@
 [submodule "ports/espressif/esp32-camera"]
 	path = ports/espressif/esp32-camera
 	url = https://github.com/adafruit/esp32-camera/
+        branch = circuitpython
 [submodule "ports/raspberrypi/lib/cyw43-driver"]
 	path = ports/raspberrypi/lib/cyw43-driver
-	url = https://github.com/georgerobotics/cyw43-driver.git
+	url = https://github.com/adafruit/cyw43-driver.git
+	branch = circuitpython8
 [submodule "ports/raspberrypi/lib/lwip"]
 	path = ports/raspberrypi/lib/lwip
-	url = https://github.com/lwip-tcpip/lwip.git
+	url = https://github.com/adafruit/lwip.git
+	branch = circuitpython8
 [submodule "lib/mbedtls"]
 	path = lib/mbedtls
 	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "frozen/Adafruit_CircuitPython_UC8151D"]
+	path = frozen/Adafruit_CircuitPython_UC8151D
+	url = https://github.com/adafruit/Adafruit_CircuitPython_UC8151D
+[submodule "frozen/Adafruit_CircuitPython_SSD1680"]
+	path = frozen/Adafruit_CircuitPython_SSD1680
+	url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1680

BUILDING.md

@@ -35,6 +35,8 @@ Failing to install these will prevent from properly building.
 
     pip3 install -r requirements-dev.txt
 
+If you run into an error installing minify_html, you may need to install `rust`.
+
 ### mpy-cross
 
 As part of the build process, mpy-cross is needed to compile .py files into .mpy files.

Makefile

@@ -90,7 +90,7 @@ clean:
 	rm -rf autoapi
 	rm -rf $(STUBDIR) $(DISTDIR) *.egg-info
 
-html: stubs
+html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

conf.py

@@ -171,6 +171,7 @@ def autoapi_prepare_jinja_env(jinja_env):
                     ".env",
                     ".venv",
                     ".direnv",
+                    ".devcontainer/Readme.md",
                     "data",
                     "docs/autoapi",
                     "docs/README.md",

devices/ble_hci/common-hal/_bleio/Adapter.c

@@ -49,8 +49,8 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
-#if CIRCUITPY_DOTENV
-#include "shared-module/dotenv/__init__.h"
+#if CIRCUITPY_OS_GETENV
+#include "shared-bindings/os/__init__.h"
 #endif
 
 #define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
@@ -284,15 +284,15 @@ char default_ble_name[] = { 'C', 'I', 'R', 'C', 'U', 'I', 'T', 'P', 'Y', 0, 0, 0
 STATIC void bleio_adapter_hci_init(bleio_adapter_obj_t *self) {
     mp_int_t name_len = 0;
 
-    #if CIRCUITPY_DOTENV
-    char ble_name[32];
-    name_len = dotenv_get_key("/.env", "CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name) - 1);
-    if (name_len > 0) {
-        self->name = mp_obj_new_str(ble_name, (size_t)name_len);
+    #if CIRCUITPY_OS_GETENV
+    mp_obj_t name = common_hal_os_getenv("CIRCUITPY_BLE_NAME", mp_const_none);
+    if (name != mp_const_none) {
+        mp_arg_validate_type_string(name, MP_QSTR_CIRCUITPY_BLE_NAME);
+        self->name = name;
     }
     #endif
 
-    if (name_len <= 0) {
+    if (!self->name) {
         name_len = sizeof(default_ble_name);
         bt_addr_t addr;
         hci_check_error(hci_read_bd_addr(&addr));