Merge pull request #822 from adafruit/feather840_revE

adafruit · May 9, 2024 · 0ed4d9f · 0ed4d9f
2 parents addf2e0 + ea46b6b
commit 0ed4d9f
Show file tree

Hide file tree

Showing 55 changed files with 61,965 additions and 62,740 deletions.
diff --git a/..._nrf52840_bootloader-0.8.3_s140_6.1.1.hex → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.hex b/..._nrf52840_bootloader-0.8.3_s140_6.1.1.hex → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/..._nrf52840_bootloader-0.8.3_s140_6.1.1.zip → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.zip b/..._nrf52840_bootloader-0.8.3_s140_6.1.1.zip → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/...er/circuitplayground_nrf52840/update-circuitplayground_nrf52840_bootloader-0.8.3_nosd.uf2 b/...er/circuitplayground_nrf52840/update-circuitplayground_nrf52840_bootloader-0.8.3_nosd.uf2
diff --git a/...er/circuitplayground_nrf52840/update-circuitplayground_nrf52840_bootloader-0.9.0_nosd.uf2 b/...er/circuitplayground_nrf52840/update-circuitplayground_nrf52840_bootloader-0.9.0_nosd.uf2
diff --git a/bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.8.3_s140_6.1.1.hex b/bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.8.3_s140_6.1.1.hex
diff --git a/bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.8.3_s140_6.1.1.zip b/bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.8.3_s140_6.1.1.zip
diff --git a/bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.9.0_s140_6.1.1.hex b/bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/...0_express_bootloader-0.8.3_s140_6.1.1.zip → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.zip b/...0_express_bootloader-0.8.3_s140_6.1.1.zip → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/clue_nrf52840/update-clue_nrf52840_bootloader-0.8.3_nosd.uf2 b/bootloader/clue_nrf52840/update-clue_nrf52840_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/clue_nrf52840/update-clue_nrf52840_bootloader-0.9.0_nosd.uf2 b/bootloader/clue_nrf52840/update-clue_nrf52840_bootloader-0.9.0_nosd.uf2
diff --git a/..._nrf52832_bootloader-0.8.3_s132_6.1.1.hex → ..._nrf52832_bootloader-0.9.0_s132_6.1.1.hex b/..._nrf52832_bootloader-0.8.3_s132_6.1.1.hex → ..._nrf52832_bootloader-0.9.0_s132_6.1.1.hex
diff --git a/..._nrf52832_bootloader-0.8.3_s132_6.1.1.zip → ..._nrf52832_bootloader-0.9.0_s132_6.1.1.zip b/..._nrf52832_bootloader-0.8.3_s132_6.1.1.zip → ..._nrf52832_bootloader-0.9.0_s132_6.1.1.zip
diff --git a/bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.8.3_s140_6.1.1.hex b/bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.8.3_s140_6.1.1.hex
diff --git a/.../pca10056_bootloader-0.8.3_s140_6.1.1.hex → ...0_express_bootloader-0.9.0_s140_6.1.1.hex b/.../pca10056_bootloader-0.8.3_s140_6.1.1.hex → ...0_express_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.9.0_s140_6.1.1.zip b/bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/...loader/feather_nrf52840_express/update-feather_nrf52840_express_bootloader-0.8.3_nosd.uf2 b/...loader/feather_nrf52840_express/update-feather_nrf52840_express_bootloader-0.8.3_nosd.uf2
diff --git a/...loader/feather_nrf52840_express/update-feather_nrf52840_express_bootloader-0.9.0_nosd.uf2 b/...loader/feather_nrf52840_express/update-feather_nrf52840_express_bootloader-0.9.0_nosd.uf2
diff --git a/bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.9.0_s140_6.1.1.hex b/bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.9.0_s140_6.1.1.zip b/bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/feather_nrf52840_sense/update-feather_nrf52840_sense_bootloader-0.8.3_nosd.uf2 b/bootloader/feather_nrf52840_sense/update-feather_nrf52840_sense_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/feather_nrf52840_sense/update-feather_nrf52840_sense_bootloader-0.9.0_nosd.uf2 b/bootloader/feather_nrf52840_sense/update-feather_nrf52840_sense_bootloader-0.9.0_nosd.uf2
diff --git a/...der/feather_nrf52840_sense_tft/feather_nrf52840_sense_tft_bootloader-0.8.3_s140_6.1.1.hex b/...der/feather_nrf52840_sense_tft/feather_nrf52840_sense_tft_bootloader-0.8.3_s140_6.1.1.hex
diff --git a/...der/feather_nrf52840_sense_tft/feather_nrf52840_sense_tft_bootloader-0.8.3_s140_6.1.1.zip b/...der/feather_nrf52840_sense_tft/feather_nrf52840_sense_tft_bootloader-0.8.3_s140_6.1.1.zip
diff --git a/..._nrf52840_bootloader-0.8.3_s140_6.1.1.hex → ...sense_tft_bootloader-0.9.0_s140_6.1.1.hex b/..._nrf52840_bootloader-0.8.3_s140_6.1.1.hex → ...sense_tft_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/...840_sense_bootloader-0.8.3_s140_6.1.1.zip → ...sense_tft_bootloader-0.9.0_s140_6.1.1.zip b/...840_sense_bootloader-0.8.3_s140_6.1.1.zip → ...sense_tft_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/...er/feather_nrf52840_sense_tft/update-feather_nrf52840_sense_tft_bootloader-0.8.3_nosd.uf2 b/...er/feather_nrf52840_sense_tft/update-feather_nrf52840_sense_tft_bootloader-0.8.3_nosd.uf2
diff --git a/...er/feather_nrf52840_sense_tft/update-feather_nrf52840_sense_tft_bootloader-0.9.0_nosd.uf2 b/...er/feather_nrf52840_sense_tft/update-feather_nrf52840_sense_tft_bootloader-0.9.0_nosd.uf2
diff --git a/...der/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.8.3_s140_6.1.1.hex b/...der/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.8.3_s140_6.1.1.hex
diff --git a/...840_sense_bootloader-0.8.3_s140_6.1.1.hex → ...0_express_bootloader-0.9.0_s140_6.1.1.hex b/...840_sense_bootloader-0.8.3_s140_6.1.1.hex → ...0_express_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/...0_express_bootloader-0.8.3_s140_6.1.1.zip → ...0_express_bootloader-0.9.0_s140_6.1.1.zip b/...0_express_bootloader-0.8.3_s140_6.1.1.zip → ...0_express_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/...er/itsybitsy_nrf52840_express/update-itsybitsy_nrf52840_express_bootloader-0.8.3_nosd.uf2 b/...er/itsybitsy_nrf52840_express/update-itsybitsy_nrf52840_express_bootloader-0.8.3_nosd.uf2
diff --git a/...er/itsybitsy_nrf52840_express/update-itsybitsy_nrf52840_express_bootloader-0.9.0_nosd.uf2 b/...er/itsybitsy_nrf52840_express/update-itsybitsy_nrf52840_express_bootloader-0.9.0_nosd.uf2
diff --git a/...0_express_bootloader-0.8.3_s140_6.1.1.hex → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.hex b/...0_express_bootloader-0.8.3_s140_6.1.1.hex → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/..._nrf52840_bootloader-0.8.3_s140_6.1.1.zip → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.zip b/..._nrf52840_bootloader-0.8.3_s140_6.1.1.zip → ..._nrf52840_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/ledglasses_nrf52840/update-ledglasses_nrf52840_bootloader-0.8.3_nosd.uf2 b/bootloader/ledglasses_nrf52840/update-ledglasses_nrf52840_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/ledglasses_nrf52840/update-ledglasses_nrf52840_bootloader-0.9.0_nosd.uf2 b/bootloader/ledglasses_nrf52840/update-ledglasses_nrf52840_bootloader-0.9.0_nosd.uf2
diff --git a/bootloader/metro_nrf52840_express/metro_nrf52840_express_bootloader-0.9.0_s140_6.1.1.hex b/bootloader/metro_nrf52840_express/metro_nrf52840_express_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/...0_express_bootloader-0.8.3_s140_6.1.1.zip → ...0_express_bootloader-0.9.0_s140_6.1.1.zip b/...0_express_bootloader-0.8.3_s140_6.1.1.zip → ...0_express_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/metro_nrf52840_express/update-metro_nrf52840_express_bootloader-0.8.3_nosd.uf2 b/bootloader/metro_nrf52840_express/update-metro_nrf52840_express_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/metro_nrf52840_express/update-metro_nrf52840_express_bootloader-0.9.0_nosd.uf2 b/bootloader/metro_nrf52840_express/update-metro_nrf52840_express_bootloader-0.9.0_nosd.uf2
diff --git a/bootloader/particle_xenon/particle_xenon_bootloader-0.9.0_s140_6.1.1.hex b/bootloader/particle_xenon/particle_xenon_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/...cle_xenon_bootloader-0.8.3_s140_6.1.1.zip → ...cle_xenon_bootloader-0.9.0_s140_6.1.1.zip b/...cle_xenon_bootloader-0.8.3_s140_6.1.1.zip → ...cle_xenon_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/particle_xenon/update-particle_xenon_bootloader-0.8.3_nosd.uf2 b/bootloader/particle_xenon/update-particle_xenon_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/particle_xenon/update-particle_xenon_bootloader-0.9.0_nosd.uf2 b/bootloader/particle_xenon/update-particle_xenon_bootloader-0.9.0_nosd.uf2
diff --git a/...cle_xenon_bootloader-0.8.3_s140_6.1.1.hex → .../pca10056_bootloader-0.9.0_s140_6.1.1.hex b/...cle_xenon_bootloader-0.8.3_s140_6.1.1.hex → .../pca10056_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/.../pca10056_bootloader-0.8.3_s140_6.1.1.zip → .../pca10056_bootloader-0.9.0_s140_6.1.1.zip b/.../pca10056_bootloader-0.8.3_s140_6.1.1.zip → .../pca10056_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/pca10056/update-pca10056_bootloader-0.8.3_nosd.uf2 b/bootloader/pca10056/update-pca10056_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/pca10056/update-pca10056_bootloader-0.9.0_nosd.uf2 b/bootloader/pca10056/update-pca10056_bootloader-0.9.0_nosd.uf2
diff --git a/...dbt50q_rx_bootloader-0.8.3_s140_6.1.1.hex → ...dbt50q_rx_bootloader-0.9.0_s140_6.1.1.hex b/...dbt50q_rx_bootloader-0.8.3_s140_6.1.1.hex → ...dbt50q_rx_bootloader-0.9.0_s140_6.1.1.hex
diff --git a/...dbt50q_rx_bootloader-0.8.3_s140_6.1.1.zip → ...dbt50q_rx_bootloader-0.9.0_s140_6.1.1.zip b/...dbt50q_rx_bootloader-0.8.3_s140_6.1.1.zip → ...dbt50q_rx_bootloader-0.9.0_s140_6.1.1.zip
diff --git a/bootloader/raytac_mdbt50q_rx/update-raytac_mdbt50q_rx_bootloader-0.8.3_nosd.uf2 b/bootloader/raytac_mdbt50q_rx/update-raytac_mdbt50q_rx_bootloader-0.8.3_nosd.uf2
diff --git a/bootloader/raytac_mdbt50q_rx/update-raytac_mdbt50q_rx_bootloader-0.9.0_nosd.uf2 b/bootloader/raytac_mdbt50q_rx/update-raytac_mdbt50q_rx_bootloader-0.9.0_nosd.uf2
diff --git a/platform.txt b/platform.txt
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 name=Adafruit nRF52 Boards
-version=1.6.0
+version=1.6.1
 
 # Compile variables
 # -----------------
@@ -146,7 +146,7 @@ tools.nrfutil.upload.pattern="{cmd}" {upload.verbose} dfu serial -pkg "{build.pa
 # ---------------------------------------------------
 
 # Bootloader version
-tools.bootburn.bootloader.file={runtime.platform.path}/bootloader/{build.variant}/{build.variant}_bootloader-0.8.3_{build.sd_name}_{build.sd_version}
+tools.bootburn.bootloader.file={runtime.platform.path}/bootloader/{build.variant}/{build.variant}_bootloader-0.9.0_{build.sd_name}_{build.sd_version}
 
 tools.bootburn.bootloader.params.verbose=
 tools.bootburn.bootloader.params.quiet=

diff --git a/variants/feather_nrf52840_express/variant.cpp b/variants/feather_nrf52840_express/variant.cpp
@@ -71,7 +71,9 @@ const uint32_t g_ADigitalPinMap[] =
   // The remaining NFC pin
    9,  // D33 is P0.09 (NFC1, exposed only via test point on bottom of board)
 
-  // Thus, there are 34 defined pins
+  32+14, // D34 is P1.14
+
+  // Thus, there are 35 defined pins
 
   // The remaining pins are not usable:
   //
@@ -92,7 +94,6 @@ const uint32_t g_ADigitalPinMap[] =
   // 43,      // P1.11 is not connected per schematic
   // 44,      // P1.12 is not connected per schematic
   // 45,      // P1.13 is not connected per schematic
-  // 46,      // P1.14 is not connected per schematic
 };
 
 void initVariant()
@@ -103,5 +104,8 @@ void initVariant()
 
   pinMode(PIN_LED2, OUTPUT);
   ledOff(PIN_LED2);
+
+  pinMode(PIN_NEOPIXEL_POWER, OUTPUT);
+  digitalWrite(PIN_NEOPIXEL_POWER, HIGH);
 }
 
diff --git a/variants/feather_nrf52840_express/variant.h b/variants/feather_nrf52840_express/variant.h
@@ -37,14 +37,15 @@ extern "C"
 #endif // __cplusplus
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (34)
-#define NUM_DIGITAL_PINS     (34)
+#define PINS_COUNT           (35)
+#define NUM_DIGITAL_PINS     (35)
 #define NUM_ANALOG_INPUTS    (6) // A6 is used for battery, A7 is analog reference
 #define NUM_ANALOG_OUTPUTS   (0)
 
 // LEDs
 #define PIN_LED1             (3)
 #define PIN_LED2             (4)
+#define PIN_NEOPIXEL_POWER   (34)
 #define PIN_NEOPIXEL         (8)
 #define NEOPIXEL_NUM         1