Merge pull request #328 from adafruit/feather840-revE

add neopixl power pin for Feather840 revE

.github/workflows/githubci.yml

@@ -65,7 +65,9 @@ jobs:
                     
     steps:
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
 
     - name: Checkout Code
       uses: actions/checkout@v4
@@ -73,32 +75,21 @@ jobs:
         fetch-depth: 0
         submodules: true
 
-    - name: Checkout linkermap
-      uses: actions/checkout@v4
-      with:
-         repository: hathach/linkermap
-         path: linkermap
-
     - name: Install ARM GCC
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
-        release: '10-2020-q4'
+        release: '12.3.Rel1'
 
     - name: Install Tools
       run: |
         pip3 install adafruit-nrfutil uritemplate requests intelhex setuptools
-        pip3 install linkermap/
 
     - name: Build
       run: |
-        arm-none-eabi-gcc --version
         make BOARD=${{ matrix.board }} all
         make BOARD=${{ matrix.board }} copy-artifact
 
-    - name: Linker Map
-      run: make BOARD=${{ matrix.board }} linkermap
-
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.board }}
         path: _bin/${{ matrix.board }}

CMakeLists.txt

@@ -167,7 +167,7 @@ target_compile_options(bootloader PUBLIC
   -Wno-endif-labels
   -Wunreachable-code
   # Suppress warning caused by SDK
-  -Wno-unused-parameter -Wno-expansion-to-defined
+  -Wno-unused-parameter -Wno-expansion-to-defined -Wno-array-bounds
   )
 target_compile_definitions(bootloader PUBLIC
   SOFTDEVICE_PRESENT

Makefile

@@ -342,7 +342,8 @@ endif
 CFLAGS += -DDFU_APP_DATA_RESERVED=$(DFU_APP_DATA_RESERVED)
 
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
-ifneq ($(findstring 12.,$(shell $(CC) --version 2>/dev/null)),)
+# Fixes for gcc version 12 and 13.
+ifneq (,$(filter 12.% 13.%,$(shell $(CC) -dumpversion 2>/dev/null)))
 	CFLAGS += --param=min-pagesize=0
 endif
 

src/boards/boards.c

@@ -250,6 +250,11 @@ void board_display_init(void) {
   //------------- Display Init -------------//
   nrf_gpio_cfg_output(DISPLAY_PIN_DC);
 
+#if defined(DISPLAY_VSENSOR_PIN) && DISPLAY_VSENSOR_PIN >= 0
+  nrf_gpio_cfg_output(DISPLAY_VSENSOR_PIN);
+  nrf_gpio_pin_write(DISPLAY_VSENSOR_PIN, DISPLAY_VSENSOR_ON);
+#endif
+
 #if defined(DISPLAY_PIN_RST) && DISPLAY_PIN_RST >= 0
   nrf_gpio_cfg_output(DISPLAY_PIN_RST);
   nrf_gpio_pin_clear(DISPLAY_PIN_RST);
@@ -771,4 +776,4 @@ static void tft_controller_init(void) {
   }
 }
 
-#endif
+#endif

src/boards/feather_nrf52840_express/board.h

@@ -36,6 +36,7 @@
 #define LED_STATE_ON          1
 
 #define LED_NEOPIXEL          _PINNUM(0, 16)
+#define NEOPIXEL_POWER_PIN    _PINNUM(1, 14)
 #define NEOPIXELS_NUMBER      1
 #define BOARD_RGB_BRIGHTNESS  0x040404
 
@@ -63,7 +64,7 @@
 //------------- UF2 -------------//
 #define UF2_PRODUCT_NAME      "Adafruit Feather nRF52840 Express"
 #define UF2_VOLUME_LABEL      "FTHR840BOOT"
-#define UF2_BOARD_ID          "nRF52840-Feather-revD"
+#define UF2_BOARD_ID          "nRF52840-Feather-revE"
 #define UF2_INDEX_URL         "https://www.adafruit.com/product/4062"
 
 #endif // _FEATHER_NRF52840_H

src/boards/feather_nrf52840_sense_tft/board.h

@@ -50,6 +50,11 @@
 //--------------------------------------------------------------------+
 // Display
 //--------------------------------------------------------------------+
+
+// VSensor required to power the display
+#define DISPLAY_VSENSOR_PIN   _PINNUM(1, 7)
+#define DISPLAY_VSENSOR_ON    1
+
 #define DISPLAY_CONTROLLER_ST7789
 
 #define DISPLAY_PIN_SCK       _PINNUM(0, 26)