Merge pull request #7497 from tannewt/banglejs2

Add Bangle.js 2, JDI memory displays and ACeP epd

Author: dhalbert

.github/actions/deps/ports/action.yml

@@ -22,3 +22,7 @@ runs:
     - name: Set up espressif port
       if: steps.board-to-port.outputs.port == 'espressif'
       uses: ./.github/actions/deps/ports/espressif
+
+    - name: Set up nrf port
+      if: steps.board-to-port.outputs.port == 'nrf'
+      uses: ./.github/actions/deps/ports/nrf

.github/actions/deps/ports/nrf/action.yml

@@ -0,0 +1,17 @@
+name: Fetch nrf port deps
+
+runs:
+  using: composite
+  steps:
+    - name: Get nrfutil 7+
+      run: |
+        wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
+        chmod +x nrfutil
+        ./nrfutil install nrf5sdk-tools
+        mkdir -p $HOME/.local/bin
+        mv nrfutil $HOME/.local/bin
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+      shell: bash
+    - name: Print nrfutil version
+      run: nrfutil -V
+      shell: bash

data/nvm.toml

@@ -278,6 +278,12 @@ typedef struct {
 
 
 /* SBCS up-case tables (\x80-\xFF) */
+// Optimize the 437-only case with a truncated lookup table.
+#if FF_CODE_PAGE == 437
+#define TBL_CT437  {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \
+                    0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+                    0x41,0x49,0x4F,0x55,0xA5}
+#else
 #define TBL_CT437  {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \
                     0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
                     0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \
@@ -286,6 +292,7 @@ typedef struct {
                     0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
                     0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \
                     0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+#endif
 #define TBL_CT720  {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \
                     0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
                     0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \
@@ -2887,7 +2894,12 @@ static FRESULT create_name (    /* FR_OK: successful, FR_INVALID_NAME: could not
             }
 #elif FF_CODE_PAGE < 900    /* SBCS cfg */
             wc = ff_uni2oem(wc, CODEPAGE);          /* Unicode ==> ANSI/OEM code */
+            // Optimize the 437-only case with a truncated lookup table.
+#if FF_CODE_PAGE == 437
+            if (wc & 0x80 && wc < (0xA5 - 0x80)) wc = ExCvt[wc & 0x7F];   /* Convert extended character to upper (SBCS) */
+#else
             if (wc & 0x80) wc = ExCvt[wc & 0x7F];   /* Convert extended character to upper (SBCS) */
+#endif
 #else                       /* DBCS cfg */
             wc = ff_uni2oem(ff_wtoupper(wc), CODEPAGE); /* Unicode ==> Upper convert ==> ANSI/OEM code */
 #endif

lib/oofatfs/ff.c

@@ -499,6 +499,13 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
     DWORD uni       /* Unicode code point to be up-converted */
 )
 {
+    #if FF_FS_CASE_INSENSITIVE_COMPARISON_ASCII_ONLY
+    // Only uppercase ASCII characters. Everything else will require the user to
+    // pass in an uppercase version.
+    if ('a' <= uni && uni <= 'z') {
+        uni -= 32;
+    }
+    #else
     const WORD *p;
     WORD uc, bc, nc, cmd;
     static const WORD cvt1[] = {    /* Compressed up conversion table for U+0000 - U+0FFF */
@@ -619,6 +626,7 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
         }
         uni = uc;
     }
+    #endif
 
     return uni;
 }

lib/oofatfs/ffunicode.c

@@ -226,10 +226,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/microcontroller/Pin.c
-msgid "%q pin invalid"
-msgstr ""
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -1225,9 +1221,11 @@ msgid "Interrupt error."
 msgstr ""
 
 #: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Invalid %q"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/microcontroller/Pin.c
 #: shared-bindings/microcontroller/Pin.c
 msgid "Invalid %q pin"
 msgstr ""

locale/circuitpython.pot

@@ -57,5 +57,8 @@ void port_finish_background_task(void) {
 }
 #endif
 
+void port_background_tick(void) {
+}
+
 void port_background_task(void) {
 }

ports/atmel-samd/background.c

@@ -52,6 +52,10 @@ uint8_t stop_sequence[] = {
     0x02, 0x80, 0xf0  // Power off
 };
 
+uint8_t refresh_sequence[] = {
+    0x12, 0x00
+};
+
 void board_init(void) {
     busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
     common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
@@ -74,6 +78,7 @@ void board_init(void) {
         bus,
         start_sequence,
         sizeof(start_sequence),
+        0, // start up time
         stop_sequence,
         sizeof(stop_sequence),
         300, // width
@@ -92,13 +97,15 @@ void board_init(void) {
         NO_COMMAND, // write_color_ram_command (can add this for grayscale eventually)
         false, // color_bits_inverted
         0x000000, // highlight_color
-        0x12, // refresh_display_command
+        refresh_sequence, // refresh_display_sequence
+        sizeof(refresh_sequence),
         40, // refresh_time
         &pin_PA01, // busy_pin
         false, // busy_state
         5, // seconds_per_frame
         false, // chip_select (don't always toggle chip select)
         false, // grayscale
+        false, // acep
         false); // two_byte_sequence_length
 }
 

ports/atmel-samd/boards/openbook_m4/board.c

@@ -211,5 +211,5 @@ mcu_pin_function_t *mcu_find_pin_function(mcu_pin_function_t *table, const mcu_p
             return table;
         }
     }
-    mp_raise_ValueError_varg(translate("%q pin invalid"), name);
+    mp_raise_ValueError_varg(translate("Invalid %q pin"), name);
 }

ports/atmel-samd/common-hal/microcontroller/Pin.c

@@ -33,5 +33,8 @@ void port_start_background_task(void) {
 void port_finish_background_task(void) {
 }
 
+void port_background_tick(void) {
+}
+
 void port_background_task(void) {
 }