From 3097fd0745d68783244a7ecd5f4ed9febc026a73 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 3 Jun 2017 13:06:47 -0700 Subject: [PATCH] astyle to get us closer to cpplint-clean --- examples/OneShot/OneShot.ino | 70 ++++---- src/Kaleidoscope/OneShot.cpp | 309 ++++++++++++++++++----------------- src/Kaleidoscope/OneShot.h | 74 ++++----- 3 files changed, 228 insertions(+), 225 deletions(-) diff --git a/examples/OneShot/OneShot.ino b/examples/OneShot/OneShot.ino index 8901ebfd..14c1ecf3 100644 --- a/examples/OneShot/OneShot.ino +++ b/examples/OneShot/OneShot.ino @@ -20,52 +20,52 @@ #include const Key keymaps[][ROWS][COLS] PROGMEM = { - [0] = KEYMAP_STACKED - ( - Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, - Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, - Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, - Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape, + [0] = KEYMAP_STACKED + ( + Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, + Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, + Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, + Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape, - OSM(LeftControl), Key_Backspace, OSM(LeftGui), Key_LeftShift, - Key_Keymap1_Momentary, + OSM(LeftControl), Key_Backspace, OSM(LeftGui), Key_LeftShift, + Key_Keymap1_Momentary, - Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip, - Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals, - Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote, - Key_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus, + Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip, + Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals, + Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote, + Key_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus, - Key_RightShift, OSM(RightAlt), Key_Spacebar, OSM(RightControl), - OSL(1) - ), + Key_RightShift, OSM(RightAlt), Key_Spacebar, OSM(RightControl), + OSL(1) + ), - [1] = KEYMAP_STACKED - ( - ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, ___, + [1] = KEYMAP_STACKED + ( + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, - ___, + ___, ___, ___, ___, + ___, - ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, ___, - Key_UpArrow, Key_DownArrow, Key_LeftArrow, Key_RightArrow, ___, ___, - ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + Key_UpArrow, Key_DownArrow, Key_LeftArrow, Key_RightArrow, ___, ___, + ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, - ___ - ), + ___, ___, ___, ___, + ___ + ), }; -void setup () { - Kaleidoscope.setup (); +void setup() { + Kaleidoscope.setup(); - USE_PLUGINS (&OneShot); + USE_PLUGINS(&OneShot); } -void loop () { - Kaleidoscope.loop (); +void loop() { + Kaleidoscope.loop(); } diff --git a/src/Kaleidoscope/OneShot.cpp b/src/Kaleidoscope/OneShot.cpp index 54edba2a..f7f07865 100644 --- a/src/Kaleidoscope/OneShot.cpp +++ b/src/Kaleidoscope/OneShot.cpp @@ -60,218 +60,221 @@ bool OneShot::shouldCancelStickies = false; // ---- OneShot stuff ---- void -OneShot::injectNormalKey (uint8_t idx, uint8_t keyState) { - Key key; - - if (idx < 8) { - key.flags = Key_LeftControl.flags; - key.keyCode = Key_LeftControl.keyCode + idx; - } else { - key.flags = KEY_FLAGS | SYNTHETIC | SWITCH_TO_KEYMAP; - key.keyCode = MOMENTARY_OFFSET + idx - 8; - } - - handle_keyswitch_event (key, UNKNOWN_KEYSWITCH_LOCATION, keyState | INJECTED); +OneShot::injectNormalKey(uint8_t idx, uint8_t keyState) { + Key key; + + if (idx < 8) { + key.flags = Key_LeftControl.flags; + key.keyCode = Key_LeftControl.keyCode + idx; + } else { + key.flags = KEY_FLAGS | SYNTHETIC | SWITCH_TO_KEYMAP; + key.keyCode = MOMENTARY_OFFSET + idx - 8; + } + + handle_keyswitch_event(key, UNKNOWN_KEYSWITCH_LOCATION, keyState | INJECTED); } void -OneShot::activateOneShot (uint8_t idx) { - injectNormalKey (idx, IS_PRESSED); +OneShot::activateOneShot(uint8_t idx) { + injectNormalKey(idx, IS_PRESSED); } void -OneShot::cancelOneShot (uint8_t idx) { - clearOneShot (idx); - injectNormalKey (idx, WAS_PRESSED); +OneShot::cancelOneShot(uint8_t idx) { + clearOneShot(idx); + injectNormalKey(idx, WAS_PRESSED); } void -OneShot::mask (byte row, byte col) { - if (row >= ROWS || col >= COLS) - return; - - if (col >= 8) { - col = col - 8; - rightMask |= SCANBIT (row, col); - } else - leftMask |= SCANBIT (row, col); +OneShot::mask(byte row, byte col) { + if (row >= ROWS || col >= COLS) + return; + + if (col >= 8) { + col = col - 8; + rightMask |= SCANBIT(row, col); + } else { + leftMask |= SCANBIT(row, col); + } } void -OneShot::unmask (byte row, byte col) { - if (row >= ROWS || col >= COLS) - return; - - if (col >= 8) { - col = col - 8; - rightMask &= ~(SCANBIT (row, col)); - } else - leftMask &= ~(SCANBIT (row, col)); +OneShot::unmask(byte row, byte col) { + if (row >= ROWS || col >= COLS) + return; + + if (col >= 8) { + col = col - 8; + rightMask &= ~(SCANBIT(row, col)); + } else { + leftMask &= ~(SCANBIT(row, col)); + } } bool -OneShot::isMasked (byte row, byte col) { - if (row >= ROWS || col >= COLS) - return false; - - if (col >= 8) { - col = col - 8; - return rightMask & SCANBIT (row, col); - } else - return leftMask & SCANBIT (row, col); +OneShot::isMasked(byte row, byte col) { + if (row >= ROWS || col >= COLS) + return false; + + if (col >= 8) { + col = col - 8; + return rightMask & SCANBIT(row, col); + } else { + return leftMask & SCANBIT(row, col); + } } Key -OneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) { - uint8_t idx; +OneShot::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) { + uint8_t idx; - if (keyState & INJECTED) - return mappedKey; - - if (!State.all) { - if (!isOS (mappedKey)) { - if (isMasked (row, col)) { - if (key_toggled_off (keyState)) - unmask (row, col); - return Key_NoKey; - } + if (keyState & INJECTED) + return mappedKey; - return mappedKey; - } + if (!State.all) { + if (!isOS(mappedKey)) { + if (isMasked(row, col)) { + if (key_toggled_off(keyState)) + unmask(row, col); + return Key_NoKey; + } - idx = mappedKey.raw - OS_FIRST; - if (key_toggled_off (keyState)) { - clearPressed (idx); - } else if (key_toggled_on (keyState)) { - startTime = millis (); - setPressed (idx); - setOneShot (idx); - saveAsPrevious (mappedKey); + return mappedKey; + } - activateOneShot (idx); - } + idx = mappedKey.raw - OS_FIRST; + if (key_toggled_off(keyState)) { + clearPressed(idx); + } else if (key_toggled_on(keyState)) { + startTime = millis(); + setPressed(idx); + setOneShot(idx); + saveAsPrevious(mappedKey); - return Key_NoKey; + activateOneShot(idx); } - if (!key_is_pressed (keyState) && !key_was_pressed (keyState)) - return mappedKey; + return Key_NoKey; + } + + if (!key_is_pressed(keyState) && !key_was_pressed(keyState)) + return mappedKey; - if (isOS (mappedKey)) { - idx = mappedKey.raw - OS_FIRST; + if (isOS(mappedKey)) { + idx = mappedKey.raw - OS_FIRST; - if (isSticky (idx)) { - if (key_toggled_on (keyState)) { // maybe on _off instead? - saveAsPrevious (mappedKey); - clearSticky (idx); - cancelOneShot (idx); - } - } else { - if (key_toggled_off (keyState)) { - clearPressed (idx); - if ((millis () - startTime) >= holdTimeOut) { - cancelOneShot (idx); - } - } - - if (key_toggled_on (keyState)) { - setPressed (idx); - if (isSameAsPrevious (mappedKey)) { - setSticky (idx); - - saveAsPrevious (mappedKey); - } else { - startTime = millis (); - - setOneShot (idx); - saveAsPrevious (mappedKey); - - activateOneShot (idx); - } - } + if (isSticky(idx)) { + if (key_toggled_on(keyState)) { // maybe on _off instead? + saveAsPrevious(mappedKey); + clearSticky(idx); + cancelOneShot(idx); + } + } else { + if (key_toggled_off(keyState)) { + clearPressed(idx); + if ((millis() - startTime) >= holdTimeOut) { + cancelOneShot(idx); } + } - return Key_NoKey; - } + if (key_toggled_on(keyState)) { + setPressed(idx); + if (isSameAsPrevious(mappedKey)) { + setSticky(idx); + + saveAsPrevious(mappedKey); + } else { + startTime = millis(); - // ordinary key here, with some event + setOneShot(idx); + saveAsPrevious(mappedKey); - if (key_is_pressed (keyState)) { - mask (row, col); - saveAsPrevious (mappedKey); - shouldCancel = true; + activateOneShot(idx); + } + } } - return mappedKey; + return Key_NoKey; + } + + // ordinary key here, with some event + + if (key_is_pressed(keyState)) { + mask(row, col); + saveAsPrevious(mappedKey); + shouldCancel = true; + } + + return mappedKey; } void -OneShot::loopHook (bool postClear) { - if (!State.all) - return; - - if (postClear) { - if (hasTimedOut ()) - cancel (); - - for (uint8_t i = 0; i < 32; i++) { - if (shouldCancel) { - if (isSticky (i)) { - if (shouldCancelStickies) { - clearSticky (i); - } - } else if (isOneShot (i) && !isPressed (i)) { - cancelOneShot (i); - } - } +OneShot::loopHook(bool postClear) { + if (!State.all) + return; + + if (postClear) { + if (hasTimedOut()) + cancel(); + + for (uint8_t i = 0; i < 32; i++) { + if (shouldCancel) { + if (isSticky(i)) { + if (shouldCancelStickies) { + clearSticky(i); + } + } else if (isOneShot(i) && !isPressed(i)) { + cancelOneShot(i); } + } + } - if (shouldCancel) { - shouldCancel = false; - shouldCancelStickies = false; - } - } else { - for (uint8_t i = 0; i < 8; i++) { - if (isOneShot (i)) { - activateOneShot (i); - } - } + if (shouldCancel) { + shouldCancel = false; + shouldCancelStickies = false; + } + } else { + for (uint8_t i = 0; i < 8; i++) { + if (isOneShot(i)) { + activateOneShot(i); + } } + } } // --- glue code --- -OneShot::OneShot (void) { +OneShot::OneShot(void) { } void -OneShot::begin (void) { - event_handler_hook_use (eventHandlerHook); - loop_hook_use (loopHook); +OneShot::begin(void) { + event_handler_hook_use(eventHandlerHook); + loop_hook_use(loopHook); } bool -OneShot::isActive (void) { - return (State.all && !hasTimedOut ()); +OneShot::isActive(void) { + return (State.all && !hasTimedOut()); } bool -OneShot::isModifierActive (Key key) { - if (key.raw < Key_LeftControl.raw || key.raw > Key_RightGui.raw) - return false; +OneShot::isModifierActive(Key key) { + if (key.raw < Key_LeftControl.raw || key.raw > Key_RightGui.raw) + return false; - return isOneShot (key.keyCode - Key_LeftControl.keyCode); + return isOneShot(key.keyCode - Key_LeftControl.keyCode); } void -OneShot::cancel (bool withStickies) { - shouldCancel = true; - shouldCancelStickies = withStickies; +OneShot::cancel(bool withStickies) { + shouldCancel = true; + shouldCancelStickies = withStickies; } void -OneShot::inject (Key key, uint8_t keyState) { - eventHandlerHook (key, 255, 255, keyState); +OneShot::inject(Key key, uint8_t keyState) { + eventHandlerHook(key, 255, 255, keyState); } }; diff --git a/src/Kaleidoscope/OneShot.h b/src/Kaleidoscope/OneShot.h index a7df2b90..214bb3f6 100644 --- a/src/Kaleidoscope/OneShot.h +++ b/src/Kaleidoscope/OneShot.h @@ -26,51 +26,51 @@ namespace KaleidoscopePlugins { class OneShot : public KaleidoscopePlugin { - public: - OneShot (void); + public: + OneShot(void); - virtual void begin (void) final; + void begin(void) final; - static bool isActive (void); - static void cancel (bool withStickies); - static void cancel (void) { - cancel (false); - }; - static uint16_t timeOut; - static uint16_t holdTimeOut; + static bool isActive(void); + static void cancel(bool withStickies); + static void cancel(void) { + cancel(false); + } + static uint16_t timeOut; + static uint16_t holdTimeOut; - static bool isModifierActive (Key key); + static bool isModifierActive(Key key); - void inject (Key key, uint8_t keyState); + void inject(Key key, uint8_t keyState); - private: - typedef union { - struct { - uint8_t mods; - uint8_t layers; - }; - uint16_t all; - } state_t; - static uint32_t startTime; - static state_t State; - static state_t stickyState; - static state_t pressedState; - static uint32_t leftMask; - static uint32_t rightMask; - static Key prevKey; - static bool shouldCancel; - static bool shouldCancelStickies; + private: + typedef union { + struct { + uint8_t mods; + uint8_t layers; + }; + uint16_t all; + } state_t; + static uint32_t startTime; + static state_t State; + static state_t stickyState; + static state_t pressedState; + static uint32_t leftMask; + static uint32_t rightMask; + static Key prevKey; + static bool shouldCancel; + static bool shouldCancelStickies; - static void injectNormalKey (uint8_t idx, uint8_t keyState); - static void activateOneShot (uint8_t idx); - static void cancelOneShot (uint8_t idx); + static void injectNormalKey(uint8_t idx, uint8_t keyState); + static void activateOneShot(uint8_t idx); + static void cancelOneShot(uint8_t idx); - static void mask (byte row, byte col); - static void unmask (byte row, byte col); - static bool isMasked (byte row, byte col); + static void mask(byte row, byte col); + static void unmask(byte row, byte col); + static bool isMasked(byte row, byte col); - static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState); - static void loopHook (bool postClear); + static Key eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState); + static void loopHook(bool postClear); }; };