From 97f70d7a13bda27b65620779fe59f967bf8decdb Mon Sep 17 00:00:00 2001
From: Kyle Brown <kdb424@gmail.com>
Date: Tue, 25 Sep 2018 18:13:51 -0700
Subject: [PATCH] Clean up pyboard and add 2 utilities

---
 Makefile           | 13 +++++++++----
 util/bootloader.py |  3 +++
 util/reset.py      |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 util/bootloader.py
 create mode 100644 util/reset.py

diff --git a/Makefile b/Makefile
index 1900744..5087366 100644
--- a/Makefile
+++ b/Makefile
@@ -109,20 +109,19 @@ circuitpy-build-nrf:
 
 circuitpy-flash-nrf: circuitpy-build-nrf
 	@echo "===> Flashing CircuitPython with KMK and your keymap"
-	@sudo make -C vendor/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=${AMPY_PORT} SD=s132 FROZEN_MPY_DIR=freeze dfu-gen dfu-flash
+	@make -C vendor/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=${AMPY_PORT} SD=s132 FROZEN_MPY_DIR=freeze dfu-gen dfu-flash
 
 micropython-build-teensy3.1:
-	#@cp entrypoints/teensy31.py vendor/micropython/ports/teensy/memzip_files/main.py
 	@make -C vendor/micropython/ports/teensy/ BOARD=TEENSY_3.1 all
 
 micropython-flash-teensy3.1: micropython-build-teensy3.1
-	@sudo make -C vendor/micropython/ports/teensy/ BOARD=TEENSY_3.1 deploy
+	@make -C vendor/micropython/ports/teensy/ BOARD=TEENSY_3.1 deploy
 
 micropython-build-pyboard:
 	@make -j4 -C vendor/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze all
 
 micropython-flash-pyboard: micropython-build-pyboard
-	@sudo make -j4 -C vendor/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze deploy
+	@make -j4 -C vendor/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze deploy
 
 micropython-flash-pyboard-entrypoint:
 	@echo "===> Flashing entrypoints if they doesn't already exist"
@@ -131,6 +130,7 @@ micropython-flash-pyboard-entrypoint:
 	@-timeout -k 5s 10s pipenv run ampy -p ${AMPY_PORT} -d ${AMPY_DELAY} -b ${AMPY_BAUD} rm /flash/boot.py 2>/dev/null
 	@-timeout -k 5s 10s pipenv run ampy -p ${AMPY_PORT} -d ${AMPY_DELAY} -b ${AMPY_BAUD} put kmk/entrypoints/global.py /flash/main.py
 	@-timeout -k 5s 10s pipenv run ampy -p ${AMPY_PORT} -d ${AMPY_DELAY} -b ${AMPY_BAUD} put kmk/entrypoints/handwire/pyboard_boot.py /flash/boot.py
+	@-timeout -k 5s 10s pipenv run ampy -p /dev/ttyACM0 -d ${AMPY_DELAY} -b ${AMPY_BAUD} run util/reset.py
 	@echo "===> Flashed keyboard successfully!"
 
 circuitpy-flash-nrf-entrypoint:
@@ -195,6 +195,11 @@ endif
 	@cp -av ${USER_KEYMAP} vendor/micropython/ports/stm32/freeze/kmk_keyboard_user.py
 	@$(MAKE) AMPY_PORT=/dev/ttyACM0 AMPY_BAUD=115200 micropython-build-pyboard
 
+flash-pyboard-quick: lint devdeps micropython-deps micropython-freeze-kmk-stm32
+	@echo "===> Preparing keyboard script for bundling into MicroPython"
+	@cp -av ${USER_KEYMAP} vendor/micropython/ports/stm32/freeze/kmk_keyboard_user.py
+	@$(MAKE) AMPY_PORT=/dev/ttyACM0 AMPY_BAUD=115200 micropython-flash-pyboard
+
 flash-pyboard: lint devdeps micropython-deps micropython-freeze-kmk-stm32
 	@echo "===> Preparing keyboard script for bundling into MicroPython"
 	@cp -av ${USER_KEYMAP} vendor/micropython/ports/stm32/freeze/kmk_keyboard_user.py
diff --git a/util/bootloader.py b/util/bootloader.py
new file mode 100644
index 0000000..bb46c57
--- /dev/null
+++ b/util/bootloader.py
@@ -0,0 +1,3 @@
+import machine
+
+machine.bootloader()
diff --git a/util/reset.py b/util/reset.py
new file mode 100644
index 0000000..aa58569
--- /dev/null
+++ b/util/reset.py
@@ -0,0 +1,3 @@
+import machine
+
+machine.reset()