Merge remote-tracking branch 'adafruit/main' into improve-highspeed-usb

12 files changed, 22 insertions, 11 deletions

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 51029bcba..d98e2b30c 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,3 +3,5 @@ recommonmark==0.6.0
 sphinxcontrib-svg2pdfconverter==0.1.0
 astroid
 sphinx-autoapi
+isort
+black
diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice
-Subproject e9411c4244984b69ec6928370ede40cec014c10
+Subproject eb4b21e216efd8ec0c4862a938e81b56be96172
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
index 0c5e5b762..12c48b1e3 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
@@ -28,7 +28,7 @@
 #define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
 
 // Increase stack size slightly due to CPX library import nesting
-#define CIRCUITPY_DEFAULT_STACK_SIZE  (4760) //divisible by 8
+#define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) //divisible by 8
 
 #define USER_NEOPIXELS_PIN      (&pin_PB23)
 
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
index 312fd2626..95b4ec110 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@@ -30,7 +30,7 @@
 #define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
 
 // Increase stack size slightly due to CPX library import nesting
-#define CIRCUITPY_DEFAULT_STACK_SIZE  (4760) // divisible by 8
+#define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) // divisible by 8
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB02)
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
index 4796e90a5..d478ea38b 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
@@ -28,7 +28,7 @@
 #define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
 
 // Increase stack size slightly due to CPX library import nesting.
-#define CIRCUITPY_DEFAULT_STACK_SIZE  (4760)  // divisible by 8
+#define CIRCUITPY_DEFAULT_STACK_SIZE  (4248)  // divisible by 8
 
 #define USER_NEOPIXELS_PIN      (&pin_PB23)
 
diff --git a/ports/atmel-samd/boards/fluff_m0/pins.c b/ports/atmel-samd/boards/fluff_m0/pins.c
index ac7811328..6b56297af 100644
--- a/ports/atmel-samd/boards/fluff_m0/pins.c
+++ b/ports/atmel-samd/boards/fluff_m0/pins.c
@@ -13,7 +13,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA31) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA00) },
+    { MP_ROM_QSTR(MP_QSTR_SDO), MP_ROM_PTR(&pin_PA00) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA30) },
+    { MP_ROM_QSTR(MP_QSTR_SDI), MP_ROM_PTR(&pin_PA30) },
 
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
@@ -31,6 +33,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA27) },
+    { MP_ROM_QSTR(MP_QSTR_EN), MP_ROM_PTR(&pin_PA27) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA28) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
index 254d730a8..0558191e6 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c
@@ -1,4 +1,5 @@
 #include "shared-bindings/board/__init__.h"
+#include "shared-module/displayio/__init__.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
 
@@ -86,5 +87,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index 540a2f77c..2a2428d67 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -109,7 +109,7 @@
 #endif
 
 #ifndef CIRCUITPY_DEFAULT_STACK_SIZE
-#define CIRCUITPY_DEFAULT_STACK_SIZE                4096
+#define CIRCUITPY_DEFAULT_STACK_SIZE                3584
 #endif
 
 #ifndef SAMD21_BOD33_LEVEL
diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals
-Subproject e4161d7d6d98d78eddcccb82128856af4baf7e5
+Subproject 0f5f1522d09c8fa7d858edec484a994c21c5966
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index a1a7ec238..255ab99b9 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -799,7 +799,7 @@ void supervisor_run_background_tasks_if_tick(void);
 #endif
 
 #ifndef CIRCUITPY_PYSTACK_SIZE
-#define CIRCUITPY_PYSTACK_SIZE 1024
+#define CIRCUITPY_PYSTACK_SIZE 1536
 #endif
 
 #define CIRCUITPY_BOOT_OUTPUT_FILE "/boot_out.txt"
diff --git a/tools/build_release_files.py b/tools/build_release_files.py
index 3563dd99f..98e81499e 100755
--- a/tools/build_release_files.py
+++ b/tools/build_release_files.py
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: MIT
 
 import os
+import multiprocessing
 import sys
 import subprocess
 import shutil
@@ -27,6 +28,8 @@ sha, version = build_info.get_version_info()
 
 languages = build_info.get_languages()
 exit_status = 0
+cores = multiprocessing.cpu_count()
+print('building boards with parallelism {}'.format(cores))
 for board in build_boards:
     bin_directory = "../bin/{}/".format(board)
     os.makedirs(bin_directory, exist_ok=True)
@@ -41,8 +44,8 @@ for board in build_boards:
         # But sometimes a particular language needs to be built from scratch, if, for instance,
         # CFLAGS_INLINE_LIMIT is set for a particular language to make it fit.
         clean_build_check_result = subprocess.run(
-            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} check-release-needs-clean-build | fgrep 'RELEASE_NEEDS_CLEAN_BUILD = 1'".format(
-                port = board_info["port"], language=language, board=board),
+            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} check-release-needs-clean-build -j {cores} | fgrep 'RELEASE_NEEDS_CLEAN_BUILD = 1'".format(
+                port = board_info["port"], language=language, board=board, cores=cores),
             shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         clean_build = clean_build_check_result.returncode == 0
 
@@ -51,8 +54,8 @@ for board in build_boards:
             build_dir += "-{language}".format(language=language)
 
         make_result = subprocess.run(
-            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} BUILD={build}".format(
-                port = board_info["port"], language=language, board=board, build=build_dir),
+            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} BUILD={build} -j {cores}".format(
+                port = board_info["port"], language=language, board=board, build=build_dir, cores=cores),
             shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
         build_duration = time.monotonic() - start_time
diff --git a/tools/gen_usb_descriptor.py b/tools/gen_usb_descriptor.py
index 762f2ea28..fb91fd334 100644
--- a/tools/gen_usb_descriptor.py
+++ b/tools/gen_usb_descriptor.py
@@ -62,8 +62,8 @@ parser.add_argument('--midi_ep_num_out', type=int, default=0,
                     help='endpoint number of MIDI OUT')
 parser.add_argument('--midi_ep_num_in', type=int, default=0,
                     help='endpoint number of MIDI IN')
-parser.add_argument('--output_c_file', type=argparse.FileType('w'), required=True)
-parser.add_argument('--output_h_file', type=argparse.FileType('w'), required=True)
+parser.add_argument('--output_c_file', type=argparse.FileType('w', encoding='UTF-8'), required=True)
+parser.add_argument('--output_h_file', type=argparse.FileType('w', encoding='UTF-8'), required=True)
 
 args = parser.parse_args()