From 58337769a0c1503206ccf9f18e89d3d9084fce9d Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sat, 24 Oct 2020 00:52:45 -0700
Subject: [PATCH] integrate flash-from-bootloader and flash

---
 bin/kaleidoscope-builder | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index dcea4f67..55e43e29 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -298,7 +298,6 @@ flash() {
 		# This is defined in the (optional) user config.
 		# shellcheck disable=SC2154
 		${preFlash_HOOKS}
-	fi
 
 	find_device_port
 	run_arduino_cli upload \
@@ -306,25 +305,18 @@ flash() {
 		--port "${DEVICE_PORT}" \
 		--verbose
 
-
-	# This is defined in the (optional) user config.
-	# shellcheck disable=SC2154
-	${postFlash_HOOKS}
-}
-
-
-flash_from_bootloader() {
-	compile "$@"
-	prompt_before_flashing
-	find_bootloader_ports
+	fi
 	run_arduino_cli upload \
                 --fqbn "${FQBN}" \
 		--port "${DEVICE_PORT_BOOTLOADER}" \
 		--verbose
 
-	return 0
+	# This is defined in the (optional) user config.
+	# shellcheck disable=SC2154
+	${postFlash_HOOKS}
 }
 
+
 hex_with_bootloader() {
 	compile
 
@@ -622,9 +614,6 @@ usage() {
 		  disassemble
 		    Decompile the sketch.
 
-		  reset-device
-		    Reset the device.
-
 		  flash
 		    Flashes the firmware using avrdude.