From bb3f0c8667d4dcd5f125a46c1bccf56ebd28c7f3 Mon Sep 17 00:00:00 2001
From: nitz <nitz@users.noreply.github.com>
Date: Thu, 6 Aug 2020 08:27:56 -0400
Subject: [PATCH] Rename default flasher from `nrf` to `nrfjprog`

---
 Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c70a9e9..8ddc94b 100644
--- a/Makefile
+++ b/Makefile
@@ -47,12 +47,11 @@ GDB     = $(CROSS_COMPILE)gdb
 # Flasher utility options
 NRFUTIL = adafruit-nrfutil
 NRFJPROG = nrfjprog
-FLASHER ?=
+FLASHER ?= nrfjprog
 
-# default to nrf
-ifeq ($(FLASHER),)
-  FLASHER = nrf
-else ifeq ($(FLASHER),pyocd)
+# Flasher will default to nrfjprog,
+# Check for pyocd, error on unexpected value.
+ifeq ($(FLASHER),pyocd)
   PYOCD ?= pyocd
 else
   $(error Unsupported flash utility: "$(FLASHER)")
@@ -398,8 +397,8 @@ __check_defined = \
     $(if $(value $1),, \
     $(error Undefined make flag: $1$(if $2, ($2))))
 
-#------------------- Flash with NRFUTIL -------------------
-ifeq ($(FLASHER),nrf)
+#------------------- Flash with NRFJPROG -------------------
+ifeq ($(FLASHER),nrfjprog)
 
 # Flash the compiled
 flash: $(BUILD)/$(OUT_FILE)-nosd.hex