Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feather840 rev e #822

Merged
merged 3 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
11,852 changes: 0 additions & 11,852 deletions bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.8.3_s140_6.1.1.hex

This file was deleted.

Binary file not shown.
11,786 changes: 11,786 additions & 0 deletions bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.9.0_s140_6.1.1.hex

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

This file was deleted.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
11,639 changes: 11,639 additions & 0 deletions bootloader/particle_xenon/particle_xenon_bootloader-0.9.0_s140_6.1.1.hex

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------
Expand Down Expand Up @@ -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=
Expand Down
8 changes: 6 additions & 2 deletions variants/feather_nrf52840_express/variant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
//
Expand All @@ -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()
Expand All @@ -103,5 +104,8 @@ void initVariant()

pinMode(PIN_LED2, OUTPUT);
ledOff(PIN_LED2);

pinMode(PIN_NEOPIXEL_POWER, OUTPUT);
digitalWrite(PIN_NEOPIXEL_POWER, HIGH);
}

5 changes: 3 additions & 2 deletions variants/feather_nrf52840_express/variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading