Merge branch 'adafruit:main' into rp2040-shim

Author: xorbit

.github/workflows/build.yml

@@ -382,7 +382,8 @@ jobs:
     if: ${{ needs.test.outputs.boards-espressif != '[]' }}
     steps:
     - name: Set up Python 3
-      uses: actions/setup-python@v2
+      id: py3
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
     - uses: actions/[email protected]
@@ -400,7 +401,7 @@ jobs:
       id: idf-cache
       with:
         path: ${{ github.workspace }}/.idf_tools
-        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404
+        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
     - name: Clone IDF submodules
       run: |
         (cd $IDF_PATH && git submodule update --init)

.gitmodules

@@ -286,3 +286,9 @@
 [submodule "frozen/Adafruit_CircuitPython_FakeRequests"]
 	path = frozen/Adafruit_CircuitPython_FakeRequests
 	url = https://github.com/adafruit/Adafruit_CircuitPython_FakeRequests.git
+[submodule "frozen/pew-pewpew-lcd"]
+	path = frozen/pew-pewpew-lcd
+	url = https://github.com/pypewpew/pew-pewpew-lcd.git
+[submodule "frozen/mixgo_cp_lib"]
+	path = frozen/mixgo_cp_lib
+	url = https://github.com/dahanzimin/circuitpython_lib.git

.readthedocs.yml

@@ -9,16 +9,15 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
-  tools:
-    python: "3"
-
-submodules:
-    include:
-        - extmod/ulab
+    os: ubuntu-20.04
+    tools:
+        python: "3"
+    jobs:
+        post_install:
+            - python tools/ci_fetch_deps.py docs HEAD
 
 formats:
-  - pdf
+    - pdf
 
 python:
     install:

Makefile

@@ -61,6 +61,7 @@ TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  fetch-submodules	to fetch dependencies from submodules, run this right after you clone the repo"
 	@echo "  html       to make standalone HTML files"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"

README.rst

@@ -120,7 +120,7 @@ Behavior
    make each file independent from each other.
 
    -  ``boot.py`` runs only once on start up before
-      USB is initialized. This lays the ground work for configuring USB at
+      workflows are initialized. This lays the ground work for configuring USB at
       startup rather than it being fixed. Since serial is not available,
       output is written to ``boot_out.txt``.
    -  ``code.py`` (or ``main.py``) is run after every reload until it
@@ -135,7 +135,10 @@ Behavior
    possible to fix code that causes nasty crashes by making it available through mass storage after
    the crash. A reset (the button) is needed after it's fixed to get back into normal mode.
 -  RGB status LED indicating CircuitPython state.
--  Re-runs ``code.py`` or other main file after file system writes over USB mass storage. (Disable with
+   - One green flash - code completed without error.
+   - Two red flashes - code ended due to an exception.
+   - Three yellow flashes - safe mode. May be due to CircuitPython internal error.
+-  Re-runs ``code.py`` or other main file after file system writes by a workflow. (Disable with
    ``supervisor.disable_autoreload()``)
 -  Autoreload is disabled while the REPL is active.
 -  Main is one of these: ``code.txt``, ``code.py``, ``main.py``,

conf.py

@@ -33,6 +33,25 @@
 
 tools_describe = str(pathlib.Path(__file__).parent / "tools/describe")
 
+# Monkeypatch autoapi
+def _format_args(args_info, include_annotations=True, ignore_self=None):
+    result = []
+
+    for i, (prefix, name, annotation, default) in enumerate(args_info):
+        if i == 0 and ignore_self is not None and name == ignore_self:
+            continue
+        formatted = "{}{}{}{}".format(
+            prefix or "",
+            name or "",
+            ": {}".format(annotation) if annotation and include_annotations else "",
+            (" = {}" if annotation else "={}").format(default) if default else "",
+        )
+        result.append(formatted)
+    return ", ".join(result)
+
+import autoapi.mappers.python.objects as objects
+objects._format_args = _format_args
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -53,9 +72,13 @@
 modules_support_matrix = shared_bindings_matrix.support_matrix_by_board()
 modules_support_matrix_reverse = defaultdict(list)
 for board, modules in modules_support_matrix.items():
-    for module in modules:
+    for module in modules[0]:
         modules_support_matrix_reverse[module].append(board)
-modules_support_matrix_reverse = dict((module, sorted(boards)) for module, boards in modules_support_matrix_reverse.items())
+
+modules_support_matrix_reverse = dict(
+    (module, sorted(boards))
+    for module, boards in modules_support_matrix_reverse.items()
+)
 
 html_context = {
     'support_matrix': modules_support_matrix,

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

@@ -57,9 +57,9 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     self->value = mp_obj_new_bytes(initial_value_bufinfo->buf, initial_value_bufinfo->len);
 
     const mp_int_t max_length_max = 512;
-    if (max_length < 0 || max_length > max_length_max) {
-        mp_raise_ValueError(translate("max_length must be <= 512"));
-    }
+
+    mp_arg_validate_int_range(max_length, 0, max_length_max, MP_QSTR_max_length);
+
     self->max_length = max_length;
     self->fixed_length = fixed_length;
 

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

@@ -57,6 +57,11 @@ bool vm_used_ble;
 //     }
 // }
 
+void bleio_user_reset() {
+    // HCI doesn't support the BLE workflow so just do a full reset.
+    bleio_reset();
+}
+
 // Turn off BLE on a reset or reload.
 void bleio_reset() {
     // Create a UUID object for all CCCD's.

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

@@ -44,6 +44,7 @@
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
 #include "supervisor/shared/tick.h"
+#include "supervisor/shared/translate/translate.h"
 
 STATIC uint16_t max_mtu = BT_ATT_DEFAULT_LE_MTU;  // 23
 STATIC unsigned long timeout = 5000;

docs/environment.rst

@@ -0,0 +1,40 @@
+Environment Variables
+=====================
+
+CircuitPython 8.0.0 introduces support for environment variables. Environment
+variables are commonly used to store "secrets" such as Wi-Fi passwords and API
+keys. This method *does not* make them secure. It only separates them from the
+code.
+
+CircuitPython supports these by mimicking the `dotenv <https://github.com/theskumar/python-dotenv>`_
+CPython library. Other languages such as Javascript, PHP and Ruby also have
+dotenv libraries.
+
+These libraries store environment variables in a ``.env`` file. Here is a simple
+example:
+
+.. code-block:: bash
+
+  KEY1='value1'
+  # Comment
+  KEY2='value2
+  is multiple lines'
+
+CircuitPython uses the ``.env`` at the drive root (no folder) as the environment.
+User code can access the values from the file using `os.getenv()`. It is
+recommended to save any values used repeatedly in a variable because `os.getenv()`
+will parse the ``/.env`` on every access.
+
+CircuitPython behavior
+----------------------
+
+CircuitPython will also read the environment to configure its behavior. Other
+keys are ignored by CircuitPython. Here are the keys it uses:
+
+CIRCUITPY_WIFI_PASSWORD
+~~~~~~~~~~~~~~~~~~~~~~~
+Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID
+
+CIRCUITPY_WIFI_SSID
+~~~~~~~~~~~~~~~~~~~
+Wi-Fi SSID to auto-connect to even if user code is not running.