Merge pull request #822 from adafruit/feather840_revE

Author: hathach

Diff for: bootloader/ledglasses_nrf52840/ledglasses_nrf52840_bootloader-0.8.3_s140_6.1.1.hex renamed to bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.9.0_s140_6.1.1.hex

@@ -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 for: bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.8.3_s140_6.1.1.zip renamed to bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.9.0_s140_6.1.1.zip

@@ -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 for: bootloader/circuitplayground_nrf52840/update-circuitplayground_nrf52840_bootloader-0.8.3_nosd.uf2

@@ -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