Merge remote-tracking branch 'upstream/master' into hold-tap

kmk/modules/encoder.py

@@ -1,6 +1,6 @@
 import digitalio
+from supervisor import ticks_ms
 
-from kmk.kmktime import ticks_ms
 from kmk.modules import Module
 
 

kmk/modules/layers.py

@@ -1,5 +1,6 @@
 '''One layer isn't enough. Adds keys to get to more of them'''
 from micropython import const
+from supervisor import ticks_ms
 
 from kmk.key_validators import layer_key_validator
 from kmk.keys import make_argumented_key

kmk/modules/modtap.py

@@ -1,3 +1,5 @@
+from supervisor import ticks_ms
+
 from kmk.key_validators import mod_tap_validator
 from kmk.keys import make_argumented_key
 from kmk.modules.holdtap import HoldTap

kmk/modules/power.py

@@ -1,9 +1,12 @@
 import board
 import digitalio
+from supervisor import ticks_ms
+
+from time import sleep
 
 from kmk.handlers.stock import passthrough as handler_passthrough
 from kmk.keys import make_key
-from kmk.kmktime import sleep_ms, ticks_diff, ticks_ms
+from kmk.kmktime import check_deadline
 from kmk.modules import Module
 
 
@@ -100,10 +103,10 @@ class Power(Module):
         '''
         Sleeps longer and longer to save power the more time in between updates.
         '''
-        if ticks_diff(ticks_ms(), self._powersave_start) <= 60000:
-            sleep_ms(8)
-        elif ticks_diff(ticks_ms(), self._powersave_start) >= 240000:
-            sleep_ms(180)
+        if check_deadline(ticks_ms(), self._powersave_start) <= 60000:
+            sleep(8 / 1000)
+        elif check_deadline(ticks_ms(), self._powersave_start) >= 240000:
+            sleep(180 / 1000)
         return
 
     def psave_time_reset(self):
@@ -120,7 +123,7 @@ class Power(Module):
         return
 
     def usb_rescan_timer(self):
-        return bool(ticks_diff(ticks_ms(), self._usb_last_scan) > 5000)
+        return bool(check_deadline(ticks_ms(), self._usb_last_scan) > 5000)
 
     def usb_time_reset(self):
         self._usb_last_scan = ticks_ms()

kmk/modules/split.py

@@ -1,10 +1,11 @@
 '''Enables splitting keyboards wirelessly or wired'''
 import busio
 from micropython import const
+from supervisor import ticks_ms
 
 from storage import getmount
 
-from kmk.kmktime import ticks_diff, ticks_ms
+from kmk.kmktime import check_deadline
 from kmk.matrix import intify_coordinate
 from kmk.modules import Module
 
@@ -241,7 +242,7 @@ class Split(Module):
 
     def ble_rescan_timer(self):
         '''If true, the rescan timer is up'''
-        return bool(ticks_diff(ticks_ms(), self._ble_last_scan) > 5000)
+        return bool(check_deadline(ticks_ms(), self._ble_last_scan) > 5000)
 
     def ble_time_reset(self):
         '''Resets the rescan timer'''