Fix make test errors
This commit is contained in:
parent
a622239b4a
commit
908da846fe
@ -1,4 +1,4 @@
|
|||||||
from typing import List, Optional, Tuple
|
from typing import List, Optional
|
||||||
|
|
||||||
from kmk.keys import Key
|
from kmk.keys import Key
|
||||||
from kmk.types import (
|
from kmk.types import (
|
||||||
|
@ -441,7 +441,7 @@ class KMKKeyboard:
|
|||||||
self,
|
self,
|
||||||
hid_type: int = HIDModes.USB,
|
hid_type: int = HIDModes.USB,
|
||||||
secondary_hid_type: Optional[int] = None,
|
secondary_hid_type: Optional[int] = None,
|
||||||
**kwargs: Dict[Any, Any]
|
**kwargs: Dict[Any, Any],
|
||||||
) -> None:
|
) -> None:
|
||||||
self.hid_type = hid_type
|
self.hid_type = hid_type
|
||||||
self.secondary_hid_type = secondary_hid_type
|
self.secondary_hid_type = secondary_hid_type
|
||||||
|
@ -88,7 +88,11 @@ class Layers(Module):
|
|||||||
return
|
return
|
||||||
|
|
||||||
def _df_pressed(
|
def _df_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Switches the default layer
|
Switches the default layer
|
||||||
@ -96,7 +100,11 @@ class Layers(Module):
|
|||||||
keyboard.active_layers[-1] = key.meta.layer
|
keyboard.active_layers[-1] = key.meta.layer
|
||||||
|
|
||||||
def _mo_pressed(
|
def _mo_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Momentarily activates layer, switches off when you let go
|
Momentarily activates layer, switches off when you let go
|
||||||
@ -105,7 +113,10 @@ class Layers(Module):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _mo_released(
|
def _mo_released(
|
||||||
key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
# remove the first instance of the target layer
|
# remove the first instance of the target layer
|
||||||
# from the active list
|
# from the active list
|
||||||
@ -122,7 +133,11 @@ class Layers(Module):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def _lm_pressed(
|
def _lm_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
As MO(layer) but with mod active
|
As MO(layer) but with mod active
|
||||||
@ -130,10 +145,19 @@ class Layers(Module):
|
|||||||
keyboard.hid_pending = True
|
keyboard.hid_pending = True
|
||||||
# Sets the timer start and acts like MO otherwise
|
# Sets the timer start and acts like MO otherwise
|
||||||
keyboard.keys_pressed.add(key.meta.kc)
|
keyboard.keys_pressed.add(key.meta.kc)
|
||||||
self._mo_pressed(key, keyboard, *args, **kwargs)
|
self._mo_pressed(
|
||||||
|
key,
|
||||||
|
keyboard,
|
||||||
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
|
|
||||||
def _lm_released(
|
def _lm_released(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
As MO(layer) but with mod active
|
As MO(layer) but with mod active
|
||||||
@ -143,14 +167,22 @@ class Layers(Module):
|
|||||||
self._mo_released(key, keyboard, *args, **kwargs)
|
self._mo_released(key, keyboard, *args, **kwargs)
|
||||||
|
|
||||||
def _lt_pressed(
|
def _lt_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
# Sets the timer start and acts like MO otherwise
|
# Sets the timer start and acts like MO otherwise
|
||||||
self.start_time[LayerType.LT] = accurate_ticks()
|
self.start_time[LayerType.LT] = accurate_ticks()
|
||||||
self._mo_pressed(key, keyboard, *args, **kwargs)
|
self._mo_pressed(key, keyboard, *args, **kwargs)
|
||||||
|
|
||||||
def _lt_released(
|
def _lt_released(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
# On keyup, check timer, and press key if needed.
|
# On keyup, check timer, and press key if needed.
|
||||||
if self.start_time[LayerType.LT] and (
|
if self.start_time[LayerType.LT] and (
|
||||||
@ -161,11 +193,20 @@ class Layers(Module):
|
|||||||
keyboard.hid_pending = True
|
keyboard.hid_pending = True
|
||||||
keyboard.tap_key(key.meta.kc)
|
keyboard.tap_key(key.meta.kc)
|
||||||
|
|
||||||
self._mo_released(key, keyboard, *args, **kwargs)
|
self._mo_released(
|
||||||
|
key,
|
||||||
|
keyboard,
|
||||||
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
self.start_time[LayerType.LT] = None
|
self.start_time[LayerType.LT] = None
|
||||||
|
|
||||||
def _tg_pressed(
|
def _tg_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Toggles the layer (enables it if not active, and vise versa)
|
Toggles the layer (enables it if not active, and vise versa)
|
||||||
@ -178,7 +219,11 @@ class Layers(Module):
|
|||||||
keyboard.active_layers.insert(0, key.meta.layer)
|
keyboard.active_layers.insert(0, key.meta.layer)
|
||||||
|
|
||||||
def _to_pressed(
|
def _to_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Activates layer and deactivates all other layers
|
Activates layer and deactivates all other layers
|
||||||
@ -187,7 +232,11 @@ class Layers(Module):
|
|||||||
keyboard.active_layers.insert(0, key.meta.layer)
|
keyboard.active_layers.insert(0, key.meta.layer)
|
||||||
|
|
||||||
def _tt_pressed(
|
def _tt_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
'''
|
'''
|
||||||
Momentarily activates layer if held, toggles it if tapped repeatedly
|
Momentarily activates layer if held, toggles it if tapped repeatedly
|
||||||
@ -195,17 +244,31 @@ class Layers(Module):
|
|||||||
if self.start_time[LayerType.TT] is None:
|
if self.start_time[LayerType.TT] is None:
|
||||||
# Sets the timer start and acts like MO otherwise
|
# Sets the timer start and acts like MO otherwise
|
||||||
self.start_time[LayerType.TT] = accurate_ticks()
|
self.start_time[LayerType.TT] = accurate_ticks()
|
||||||
self._mo_pressed(key, keyboard, *args, **kwargs)
|
self._mo_pressed(
|
||||||
|
key,
|
||||||
|
keyboard,
|
||||||
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
elif accurate_ticks_diff(
|
elif accurate_ticks_diff(
|
||||||
accurate_ticks(), self.start_time[LayerType.TT], keyboard.tap_time
|
accurate_ticks(), self.start_time[LayerType.TT], keyboard.tap_time
|
||||||
):
|
):
|
||||||
self.start_time[LayerType.TT] = None
|
self.start_time[LayerType.TT] = None
|
||||||
self._tg_pressed(key, keyboard, *args, **kwargs)
|
self._tg_pressed(
|
||||||
|
key,
|
||||||
|
keyboard,
|
||||||
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
return
|
return
|
||||||
return
|
return
|
||||||
|
|
||||||
def _tt_released(
|
def _tt_released(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
if self.start_time[LayerType.TT] is None or not accurate_ticks_diff(
|
if self.start_time[LayerType.TT] is None or not accurate_ticks_diff(
|
||||||
accurate_ticks(), self.start_time[LayerType.TT], keyboard.tap_time
|
accurate_ticks(), self.start_time[LayerType.TT], keyboard.tap_time
|
||||||
@ -213,4 +276,9 @@ class Layers(Module):
|
|||||||
# On first press, works like MO. On second press, does nothing unless let up within
|
# On first press, works like MO. On second press, does nothing unless let up within
|
||||||
# time window, then acts like TG.
|
# time window, then acts like TG.
|
||||||
self.start_time[LayerType.TT] = None
|
self.start_time[LayerType.TT] = None
|
||||||
self._mo_released(key, keyboard, *args, **kwargs)
|
self._mo_released(
|
||||||
|
key,
|
||||||
|
keyboard,
|
||||||
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
|
@ -39,7 +39,11 @@ class ModTap(Module):
|
|||||||
return
|
return
|
||||||
|
|
||||||
def mt_pressed(
|
def mt_pressed(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> KMKKeyboard:
|
) -> KMKKeyboard:
|
||||||
'''Sets the timer start and acts like a modifier otherwise'''
|
'''Sets the timer start and acts like a modifier otherwise'''
|
||||||
keyboard.keys_pressed.add(key.meta.mods)
|
keyboard.keys_pressed.add(key.meta.mods)
|
||||||
@ -48,7 +52,11 @@ class ModTap(Module):
|
|||||||
return keyboard
|
return keyboard
|
||||||
|
|
||||||
def mt_released(
|
def mt_released(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> KMKKeyboard:
|
) -> KMKKeyboard:
|
||||||
'''On keyup, check timer, and press key if needed.'''
|
'''On keyup, check timer, and press key if needed.'''
|
||||||
keyboard.keys_pressed.discard(key.meta.mods)
|
keyboard.keys_pressed.discard(key.meta.mods)
|
||||||
|
@ -135,7 +135,11 @@ class Power(Module):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def _ps_tog(
|
def _ps_tog(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
if self.enable:
|
if self.enable:
|
||||||
keyboard._trigger_powersave_disable = True
|
keyboard._trigger_powersave_disable = True
|
||||||
@ -143,13 +147,21 @@ class Power(Module):
|
|||||||
keyboard._trigger_powersave_enable = True
|
keyboard._trigger_powersave_enable = True
|
||||||
|
|
||||||
def _ps_enable(
|
def _ps_enable(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
if not self.enable:
|
if not self.enable:
|
||||||
keyboard._trigger_powersave_enable = True
|
keyboard._trigger_powersave_enable = True
|
||||||
|
|
||||||
def _ps_disable(
|
def _ps_disable(
|
||||||
self, key: Key, keyboard: KMKKeyboard, *args: Any, **kwargs: Any
|
self,
|
||||||
|
key: Key,
|
||||||
|
keyboard: KMKKeyboard,
|
||||||
|
*args: Any,
|
||||||
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
if self.enable:
|
if self.enable:
|
||||||
keyboard._trigger_powersave_disable = True
|
keyboard._trigger_powersave_disable = True
|
||||||
|
@ -3,7 +3,7 @@ import busio
|
|||||||
from micropython import const
|
from micropython import const
|
||||||
|
|
||||||
from storage import getmount
|
from storage import getmount
|
||||||
from typing import Any, List, Optional, Tuple, Type, Union
|
from typing import Any, List, Optional, Type, Union
|
||||||
|
|
||||||
from kmk.kmk_keyboard import KMKKeyboard
|
from kmk.kmk_keyboard import KMKKeyboard
|
||||||
from kmk.kmktime import ticks_diff, ticks_ms
|
from kmk.kmktime import ticks_diff, ticks_ms
|
||||||
|
Loading…
x
Reference in New Issue
Block a user