Merge branch 'main' into main

Author: dahanzimin

.gitmodules

@@ -286,6 +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 "ports/espressif/boards/mixgo_ce_udisk/cp_lib"]
 	path = ports/espressif/boards/mixgo_ce_udisk/cp_lib
-	url = https://github.com/dahanzimin/circuitpython_lib.git
+	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"

conf.py

@@ -53,9 +53,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/__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.

docs/library/builtins.rst

@@ -4,11 +4,18 @@
 All builtin functions and exceptions are described here. They are also
 available via ``builtins`` module.
 
+For more information about built-ins, see the following CPython documentation:
+
+* `Builtin CPython Functions <https://docs.python.org/3/library/functions.html>`_
+* `Builtin CPython Exceptions <https://docs.python.org/3/library/exceptions.html>`_
+* `Builtin CPython Constants <https://docs.python.org/3/library/constants.html>`_
+
+.. note:: Not all of these functions, types, exceptions, and constants are turned
+    on in all CircuitPython ports, for space reasons.
+
 Functions and types
 -------------------
 
-Not all of these functions and types are turned on in all CircuitPython ports, for space reasons.
-
 .. function:: abs()
 
 .. function:: all()
@@ -160,46 +167,77 @@ Not all of these functions and types are turned on in all CircuitPython ports, f
 Exceptions
 ----------
 
+.. exception:: ArithmeticError
+
 .. exception:: AssertionError
 
 .. exception:: AttributeError
 
+.. exception:: BaseException
+
+.. exception:: BrokenPipeError
+
+.. exception:: ConnectionError
+
+.. exception:: EOFError
+
 .. exception:: Exception
 
 .. exception:: ImportError
 
+.. exception:: IndentationError
+
 .. exception:: IndexError
 
 .. exception:: KeyboardInterrupt
 
 .. exception:: KeyError
 
+.. exception:: LookupError
+
 .. exception:: MemoryError
 
+.. exception:: MpyError
+
+    Not a part of the CPython standard library
+
 .. exception:: NameError
 
 .. exception:: NotImplementedError
 
 .. exception:: OSError
 
+.. exception:: OverflowError
+
 .. exception:: RuntimeError
 
 .. exception:: ReloadException
 
    `ReloadException` is used internally to deal with soft restarts.
 
+   Not a part of the CPython standard library
+
+.. exception:: StopAsyncIteration
+
 .. exception:: StopIteration
 
 .. exception:: SyntaxError
 
 .. exception:: SystemExit
 
-    |see_cpython| :py:class:`cpython:SystemExit`.
+.. exception:: TimeoutError
 
 .. exception:: TypeError
 
-    |see_cpython| :py:class:`cpython:TypeError`.
+.. exception:: UnicodeError
 
 .. exception:: ValueError
 
 .. exception:: ZeroDivisionError
+
+Constants
+---------
+
+.. data:: Ellipsis
+
+.. data:: NotImplemented

docs/shared_bindings_matrix.py

@@ -62,9 +62,17 @@
     "fontio": "CIRCUITPY_DISPLAYIO",
     "terminalio": "CIRCUITPY_DISPLAYIO",
     "adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
-    "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF"
+    "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",
+    "usb": "CIRCUITPY_USB_HOST",
 }
 
+frozen_excludes = ["examples", "docs", "tests", "utils", "conf.py", "setup.py"]
+"""Files and dirs at the root of a frozen directory that should be ignored.
+This is the same list as in the preprocess_frozen_modules script."""
+
+repository_urls = {}
+"""Cache of repository URLs for frozen modules."""
+
 def get_circuitpython_root_dir():
     """ The path to the root './circuitpython' directory
     """
@@ -162,6 +170,63 @@ def get_settings_from_makefile(port_dir, board_name):
 
     return settings
 
+def get_repository_url(directory):
+    if directory in repository_urls:
+        return repository_urls[directory]
+    readme = None
+    for readme_path in (
+            os.path.join(directory, "README.rst"),
+            os.path.join(os.path.dirname(directory), "README.rst")
+        ):
+        if os.path.exists(readme_path):
+            readme = readme_path
+            break
+    path = None
+    if readme:
+        with open(readme, "r") as fp:
+            for line in fp.readlines():
+                if m := re.match("\s+:target:\s+(http\S+(docs.circuitpython|readthedocs)\S+)\s*", line):
+                    path = m.group(1)
+                    break
+                if m := re.search("<(http[^>]+)>", line):
+                    path = m.group(1)
+                    break
+    if path is None:
+        contents = subprocess.run(
+            ["git", "remote", "get-url", "origin"],
+            encoding="utf-8",
+            errors="replace",
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            cwd=directory
+        )
+        path = contents.stdout.strip()
+    repository_urls[directory] = path
+    return path
+
+def frozen_modules_from_dirs(frozen_mpy_dirs):
+    """
+    Go through the list of frozen directories and extract the python modules.
+    Paths are of the type:
+        $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
+        $(TOP)/frozen/circuitpython-stage/meowbit
+    Python modules are at the root of the path, and are python files or directories
+    containing python files. Except the ones in the frozen_excludes list.
+    """
+    frozen_modules = []
+    for frozen_path in filter(lambda x: x, frozen_mpy_dirs.split(" ")):
+        source_dir = get_circuitpython_root_dir() / frozen_path[7:]
+        url_repository = get_repository_url(source_dir)
+        for sub in source_dir.glob("*"):
+            if sub.name in frozen_excludes:
+                continue
+            if sub.name.endswith(".py"):
+                frozen_modules.append((sub.name[:-3], url_repository))
+                continue
+            if next(sub.glob("**/*.py"), None): # tests if not empty
+                frozen_modules.append((sub.name, url_repository))
+    return frozen_modules
+
 def lookup_setting(settings, key, default=''):
     while True:
         value = settings.get(key, default)
@@ -207,16 +272,22 @@ def support_matrix(arg):
                 board_modules.append(base[module]['name'])
         board_modules.sort()
 
+        frozen_modules = []
+        if "FROZEN_MPY_DIRS" in settings:
+            frozen_modules = frozen_modules_from_dirs(settings["FROZEN_MPY_DIRS"])
+            if frozen_modules:
+                frozen_modules.sort()
+
         # generate alias boards too
-        board_matrix = [(board_name, board_modules)]
+        board_matrix = [(board_name, (board_modules, frozen_modules))]
         if entry.name in aliases_by_board:
             for alias in aliases_by_board[entry.name]:
                 if use_branded_name:
                     if alias in aliases_brand_names:
                         alias = aliases_brand_names[alias]
                     else:
                         alias = alias.replace("_"," ").title()
-                board_matrix.append( (alias, board_modules) )
+                board_matrix.append( (alias, (board_modules, frozen_modules)) )
 
         return board_matrix # this is now a list of (board,modules)
 
@@ -225,7 +296,6 @@ def support_matrix(arg):
     # flatmap with comprehensions
     boards = dict(sorted([board for matrix in mapped_exec for board in matrix]))
 
-    # print(json.dumps(boards, indent=2))
     return boards
 
 if __name__ == '__main__':

docs/static/filter.css

@@ -7,8 +7,21 @@
 	right: 10px;
 	top: 4px;
 }
-.support-matrix-table .this_module code,
-.support-matrix-table .this_module span {
+
+.support-matrix-table .reference.external {
+	box-sizing: border-box;
+	font-weight: 700;
+	color: #404040;
+	font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", Courier, monospace;
+	padding: 2px 5px;
+	background: white;
+	border: 1px solid #e1e4e5;
+	font-size: 75%;
+}
+
+.support-matrix-table .this_module,
+.support-matrix-table .this_module.reference.external,
+.support-matrix-table .this_module * {
 	background: black;
 	color: white;
 }

docs/static/filter.js

@@ -44,14 +44,14 @@ $(() => {
 		var nvisible = 0;
 		$(".support-matrix-table tbody tr").each( (index,item) => {
 			var name = $(item).find("td:first-child p").html();
-			var modules = $(item).find("a.reference.internal");
+			var modules = $(item).find("code, a.reference.external");
 			var matching_all = true;
 			//
 			list_search.forEach((sstring) => {
 				var matching = (sstring[0] == "-");
 				for(var modi = 0; modi < modules.length; ++modi) {
 					module = modules[modi];
-					var mod_name = module.firstChild.firstChild.textContent;
+					var mod_name = module.firstChild.textContent;
 					if(sstring[0] == "-") {
 						if(mod_name.match(sstring.substr(1))) {
 							matching = false;