kmk.consts: rename UnicodeModes => UnicodeMode

This brings this naming into consistency with both fellow consts in the
same file (ex. LeaderMode is singular) as well as the variables in which
the consts are usually used (usually a `Firmware.unicode_mode` attribute
in a keymap).
This commit is contained in:
Josh Klar
2018-12-04 17:03:13 -08:00
parent 84a3fa8a04
commit d6a0538009
9 changed files with 25 additions and 25 deletions

View File

@@ -142,7 +142,7 @@ class DiodeOrientation:
ROWS = 1
class UnicodeModes:
class UnicodeMode:
NOOP = 0
LINUX = IBUS = 1
MACOS = OSX = RALT = 2

View File

@@ -38,7 +38,7 @@ import busio
import gc
import supervisor
from kmk.consts import LeaderMode, UnicodeModes
from kmk.consts import LeaderMode, UnicodeMode
from kmk.hid import USB_HID
from kmk.internal_state import InternalState
from kmk.matrix import MatrixScanner
@@ -53,7 +53,7 @@ class Firmware:
col_pins = None
diode_orientation = None
unicode_mode = UnicodeModes.NOOP
unicode_mode = UnicodeMode.NOOP
tap_time = 300
leader_mode = LeaderMode.TIMEOUT
leader_dictionary = {}

View File

@@ -5,7 +5,7 @@ except ImportError:
# MicroPython, it doesn't exist
from ucollections import namedtuple
from kmk.consts import UnicodeModes
from kmk.consts import UnicodeMode
from kmk.types import AttrDict
FIRST_KMK_INTERNAL_KEYCODE = 1000
@@ -548,12 +548,12 @@ class KMK(KeycodeCategory):
'''
return UnicodeModeKeycode.from_mode_const(mode)
KC_UC_MODE_NOOP = KC_UC_DISABLE = UnicodeModeKeycode.from_mode_const(UnicodeModes.NOOP)
KC_UC_MODE_LINUX = KC_UC_MODE_IBUS = UnicodeModeKeycode.from_mode_const(UnicodeModes.IBUS)
KC_UC_MODE_NOOP = KC_UC_DISABLE = UnicodeModeKeycode.from_mode_const(UnicodeMode.NOOP)
KC_UC_MODE_LINUX = KC_UC_MODE_IBUS = UnicodeModeKeycode.from_mode_const(UnicodeMode.IBUS)
KC_UC_MODE_MACOS = KC_UC_MODE_OSX = KC_UC_MODE_RALT = UnicodeModeKeycode.from_mode_const(
UnicodeModes.RALT,
UnicodeMode.RALT,
)
KC_UC_MODE_WINC = UnicodeModeKeycode.from_mode_const(UnicodeModes.WINC)
KC_UC_MODE_WINC = UnicodeModeKeycode.from_mode_const(UnicodeMode.WINC)
@staticmethod
def KC_MACRO_SLEEP_MS(ms):

View File

@@ -1,4 +1,4 @@
from kmk.consts import UnicodeModes
from kmk.consts import UnicodeMode
from kmk.keycodes import (Common, Macro, Modifiers,
generate_codepoint_keysym_seq)
from kmk.macros.simple import simple_key_sequence
@@ -43,11 +43,11 @@ def unicode_codepoint_sequence(codepoints):
]
def _unicode_sequence(state):
if state.unicode_mode == UnicodeModes.IBUS:
if state.unicode_mode == UnicodeMode.IBUS:
yield from _ibus_unicode_sequence(kc_macros, state)
elif state.unicode_mode == UnicodeModes.RALT:
elif state.unicode_mode == UnicodeMode.RALT:
yield from _ralt_unicode_sequence(kc_macros, state)
elif state.unicode_mode == UnicodeModes.WINC:
elif state.unicode_mode == UnicodeMode.WINC:
yield from _winc_unicode_sequence(kc_macros, state)
return Macro(keydown=_unicode_sequence)