From f4d2efce5ca682833295c4bc864d81f759fe7bba Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 3 Jun 2017 22:57:03 -0700 Subject: [PATCH] astyle with current project style guidelines --- examples/Escape-OneShot/Escape-OneShot.ino | 70 +++++++++++----------- src/Kaleidoscope/Escape-OneShot.cpp | 24 ++++---- src/Kaleidoscope/Escape-OneShot.h | 10 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/examples/Escape-OneShot/Escape-OneShot.ino b/examples/Escape-OneShot/Escape-OneShot.ino index 9fa31a03..df98ae1e 100644 --- a/examples/Escape-OneShot/Escape-OneShot.ino +++ b/examples/Escape-OneShot/Escape-OneShot.ino @@ -21,51 +21,51 @@ #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.use (&OneShot, &EscapeOneShot, NULL); - Kaleidoscope.setup (KEYMAP_SIZE); +void setup() { + Kaleidoscope.use(&OneShot, &EscapeOneShot, NULL); + Kaleidoscope.setup(KEYMAP_SIZE); } -void loop () { - Kaleidoscope.loop (); +void loop() { + Kaleidoscope.loop(); } diff --git a/src/Kaleidoscope/Escape-OneShot.cpp b/src/Kaleidoscope/Escape-OneShot.cpp index cde58aaf..97fec0ea 100644 --- a/src/Kaleidoscope/Escape-OneShot.cpp +++ b/src/Kaleidoscope/Escape-OneShot.cpp @@ -22,27 +22,27 @@ namespace KaleidoscopePlugins { -EscapeOneShot::EscapeOneShot (void) { +EscapeOneShot::EscapeOneShot(void) { } void -EscapeOneShot::begin (void) { - event_handler_hook_use (eventHandlerHook); +EscapeOneShot::begin(void) { + event_handler_hook_use(eventHandlerHook); } Key -EscapeOneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) { - if (mappedKey.raw != Key_Escape.raw || - (keyState & INJECTED) || - !key_toggled_on (keyState)) - return mappedKey; +EscapeOneShot::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) { + if (mappedKey.raw != Key_Escape.raw || + (keyState & INJECTED) || + !key_toggled_on(keyState)) + return mappedKey; - if (!OneShot::isActive ()) - return mappedKey; + if (!OneShot::isActive()) + return mappedKey; - OneShot::cancel (); + OneShot::cancel(); - return Key_NoKey; + return Key_NoKey; } }; diff --git a/src/Kaleidoscope/Escape-OneShot.h b/src/Kaleidoscope/Escape-OneShot.h index 056bdb35..f96d95c2 100644 --- a/src/Kaleidoscope/Escape-OneShot.h +++ b/src/Kaleidoscope/Escape-OneShot.h @@ -20,13 +20,13 @@ namespace KaleidoscopePlugins { class EscapeOneShot : public KaleidoscopePlugin { - public: - EscapeOneShot (void); + public: + EscapeOneShot(void); - virtual void begin (void) final; + virtual void begin(void) final; - private: - static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState); + private: + static Key eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState); }; };