From 38e81025323c3587ec3ee4e94de58641adaf7ac6 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Wed, 24 Jul 2019 23:45:37 -0700
Subject: [PATCH] Remove kmk.util by moving reboot/bootloader to their only use
 location

---
 kmk/handlers/stock.py  | 22 +++++++++++++++++++---
 kmk/keyboard_config.py |  1 -
 kmk/util.py            | 23 -----------------------
 3 files changed, 19 insertions(+), 27 deletions(-)
 delete mode 100644 kmk/util.py

diff --git a/kmk/handlers/stock.py b/kmk/handlers/stock.py
index 88fadf2..bf0f353 100644
--- a/kmk/handlers/stock.py
+++ b/kmk/handlers/stock.py
@@ -1,5 +1,4 @@
 from kmk.kmktime import sleep_ms
-from kmk.util import reset_bootloader, reset_keyboard
 
 
 def passthrough(key, state, *args, **kwargs):
@@ -29,11 +28,28 @@ def default_released(key, state, KC, coord_int=None, coord_raw=None):
 
 
 def reset(*args, **kwargs):
-    reset_keyboard()
+    try:
+        import machine
+
+        machine.reset()
+
+    except ImportError:
+        import microcontroller
+
+        microcontroller.reset()
 
 
 def bootloader(*args, **kwargs):
-    reset_bootloader()
+    try:
+        import machine
+
+        machine.bootloader()
+
+    except ImportError:
+        import microcontroller
+
+        microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER)
+        microcontroller.reset()
 
 
 def debug_pressed(key, state, KC, *args, **kwargs):
diff --git a/kmk/keyboard_config.py b/kmk/keyboard_config.py
index 4a78827..2a3e819 100644
--- a/kmk/keyboard_config.py
+++ b/kmk/keyboard_config.py
@@ -25,7 +25,6 @@ import supervisor  # isort:skip
 import kmk.consts  # isort:skip
 import kmk.kmktime  # isort:skip
 import kmk.types  # isort:skip
-import kmk.util  # isort:skip
 
 from kmk.consts import LeaderMode, UnicodeMode, KMK_RELEASE  # isort:skip
 from kmk.hid import USB_HID  # isort:skip
diff --git a/kmk/util.py b/kmk/util.py
deleted file mode 100644
index 099465f..0000000
--- a/kmk/util.py
+++ /dev/null
@@ -1,23 +0,0 @@
-def reset_keyboard():
-    try:
-        import machine
-
-        machine.reset()
-
-    except ImportError:
-        import microcontroller
-
-        microcontroller.reset()
-
-
-def reset_bootloader():
-    try:
-        import machine
-
-        machine.bootloader()
-
-    except ImportError:
-        import microcontroller
-
-        microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER)
-        microcontroller.reset()