From 316891dbd5ceebd9ac4a2dffb65e83b1dd98fb17 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 12 May 2020 23:21:58 +0700 Subject: [PATCH] everything seems good --- Makefile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 195aea9..050573d 100644 --- a/Makefile +++ b/Makefile @@ -254,7 +254,7 @@ CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS CFLAGS += -DSOFTDEVICE_PRESENT CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096 -CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"' +CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS)"' CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"' _VER = $(subst ., ,$(word 1, $(subst -, ,$(GIT_VERSION)))) diff --git a/README.md b/README.md index 9ab1e58..546466a 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ There are two pins, `DFU` and `FRST` that bootloader will check upon reset/power - `Double Reset` Reset twice within 500 ms will enter DFU with UF2 and CDC support (only works with nRF52840) - `DFU = LOW` and `FRST = HIGH`: Enter bootloader with UF2 and CDC support - `DFU = LOW` and `FRST = LOW`: Enter bootloader with OTA, to upgrade with a mobile application such as Nordic nrfConnect/Toolbox -- `DFU = HIGH` and `FRST = LOW`: Factory Reset mode: erase firmware application and its data +- `DFU = HIGH` and `FRST = LOW`: Factory Reset mode: erase firmware application and its data - `DFU = HIGH` and `FRST = HIGH`: Go to application code if it is present, otherwise enter DFU with UF2 - The `GPREGRET` register can also be set to force the bootloader can enter any of above modes (plus a CDC-only mode for Arduino). `GPREGRET` is set by the application before performing a soft reset.