sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve #59, adds MEH and HYPER modifiers

Browse Source 
This also cleans up some weird potentially-buggy logic paths within the
ModifierKeycode creation and handling. I can now press a free-floating
HYPER in my keymap and see the appropriate codes in `xev` for press and
release events.
This commit is contained in:
Josh Klar 2018-10-11 18:56:46 -07:00
parent b763dd9c4b
commit 98dfb53a83
No known key found for this signature in database
GPG Key ID: 220F99BD7DB7A99E
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kmk/abstract/hid.py
View File

@ -102,7 +102,11 @@ class AbstractHidHelper:
def add_modifier(self, modifier): def add_modifier(self, modifier):
if isinstance(modifier, ModifierKeycode): if isinstance(modifier, ModifierKeycode):
self.report_mods[0] |= modifier.code if modifier.code == ModifierKeycode.FAKE_CODE:
for mod in modifier.has_modifiers:
self.report_mods[0] |= mod
else:
self.report_mods[0] |= modifier.code
else: else:
self.report_mods[0] |= modifier self.report_mods[0] |= modifier
@ -110,7 +114,11 @@ class AbstractHidHelper:
def remove_modifier(self, modifier): def remove_modifier(self, modifier):
if isinstance(modifier, ModifierKeycode): if isinstance(modifier, ModifierKeycode):
self.report_mods[0] ^= modifier.code if modifier.code == ModifierKeycode.FAKE_CODE:
for mod in modifier.has_modifiers:
self.report_mods[0] ^= mod
else:
self.report_mods[0] ^= modifier.code
else: else:
self.report_mods[0] ^= modifier self.report_mods[0] ^= modifier

34
kmk/keycodes.py
View File

@ -81,17 +81,33 @@ class Keycode:
class ModifierKeycode(Keycode): class ModifierKeycode(Keycode):
FAKE_CODE = -1
def __call__(self, modified_code=None, no_press=None, no_release=None): def __call__(self, modified_code=None, no_press=None, no_release=None):
if modified_code is None and no_press is None and no_release is None: if modified_code is None and no_press is None and no_release is None:
return self return self
if modified_code is not None: if modified_code is not None:
new_keycode = Keycode( if isinstance(modified_code, ModifierKeycode):
modified_code.code, new_keycode = ModifierKeycode(
{self.code}, ModifierKeycode.FAKE_CODE,
no_press=no_press, set() if self.has_modifiers is None else self.has_modifiers,
no_release=no_release, no_press=no_press,
) no_release=no_release,
)
if self.code != ModifierKeycode.FAKE_CODE:
new_keycode.has_modifiers.add(self.code)
if modified_code.code != ModifierKeycode.FAKE_CODE:
new_keycode.has_modifiers.add(modified_code.code)
else:
new_keycode = Keycode(
modified_code.code,
{self.code},
no_press=no_press,
no_release=no_release,
)
if modified_code.has_modifiers: if modified_code.has_modifiers:
new_keycode.has_modifiers |= modified_code.has_modifiers new_keycode.has_modifiers |= modified_code.has_modifiers
@ -104,6 +120,9 @@ class ModifierKeycode(Keycode):
return new_keycode return new_keycode
def __repr__(self):
return 'ModifierKeycode(code={}, has_modifiers={})'.format(self.code, self.has_modifiers)
class ConsumerKeycode(Keycode): class ConsumerKeycode(Keycode):
pass pass
@ -220,6 +239,9 @@ class Modifiers(KeycodeCategory):
KC_RALT = ModifierKeycode(RawKeycodes.RALT) KC_RALT = ModifierKeycode(RawKeycodes.RALT)
KC_RGUI = KC_RCMD = KC_RWIN = ModifierKeycode(RawKeycodes.RGUI) KC_RGUI = KC_RCMD = KC_RWIN = ModifierKeycode(RawKeycodes.RGUI)
KC_MEH = KC_LSHIFT(KC_LALT(KC_LCTRL))
KC_HYPR = KC_HYPER = KC_MEH(KC_LGUI)
class Common(KeycodeCategory): class Common(KeycodeCategory):
KC_A = Keycode(4) KC_A = Keycode(4)

2
user_keymaps/klardotsh/itsybitsy_m4_express/threethree.py
View File

@ -72,7 +72,7 @@ MACRO_HELLO_WORLD = simple_key_sequence([
keymap = [ keymap = [
[ [
[KC.GESC, KC.A, KC.RESET], [KC.GESC, KC.HYPR, KC.RESET],
[KC.MO(1), KC.B, KC.MUTE], [KC.MO(1), KC.B, KC.MUTE],
[KC.LT(2, KC.EXCLAIM), KC.HASH, KC.ENTER], [KC.LT(2, KC.EXCLAIM), KC.HASH, KC.ENTER],
], ],