Merge pull request #4757 from dhalbert/6.3.x-cherry-pick-from-main

6.3.x cherry pick from main
adafruit · May 25, 2021 · e494ca4 · e494ca4
2 parents 1d39be4 + 25f0947
commit e494ca4
Show file tree

Hide file tree

Showing 146 changed files with 2,020 additions and 158 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -178,18 +178,26 @@ jobs:
         - "TG-Watch"
         - "adafruit_feather_rp2040"
         - "adafruit_itsybitsy_rp2040"
+        - "adafruit_neokey_trinkey_m0"
+        - "adafruit_proxlight_trinkey_m0"
+        - "adafruit_qt2040_trinkey"
         - "adafruit_qtpy_rp2040"
+        - "adafruit_rotary_trinkey_m0"
+        - "adafruit_slide_trinkey_m0"
         - "aloriumtech_evo_m51"
+        - "aramcon2_badge"
         - "aramcon_badge_2019"
         - "arduino_mkr1300"
         - "arduino_mkrzero"
         - "arduino_nano_33_ble"
         - "arduino_nano_33_iot"
+        - "arduino_nano_rp2040_connect"
         - "arduino_zero"
         - "bast_pro_mini_m0"
         - "bastble"
         - "bdmicro_vina_d21"
         - "bdmicro_vina_d51"
+        - "bdmicro_vina_d51_pcb7"
         - "bless_dev_board_multi_sensor"
         - "blm_badge"
         - "capablerobot_usbhub"
@@ -239,6 +247,7 @@ jobs:
         - "hallowing_m0_express"
         - "hallowing_m4_express"
         - "hiibot_bluefi"
+        - "huntercat_nfc"
         - "ikigaisense_vita"
         - "imxrt1010_evk"
         - "imxrt1020_evk"
@@ -283,6 +292,8 @@ jobs:
         - "pewpew_m4"
         - "picoplanet"
         - "pimoroni_keybow2040"
+        - "pimoroni_picolipo_16mb"
+        - "pimoroni_picolipo_4mb"
         - "pimoroni_picosystem"
         - "pimoroni_tiny2040"
         - "pirkey_m0"
@@ -303,7 +314,6 @@ jobs:
         - "raspberry_pi_pico"
         - "raytac_mdbt50q-db-40"
         - "robohatmm1_m4"
-        - "rotary_trinkey_m0"
         - "sam32"
         - "same54_xplained"
         - "seeeduino_wio_terminal"
@@ -314,6 +324,7 @@ jobs:
         - "simmel"
         - "snekboard"
         - "sparkfun_lumidrive"
+        - "sparkfun_micromod_rp2040"
         - "sparkfun_nrf52840_micromod"
         - "sparkfun_nrf52840_mini"
         - "sparkfun_pro_micro_rp2040"
@@ -450,6 +461,7 @@ jobs:
         - "adafruit_funhouse"
         - "adafruit_magtag_2.9_grayscale"
         - "adafruit_metro_esp32s2"
+        - "artisense_rd00"
         - "electroniccats_bastwifi"
         - "espressif_kaluga_1"
         - "espressif_saola_1_wroom"

diff --git a/.gitmodules b/.gitmodules
@@ -171,10 +171,16 @@
 [submodule "frozen/Adafruit_CircuitPython_LC709203F"]
 	path = frozen/Adafruit_CircuitPython_LC709203F
 	url = https://github.com/adafruit/Adafruit_CircuitPython_LC709203F
+[submodule "frozen/Adafruit_CircuitPython_SimpleMath"]
+	path = frozen/Adafruit_CircuitPython_SimpleMath
+	url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath
 [submodule "ports/raspberrypi/sdk"]
 	path = ports/raspberrypi/sdk
 	url = https://github.com/adafruit/pico-sdk.git
 [submodule "data/nvm.toml"]
 	path = data/nvm.toml
 	url = https://github.com/adafruit/nvm.toml.git
 	branch = main
+[submodule "frozen/Adafruit_CircuitPython_MIDI"]
+	path = frozen/Adafruit_CircuitPython_MIDI
+	url = https://github.com/adafruit/Adafruit_CircuitPython_MIDI
diff --git a/conf.py b/conf.py
@@ -284,7 +284,7 @@
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-html_extra_path = ["docs/robots.txt"]
+#html_extra_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/data/nvm.toml b/data/nvm.toml
diff --git a/docs/robots.txt b/docs/robots.txt
diff --git a/extmod/ulab b/extmod/ulab
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit
diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605
diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231
diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar
diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI
diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote
diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x
diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789
diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw
diff --git a/frozen/pew-pewpew-standalone-10.x b/frozen/pew-pewpew-standalone-10.x
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -3733,6 +3733,10 @@ msgstr ""
 msgid "pressing both buttons at start up.\n"
 msgstr ""
 
+#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
+msgid "pressing the left button at start up\n"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""

diff --git a/main.c b/main.c
@@ -332,17 +332,19 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
     bool asleep = false;
     while (true) {
         RUN_BACKGROUND_TASKS;
+
+        // If a reload was requested by the supervisor or autoreload, return
         if (reload_requested) {
             #if CIRCUITPY_ALARM
             if (asleep) {
                 board_init();
             }
             #endif
-            supervisor_set_run_reason(RUN_REASON_AUTO_RELOAD);
             reload_requested = false;
             return true;
         }
 
+        // If interrupted by keyboard, return
         if (serial_connected() && serial_bytes_available()) {
             #if CIRCUITPY_ALARM
             if (asleep) {
@@ -369,6 +371,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
         }
         #endif
 
+        // If messages haven't been printed yet, print them
         if (!printed_press_any_key && serial_connected()) {
             if (!serial_connected_at_start) {
                 print_code_py_status_message(safe_mode);
@@ -595,6 +598,7 @@ int __attribute__((used)) main(void) {
     for (;;) {
         if (!skip_repl) {
             exit_code = run_repl();
+            supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
         if (exit_code == PYEXEC_FORCED_EXIT) {
             if (!first_run) {

diff --git a/...mel-samd/boards/rotary_trinkey_m0/board.c → ...boards/adafruit_neokey_trinkey_m0/board.c b/...mel-samd/boards/rotary_trinkey_m0/board.c → ...boards/adafruit_neokey_trinkey_m0/board.c
diff --git a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.h b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.h
@@ -0,0 +1,58 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit NeoKey Trinkey M0"
+#define MICROPY_HW_MCU_NAME "samd21e18"
+
+#define MICROPY_HW_NEOPIXEL (&pin_PA15)
+
+#define MICROPY_PORT_A        (0)
+#define MICROPY_PORT_B        (0)
+#define MICROPY_PORT_C        (0)
+
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+#define IGNORE_PIN_PA02     1
+#define IGNORE_PIN_PA03     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA05     1
+#define IGNORE_PIN_PA06     1
+#define IGNORE_PIN_PA08     1
+#define IGNORE_PIN_PA09     1
+#define IGNORE_PIN_PA10     1
+#define IGNORE_PIN_PA11     1
+#define IGNORE_PIN_PA12     1
+#define IGNORE_PIN_PA13     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA16     1
+#define IGNORE_PIN_PA17     1
+#define IGNORE_PIN_PA18     1
+#define IGNORE_PIN_PA19     1
+#define IGNORE_PIN_PA20     1
+#define IGNORE_PIN_PA21     1
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1
+#define IGNORE_PIN_PA27     1
+#define IGNORE_PIN_PA29     1
+#define IGNORE_PIN_PA30     1
+#define IGNORE_PIN_PA31     1
+#define IGNORE_PIN_PB00     1
+#define IGNORE_PIN_PB01     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PB04     1
+#define IGNORE_PIN_PB05     1
+#define IGNORE_PIN_PB06     1
+#define IGNORE_PIN_PB07     1
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PB10     1
+#define IGNORE_PIN_PB11     1
+#define IGNORE_PIN_PB12     1
+#define IGNORE_PIN_PB13     1
+#define IGNORE_PIN_PB14     1
+#define IGNORE_PIN_PB15     1
+#define IGNORE_PIN_PB16     1
+#define IGNORE_PIN_PB17     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PB30     1
+#define IGNORE_PIN_PB31     1
diff --git a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk
@@ -0,0 +1,36 @@
+USB_VID = 0x239A
+USB_PID = 0x8100
+USB_PRODUCT = "NeoKey Trinkey M0"
+USB_MANUFACTURER = "Adafruit Industries LLC"
+
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = NONE
+
+CIRCUITPY_ANALOGIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_RTC = 0
+CIRCUITPY_SAMD = 0
+CIRCUITPY_PS2IO = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_BUSIO = 0
+CIRCUITPY_STORAGE = 1
+
+CIRCUITPY_MATH = 1
+CIRCUITPY_PIXELBUF = 1
+CIRCUITPY_USB_MIDI = 1
+CIRCUITPY_TOUCHIO = 1
+CIRCUITPY_FULL_BUILD = 0
+
+SUPEROPT_GC = 0
+SUPEROPT_VM = 0
+
+CIRCUITPY_PIXELBUF = 1
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
diff --git a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c
@@ -0,0 +1,8 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15) },
+    { MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_PA28) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/board.c b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/board.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 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 "supervisor/board.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "supervisor/shared/board.h"
+#include "hal/include/hal_gpio.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
+6 −0		flash/adesto-tech/AT25DF081A.toml
+6 −0		flash/adesto-tech/AT25DF641A.toml
+6 −0		flash/adesto-tech/AT25SF041A.toml
+13 −0		flash/adesto-tech/AT25SF128A.toml
+6 −0		flash/adesto-tech/AT25SF161.toml
+0 −6		flash/adesto-tech/adesto-tech.toml
+2 −0		code/ndarray.c
+1 −0		code/ndarray.h
+6 −0		docs/ulab-change-log.md
+11 −0		tests/common/gc.py
+4 −0		tests/common/gc.py.exp
+24 −8		.github/workflows/build.yml
+4 −0		.github/workflows/release.yml
+4 −0		.gitignore
+34 −0		.pre-commit-config.yaml
+7 −4		.pylintrc
+4 −0		.readthedocs.yml
+10 −4		CODE_OF_CONDUCT.md
+324 −0		LICENSES/CC-BY-4.0.txt
+19 −0		LICENSES/MIT.txt
+20 −0		LICENSES/Unlicense.txt
+3 −0		README.rst.license
+12 −29		adafruit_ble/__init__.py
+22 −48		adafruit_ble/advertising/__init__.py
+3 −20		adafruit_ble/advertising/adafruit.py
+0 −9		adafruit_ble/advertising/apple.py
+22 −29		adafruit_ble/advertising/standard.py
+17 −35		adafruit_ble/attributes/__init__.py
+4 −22		adafruit_ble/characteristics/__init__.py
+3 −20		adafruit_ble/characteristics/float.py
+3 −20		adafruit_ble/characteristics/int.py
+3 −20		adafruit_ble/characteristics/stream.py
+3 −20		adafruit_ble/characteristics/string.py
+10 −27		adafruit_ble/services/__init__.py
+4 −21		adafruit_ble/services/circuitpython.py
+3 −20		adafruit_ble/services/midi.py
+4 −21		adafruit_ble/services/nordic.py
+3 −20		adafruit_ble/services/sphero.py
+3 −20		adafruit_ble/services/standard/__init__.py
+4 −21		adafruit_ble/services/standard/device_info.py
+3 −20		adafruit_ble/services/standard/hid.py
+3 −20		adafruit_ble/uuid/__init__.py
+3 −0		docs/_static/favicon.ico.license
+0 −3		docs/advertising.rst
+3 −0		docs/advertising.rst.license
+3 −0		docs/api.rst.license
+3 −0		docs/attributes.rst.license
+3 −0		docs/characteristics.rst.license
+4 −0		docs/conf.py
+3 −0		docs/examples.rst.license
+3 −0		docs/index.rst.license
+3 −0		docs/services.rst.license
+3 −0		docs/standard_services.rst.license
+3 −0		docs/uuid.rst.license
+3 −0		examples/ble_bluefruit_color_picker.py
+3 −0		examples/ble_bluefruit_connect_plotter.py
+3 −0		examples/ble_color_proximity.py
+3 −0		examples/ble_current_time_service.py
+3 −0		examples/ble_demo_central.py
+3 −0		examples/ble_demo_periph.py
+3 −0		examples/ble_detailed_scan.py
+3 −0		examples/ble_hid_central.py
+3 −0		examples/ble_hid_periph.py
+3 −0		examples/ble_simpletest.py
+3 −0		examples/ble_uart_echo_client.py
+3 −0		examples/ble_uart_echo_test.py
+4 −0		requirements.txt
+4 −0		setup.py
+0 −4		.github/workflows/build.yml
+17 −2		.pre-commit-config.yaml
+3 −4		.pylintrc
+8 −2		adafruit_esp32spi/adafruit_esp32spi.py
+11 −7		adafruit_esp32spi/adafruit_esp32spi_socket.py
+71 −0		examples/esp32spi_simpletest_rp2040.py
+43 −0		examples/esp32spi_tcp_client.py
+53 −0		examples/esp32spi_udp_client.py
+0 −4		.github/workflows/build.yml
+15 −0		.pre-commit-config.yaml
+3 −4		.pylintrc
+1 −1		adafruit_focaltouch.py
+30 −9		.github/workflows/build.yml
+5 −1		.github/workflows/release.yml
+341 −0		.gitignore
+34 −0		.pre-commit-config.yaml
+7 −4		.pylintrc
+4 −0		.readthedocs.yml
+10 −4		CODE_OF_CONDUCT.md
+324 −0		LICENSES/CC-BY-4.0.txt
+19 −0		LICENSES/MIT.txt
+20 −0		LICENSES/Unlicense.txt
+3 −0		README.rst.license
+0 −170		adafruit_progressbar.py
+593 −0		adafruit_progressbar/__init__.py
+169 −0		adafruit_progressbar/horizontalprogressbar.py
+105 −0		adafruit_progressbar/progressbar.py
+135 −0		adafruit_progressbar/verticalprogressbar.py
+3 −0		docs/_static/favicon.ico.license
+15 −1		docs/api.rst
+3 −0		docs/api.rst.license
+4 −0		docs/conf.py
+10 −0		docs/examples.rst
+3 −0		docs/examples.rst.license
+3 −0		docs/index.rst.license
+53 −0		examples/progressbar_combined.py
+122 −0		examples/progressbar_displayio_blinka.py
+82 −0		examples/progressbar_displayio_blinka_color_scale.py
+50 −18		examples/progressbar_magtag_simpletest.py
+185 −0		examples/progressbar_matrixportal.py
+15 −7		examples/progressbar_simpletest.py
+52 −0		examples/progressbar_vertical_simpletest.py
+12 −0		examples/requirements.txt
+10 −1		requirements.txt
+5 −1		setup.py