Remove kmk.util by moving reboot/bootloader to their only use location

This commit is contained in:
Josh Klar committed 2019-07-24 23:45:50 -07:00
1 parent 02401e2ec0
commit 38e8102532
3 files changed
+19 -27

No files matched your search

+19 -3
View File
@@ -1,5 +1,4 @@
from kmk.kmktime import sleep_ms from kmk.kmktime import sleep_ms
from kmk.util import reset_bootloader, reset_keyboard
def passthrough(key, state, *args, **kwargs): 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): def reset(*args, **kwargs):
reset_keyboard() try:
import machine
machine.reset()
except ImportError:
import microcontroller
microcontroller.reset()
def bootloader(*args, **kwargs): 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): def debug_pressed(key, state, KC, *args, **kwargs):
-1
View File
@@ -25,7 +25,6 @@ import supervisor # isort:skip
import kmk.consts # isort:skip import kmk.consts # isort:skip
import kmk.kmktime # isort:skip import kmk.kmktime # isort:skip
import kmk.types # isort:skip import kmk.types # isort:skip
import kmk.util # isort:skip
from kmk.consts import LeaderMode, UnicodeMode, KMK_RELEASE # isort:skip from kmk.consts import LeaderMode, UnicodeMode, KMK_RELEASE # isort:skip
from kmk.hid import USB_HID # isort:skip from kmk.hid import USB_HID # isort:skip
-23
View File
@@ -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()