Compare commits

..
7 Commits
Author SHA1 Message Date
hathach c01b7f9285 add changelog for release 2020-03-12 13:04:28 +07:00
Ha Thach 3718aaeeaf Merge pull request #117 from adafruit/develop
follow up to #114
2020-03-12 13:00:51 +07:00
hathach 0526a2b120 update board list, change Clue to CLUE 2020-03-12 12:27:40 +07:00
hathach ab4ecd141f follow up to #114 2020-03-12 12:21:57 +07:00
Ha Thach 8ccb638a84 Merge pull request #114 from adafruit/pin_reset
Make sure all pins are in reset state on teardown
2020-03-12 11:41:06 +07:00
Michal Moskal fc63d5096a Fix for 832 2020-03-09 21:00:20 -07:00
Michal Moskal 7d59a758da Make sure all pins are in reset state on teardown 2020-03-09 20:37:44 -07:00
5 changed files with 20 additions and 6 deletions

No files matched your search

+4 -1
View File
@@ -4,9 +4,12 @@
This is a CDC/DFU/UF2 bootloader for nRF52 boards.
- [Adafruit CLUE](https://www.adafruit.com/product/4500)
- [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
- [Adafruit Feather nRF52832](https://www.adafruit.com/product/3406)
- [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062)
- [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
- [Adafruit Feather nRF52840 Sense](https://www.adafruit.com/product/4516)
- [Adafruit ItsyBitsy nRF52840 Express](https://www.adafruit.com/product/4481)
- Adafruit Metro nRF52840 Express
- [Electronut Labs Papyr](https://docs.electronut.in/papyr/)
- MakerDiary MDK nRF52840 USB Dongle
+4
View File
@@ -1,5 +1,9 @@
# Adafruit nRF52 Bootloader Changelog
## 0.3.2 - 2020.03.12
- Make sure all pins are in reset state when jumping to app mode.
## 0.3.1 - 2020.03.05
- Correct LED1 for Feather Sense and change volume name to FTHRSNSBOOT.
+7 -1
View File
@@ -104,7 +104,6 @@ void board_teardown(void)
#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN)
neopixel_teardown();
#endif
// Button
// Stop RTC1 used by app_timer
NVIC_DisableIRQ(RTC1_IRQn);
@@ -115,6 +114,13 @@ void board_teardown(void)
// Stop LF clock
NRF_CLOCK->TASKS_LFCLKSTOP = 1UL;
// make sure all pins are back in reset state
// NUMBER_OF_PINS is defined in nrf_gpio.h
for (int i = 0; i < NUMBER_OF_PINS; ++i)
{
nrf_gpio_cfg_default(i);
}
}
static uint32_t _systick_count = 0;
+1
View File
@@ -28,6 +28,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include "nrf.h"
#include "nrf_gpio.h"
#include "board.h"
+4 -4
View File
@@ -57,7 +57,7 @@
// Used as model string in OTA mode
#define BLEDIS_MANUFACTURER "Adafruit Industries"
#define BLEDIS_MODEL "Clue nRF52840"
#define BLEDIS_MODEL "CLUE nRF52840"
//--------------------------------------------------------------------+
// USB
@@ -67,9 +67,9 @@
#define USB_DESC_CDC_ONLY_PID 0x0071
//------------- UF2 -------------//
#define UF2_PRODUCT_NAME "Adafruit Clue nRF52840"
#define UF2_PRODUCT_NAME "Adafruit CLUE nRF52840"
#define UF2_VOLUME_LABEL "CLUEBOOT"
#define UF2_BOARD_ID "nRF52840-Clue-revA"
#define UF2_INDEX_URL "https://www.adafruit.com/"
#define UF2_BOARD_ID "nRF52840-CLUE-revA"
#define UF2_INDEX_URL "https://www.adafruit.com/product/4500"
#endif // _CLUE_NRF52840_H