Merge remote-tracking branch 'adafruit/master' into packet_buffer

Author: tannewt

.github/workflows/build.yml

@@ -102,13 +102,16 @@ jobs:
         - "feather_m0_rfm9x"
         - "feather_m0_supersized"
         - "feather_m4_express"
+        - "feather_mimxrt1011"
+        - "feather_mimxrt1062"
         - "feather_nrf52840_express"
         - "feather_radiofruit_zigbee"
         - "feather_stm32f405_express"
         - "gemma_m0"
         - "grandcentral_m4_express"
         - "hallowing_m0_express"
         - "hallowing_m4_express"
+        - "imxrt1010_evk"
         - "itsybitsy_m0_express"
         - "itsybitsy_m4_express"
         - "itsybitsy_nrf52840_express"

.gitmodules

@@ -108,3 +108,6 @@
 [submodule "lib/mp3"]
 	path = lib/mp3
 	url = https://github.com/adafruit/Adafruit_MP3
+[submodule "ports/mimxrt10xx/sdk"]
+	path = ports/mimxrt10xx/sdk
+	url = https://github.com/arturo182/MIMXRT10xx_SDK

conf.py

@@ -131,6 +131,8 @@
                     "ports/esp8266/common-hal",
                     "ports/esp8266/modules",
                     "ports/minimal",
+                    "ports/mimxrt10xx/peripherals",
+                    "ports/mimxrt10xx/sdk",
                     "ports/nrf/device",
                     "ports/nrf/bluetooth",
                     "ports/nrf/modules",

docs/shared_bindings_matrix.py

@@ -26,7 +26,7 @@
 import re
 
 
-SUPPORTED_PORTS = ["atmel-samd", "nrf"]
+SUPPORTED_PORTS = ["atmel-samd", "nrf", "mimxrt10xx"]
 
 
 def parse_port_config(contents, chip_keyword=None):

docs/supported_ports.rst

@@ -8,6 +8,7 @@ and ESP8266.
     :maxdepth: 2
 
     ../ports/atmel-samd/README
+    ../ports/mimxrt10xx/README
     ../ports/nrf/README
     ../ports/stm32f4/README
     ../ports/cxd56/README

frozen/Adafruit_CircuitPython_BusDevice

@@ -19,3 +19,10 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Enable the use of 2 displays
+
+#define CIRCUITPY_DISPLAY_LIMIT (2)
+
+
+

frozen/Adafruit_CircuitPython_HID

@@ -35,8 +35,36 @@
 
 displayio_fourwire_obj_t board_display_obj;
 
+typedef struct {
+    const uint32_t *config_data;
+    void *handoverHID;
+    void *handoverMSC;
+    const char *info_uf2;
+} UF2_BInfo;
+
+#define APP_START_ADDRESS 0x00004000
+#define UF2_BINFO ((UF2_BInfo *)(APP_START_ADDRESS - sizeof(UF2_BInfo)))
+
+#define CFG_DISPLAY_CFG0 39
+#define CFG_MAGIC0 0x1e9e10f1
+
 #define DELAY 0x80
 
+uint32_t lookupCfg(uint32_t key, uint32_t defl) {
+    const uint32_t *ptr = UF2_BINFO->config_data;
+    if (!ptr || (((uint32_t)ptr) & 3) || *ptr != CFG_MAGIC0) {
+        // no config data!
+    } else {
+        ptr += 4;
+        while (*ptr) {
+            if (*ptr == key)
+                return ptr[1];
+            ptr += 2;
+        }
+    }
+    return defl;
+}
+
 uint8_t display_init_sequence[] = {
     0x01, 0 | DELAY, 150, // SWRESET
     0x11, 0 | DELAY, 255, // SLPOUT
@@ -63,8 +91,6 @@ uint8_t display_init_sequence[] = {
               0x2E, 0x2C, 0x29, 0x2D,
               0x2E, 0x2E, 0x37, 0x3F,
               0x00, 0x00, 0x02, 0x10,
-    0x2a, 3, 0x02, 0x00, 0x81, // _CASET XSTART = 2, XEND = 129
-    0x2b, 3, 0x02, 0x00, 0x81, // _RASET XSTART = 2, XEND = 129
     0x13, 0 | DELAY, 10, // _NORON
     0x29, 0 | DELAY, 100, // _DISPON
 };
@@ -83,14 +109,17 @@ void board_init(void) {
         &pin_PA17, // TFT_RST Reset
         60000000);
 
+    uint32_t cfg0 = lookupCfg(CFG_DISPLAY_CFG0, 0x000000);
+    uint32_t offX = (cfg0 >> 8) & 0xff;
+    uint32_t offY = (cfg0 >> 16) & 0xff;
     displayio_display_obj_t* display = &displays[0].display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(display,
         bus,
         160, // Width (after rotation)
         128, // Height (after rotation)
-        0, // column start
-        0, // row start
+        offX, // column start
+        offY, // row start
         0, // rotation
         16, // Color depth
         false, // grayscale

ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h

@@ -0,0 +1 @@
+build-*/