Merge remote-tracking branch 'adafruit/main' into native_wifi

Author: tannewt

.github/workflows/build.yml

@@ -410,6 +410,7 @@ jobs:
         board:
         - "espressif_saola_1_wroom"
         - "espressif_saola_1_wrover"
+        - "microdev_micro_s2"
         - "unexpectedmaker_feathers2"
 
     steps:

conf.py

@@ -42,6 +42,9 @@
 # Grab the JSON values to use while building the module support matrix
 # in 'shared-bindings/index.rst'
 
+# The stubs must be built before we calculate the shared bindings matrix
+subprocess.check_output(["make", "stubs"])
+
 #modules_support_matrix = shared_bindings_matrix.support_matrix_excluded_boards()
 modules_support_matrix = shared_bindings_matrix.support_matrix_by_board()
 
@@ -77,7 +80,6 @@
     '.md': 'markdown',
 }
 
-subprocess.check_output(["make", "stubs"])
 extensions.append('autoapi.extension')
 
 autoapi_type = 'python'

docs/porting.rst

@@ -51,10 +51,15 @@ as a natural "TODO" list. An example minimal build list is shown below:
 .. code-block:: makefile
 
     # These modules are implemented in ports/<port>/common-hal:
-    CIRCUITPY_MICROCONTROLLER = 0 # Typically the first module to create
-    CIRCUITPY_DIGITALIO = 0       # Typically the second module to create
+
+    # Typically the first module to create
+    CIRCUITPY_MICROCONTROLLER = 0
+    # Typically the second module to create
+    CIRCUITPY_DIGITALIO = 0
+    # Other modules:
     CIRCUITPY_ANALOGIO = 0
     CIRCUITPY_BUSIO = 0
+    CIRCUITPY_COUNTIO = 0
     CIRCUITPY_NEOPIXEL_WRITE = 0
     CIRCUITPY_PULSEIO = 0
     CIRCUITPY_OS = 0
@@ -63,22 +68,34 @@ as a natural "TODO" list. An example minimal build list is shown below:
     CIRCUITPY_AUDIOIO = 0
     CIRCUITPY_ROTARYIO = 0
     CIRCUITPY_RTC = 0
+    CIRCUITPY_SDCARDIO = 0
+    CIRCUITPY_FRAMEBUFFERIO = 0
     CIRCUITPY_FREQUENCYIO = 0
     CIRCUITPY_I2CPERIPHERAL = 0
-    CIRCUITPY_DISPLAYIO = 0       # Requires SPI, PulseIO (stub ok)
+    # Requires SPI, PulseIO (stub ok):
+    CIRCUITPY_DISPLAYIO = 0
 
     # These modules are implemented in shared-module/ - they can be included in
     # any port once their prerequisites in common-hal are complete.
-    CIRCUITPY_BITBANGIO = 0       # Requires DigitalIO
-    CIRCUITPY_GAMEPAD = 0         # Requires DigitalIO
-    CIRCUITPY_PIXELBUF = 0        # Requires neopixel_write or SPI (dotstar)
-    CIRCUITPY_RANDOM = 0          # Requires OS
-    CIRCUITPY_STORAGE = 0         # Requires OS, filesystem
-    CIRCUITPY_TOUCHIO = 0         # Requires Microcontroller
-    CIRCUITPY_USB_HID = 0         # Requires USB
-    CIRCUITPY_USB_MIDI = 0        # Requires USB
-    CIRCUITPY_REQUIRE_I2C_PULLUPS = 0 # Does nothing without I2C
-    CIRCUITPY_ULAB = 0            # No requirements, but takes extra flash
+    # Requires DigitalIO:
+    CIRCUITPY_BITBANGIO = 0
+    # Requires DigitalIO
+    CIRCUITPY_GAMEPAD = 0
+    # Requires neopixel_write or SPI (dotstar)
+    CIRCUITPY_PIXELBUF = 0
+    # Requires OS
+    CIRCUITPY_RANDOM = 0
+    # Requires OS, filesystem
+    CIRCUITPY_STORAGE = 0
+    # Requires Microcontroller
+    CIRCUITPY_TOUCHIO = 0
+    # Requires USB
+    CIRCUITPY_USB_HID = 0
+    CIRCUITPY_USB_MIDI = 0
+    # Does nothing without I2C
+    CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
+    # No requirements, but takes extra flash
+    CIRCUITPY_ULAB = 0
 
 Step 2: Init
 --------------

docs/shared_bindings_matrix.py

@@ -28,6 +28,7 @@
 import subprocess
 import sys
 
+from concurrent.futures import ThreadPoolExecutor
 
 SUPPORTED_PORTS = ['atmel-samd', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'stm']
 
@@ -42,7 +43,7 @@ def get_circuitpython_root_dir():
 def get_shared_bindings():
     """ Get a list of modules in shared-bindings based on folder names
     """
-    shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
+    shared_bindings_dir = get_circuitpython_root_dir() / "circuitpython-stubs"
     return [item.name for item in shared_bindings_dir.iterdir()]
 
 
@@ -131,38 +132,44 @@ def lookup_setting(settings, key, default=''):
         key = value[2:-1]
     return value
 
+def all_ports_all_boards(ports=SUPPORTED_PORTS):
+    for port in ports:
+
+        port_dir = get_circuitpython_root_dir() / "ports" / port
+        for entry in (port_dir / "boards").iterdir():
+            if not entry.is_dir():
+                continue
+            yield (port, entry)
+
 def support_matrix_by_board(use_branded_name=True):
     """ Compiles a list of the available core modules available for each
         board.
     """
     base = build_module_map()
 
-    boards = dict()
-    for port in SUPPORTED_PORTS:
-
+    def support_matrix(arg):
+        port, entry = arg
         port_dir = get_circuitpython_root_dir() / "ports" / port
-        for entry in (port_dir / "boards").iterdir():
-            if not entry.is_dir():
-                continue
-            board_modules = []
-            board_name = entry.name
-
-            settings = get_settings_from_makefile(str(port_dir), entry.name)
-
-            if use_branded_name:
-                with open(entry / "mpconfigboard.h") as get_name:
-                    board_contents = get_name.read()
-                board_name_re = re.search(r"(?<=MICROPY_HW_BOARD_NAME)\s+(.+)",
-                                          board_contents)
-                if board_name_re:
-                    board_name = board_name_re.group(1).strip('"')
-
-            board_modules = []
-            for module in base:
-                key = f'CIRCUITPY_{module.upper()}'
-                if int(lookup_setting(settings, key, '0')):
-                    board_modules.append(base[module]['name'])
-            boards[board_name] = sorted(board_modules)
+        settings = get_settings_from_makefile(str(port_dir), entry.name)
+
+        if use_branded_name:
+            with open(entry / "mpconfigboard.h") as get_name:
+                board_contents = get_name.read()
+            board_name_re = re.search(r"(?<=MICROPY_HW_BOARD_NAME)\s+(.+)",
+                                      board_contents)
+            if board_name_re:
+                board_name = board_name_re.group(1).strip('"')
+
+        board_modules = []
+        for module in base:
+            key = f'CIRCUITPY_{module.upper()}'
+            if int(lookup_setting(settings, key, '0')):
+                board_modules.append(base[module]['name'])
+
+        return (board_name, sorted(board_modules))
+
+    executor = ThreadPoolExecutor(max_workers=os.cpu_count())
+    boards = dict(sorted(executor.map(support_matrix, all_ports_all_boards())))
 
     #print(json.dumps(boards, indent=2))
     return boards

lib/utils/pyexec.c

@@ -113,6 +113,8 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         start = mp_hal_ticks_ms();
         mp_call_function_0(module_fun);
         mp_hal_set_interrupt_char(-1); // disable interrupt
+        // Handle any ctrl-c interrupt that arrived just in time
+        mp_handle_pending();
         nlr_pop();
         ret = 0;
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {

locale/circuitpython.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-25 16:39-0700\n"
+"POT-Creation-Date: 2020-08-27 11:21-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -1349,8 +1349,8 @@ msgstr ""
 #: ports/nrf/common-hal/pulseio/PulseOut.c
 #: ports/stm/common-hal/pulseio/PulseOut.c
 msgid ""
-"Port does not accept pins or frequency.                                     "
-"Construct and pass a PWMOut Carrier instead"
+"Port does not accept pins or frequency. Construct and pass a PWMOut Carrier "
+"instead"
 msgstr ""
 
 #: shared-bindings/_bleio/Adapter.c
@@ -1365,6 +1365,10 @@ msgstr ""
 msgid "Pull not used when direction is output."
 msgstr ""
 
+#: ports/stm/ref/pulseout-pre-timeralloc.c
+msgid "PulseOut not supported on this chip"
+msgstr ""
+
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG DeInit Error"
 msgstr ""

ports/atmel-samd/common-hal/pulseio/PulseOut.c

@@ -101,8 +101,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
                                             uint32_t frequency,
                                             uint16_t duty_cycle) {
     if (!carrier || pin || frequency) {
-        mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
-                                    Construct and pass a PWMOut Carrier instead"));
+        mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
     }
 
     if (refcount == 0) {

ports/cxd56/common-hal/pulseio/PulseOut.c

@@ -64,8 +64,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
                                             uint32_t frequency,
                                             uint16_t duty_cycle) {
     if (!carrier || pin || frequency) {
-        mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
-                                    Construct and pass a PWMOut Carrier instead"));
+        mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
     }
 
     if (pulse_fd < 0) {

ports/esp32s2/boards/espressif_saola_1_wrover/sdkconfig

@@ -0,0 +1,33 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config

ports/esp32s2/boards/microdev_micro_s2/board.c

@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+
+    // SPI Flash and RAM
+    common_hal_never_reset_pin(&pin_GPIO26);
+    common_hal_never_reset_pin(&pin_GPIO27);
+    common_hal_never_reset_pin(&pin_GPIO28);
+    common_hal_never_reset_pin(&pin_GPIO29);
+    common_hal_never_reset_pin(&pin_GPIO30);
+    common_hal_never_reset_pin(&pin_GPIO31);
+    common_hal_never_reset_pin(&pin_GPIO32);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}

ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "microDev microS2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_LED (&pin_GPIO21)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
+
+#define AUTORESET_DELAY_MS 500

ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk

@@ -0,0 +1,15 @@
+USB_VID = 0x239A
+USB_PID = 0x80C6
+USB_PRODUCT = "microS2"
+USB_MANUFACTURER = "microDev"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=16MB