keyToggledO* camelcasing

pull/141/head
Jesse Vincent 7 years ago
parent 3154f7c997
commit 0f2bae7db7
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -38,7 +38,7 @@ const macro_t *macroAppSwitch(uint8_t keyState) {
return MACRO(Dr(mod), D(Tab), END); return MACRO(Dr(mod), D(Tab), END);
} }
// Key was just released // Key was just released
if (key_toggled_off(keyState)) { if (keyToggledOff(keyState)) {
return MACRO(U(Tab), Dr(mod), END); return MACRO(U(Tab), Dr(mod), END);
} }
// Key is not pressed, and was not just released. // Key is not pressed, and was not just released.
@ -51,7 +51,7 @@ const macro_t *macroAppSwitch(uint8_t keyState) {
} }
const macro_t *macroAppCancel(uint8_t keyState) { const macro_t *macroAppCancel(uint8_t keyState) {
if (key_toggled_on(keyState)) if (keyToggledOn(keyState))
appSwitchActive = false; appSwitchActive = false;
return MACRO_NONE; return MACRO_NONE;
} }

@ -74,11 +74,11 @@ static LEDSolidColor solidIndigo(0, 0, 100);
static LEDSolidColor solidViolet(70, 0, 60); static LEDSolidColor solidViolet(70, 0, 60);
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (macroIndex == TOGGLENUMLOCK && key_toggled_on(keyState)) { if (macroIndex == TOGGLENUMLOCK && keyToggledOn(keyState)) {
return NumLock.toggle(); return NumLock.toggle();
} }
if (macroIndex == 1 && key_toggled_on(keyState)) { if (macroIndex == 1 && keyToggledOn(keyState)) {
Serial.print("Keyboard.IO keyboard driver v0.00"); Serial.print("Keyboard.IO keyboard driver v0.00");
return MACRO(I(25), return MACRO(I(25),
D(LeftShift), T(M), U(LeftShift), T(O), T(D), T(E), T(L), D(LeftShift), T(M), U(LeftShift), T(O), T(D), T(E), T(L),

@ -34,7 +34,7 @@ static bool handle_keyswitch_event_default(Key mappedKey, byte row, byte col, ui
handle_synthetic_keyswitch_event(mappedKey, keyState); handle_synthetic_keyswitch_event(mappedKey, keyState);
} else if (key_is_pressed(keyState)) { } else if (key_is_pressed(keyState)) {
press_key(mappedKey); press_key(mappedKey);
} else if (key_toggled_off(keyState) && (keyState & INJECTED)) { } else if (keyToggledOff(keyState) && (keyState & INJECTED)) {
release_key(mappedKey); release_key(mappedKey);
} }
return true; return true;

@ -11,7 +11,7 @@ static void handle_keymap_keyswitch_event(Key keymapEntry, uint8_t keyState) {
if (keymapEntry.keyCode >= MOMENTARY_OFFSET) { if (keymapEntry.keyCode >= MOMENTARY_OFFSET) {
uint8_t target = keymapEntry.keyCode - MOMENTARY_OFFSET; uint8_t target = keymapEntry.keyCode - MOMENTARY_OFFSET;
if (key_toggled_on(keyState)) { if (keyToggledOn(keyState)) {
if (target == KEYMAP_NEXT) { if (target == KEYMAP_NEXT) {
Layer.next(); Layer.next();
} else if (target == KEYMAP_PREVIOUS) { } else if (target == KEYMAP_PREVIOUS) {
@ -20,7 +20,7 @@ static void handle_keymap_keyswitch_event(Key keymapEntry, uint8_t keyState) {
Layer.on(target); Layer.on(target);
} }
} }
if (key_toggled_off(keyState)) { if (keyToggledOff(keyState)) {
if (target == KEYMAP_NEXT) { if (target == KEYMAP_NEXT) {
Layer.previous(); Layer.previous();
} else if (target == KEYMAP_PREVIOUS) { } else if (target == KEYMAP_PREVIOUS) {
@ -31,7 +31,7 @@ static void handle_keymap_keyswitch_event(Key keymapEntry, uint8_t keyState) {
} }
// switch keymap and stay there // switch keymap and stay there
} else if (key_toggled_on(keyState)) { } else if (keyToggledOn(keyState)) {
if (Layer.isOn(keymapEntry.keyCode) && keymapEntry.keyCode) if (Layer.isOn(keymapEntry.keyCode) && keymapEntry.keyCode)
Layer.off(keymapEntry.keyCode); Layer.off(keymapEntry.keyCode);
else else

Loading…
Cancel
Save