From d33deda114a8ff99b3a9499b2e13b506b75b6f4e Mon Sep 17 00:00:00 2001 From: Michael Richters Date: Mon, 4 Dec 2017 14:34:12 -0600 Subject: [PATCH] astyle --- examples/Qukeys/Qukeys.ino | 32 ++++++++++++++++---------------- src/Kaleidoscope/Qukeys.cpp | 12 ++++++------ src/Kaleidoscope/Qukeys.h | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/Qukeys/Qukeys.ino b/examples/Qukeys/Qukeys.ino index e821e194..27d61a20 100644 --- a/examples/Qukeys/Qukeys.ino +++ b/examples/Qukeys/Qukeys.ino @@ -8,22 +8,22 @@ enum { MACRO_TOGGLE_QUKEYS }; KEYMAPS( [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, - - Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift, - ___, - - M(MACRO_TOGGLE_QUKEYS), 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, Key_RightAlt, Key_Spacebar, Key_RightControl, - ___), + ( + 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, + + Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift, + ___, + + M(MACRO_TOGGLE_QUKEYS), 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, Key_RightAlt, Key_Spacebar, Key_RightControl, + ___), ) // Defining a macro (on the "any" key: see above) to toggle Qukeys on and off diff --git a/src/Kaleidoscope/Qukeys.cpp b/src/Kaleidoscope/Qukeys.cpp index a8177543..3c2f9c54 100644 --- a/src/Kaleidoscope/Qukeys.cpp +++ b/src/Kaleidoscope/Qukeys.cpp @@ -136,7 +136,7 @@ void Qukeys::flushKey(bool qukey_state, uint8_t keyswitch_state) { memcpy(Keyboard.keyReport.allkeys, hid_report.allkeys, sizeof(hid_report)); // Last, if the key is still down, add its code back in - if ( ! keyToggledOn(keyswitch_state) ) + if (! keyToggledOn(keyswitch_state)) handleKeyswitchEvent(keycode, row, col, IS_PRESSED | WAS_PRESSED | INJECTED); // Shift the queue, so key_queue[0] is always the first key that gets processed @@ -164,11 +164,11 @@ void Qukeys::flushQueue(int8_t index) { // Flush all the non-qukey keys from the front of the queue void Qukeys::flushQueue(void) { // flush keys until we find a qukey: - while (key_queue_length_ > 0 && - lookupQukey(key_queue_[0].addr) == QUKEY_NOT_FOUND) { + while (key_queue_length_ > 0 && + lookupQukey(key_queue_[0].addr) == QUKEY_NOT_FOUND) { flushKey(QUKEY_STATE_PRIMARY, IS_PRESSED | WAS_PRESSED); } -} +} Key Qukeys::keyScanHook(Key mapped_key, byte row, byte col, uint8_t key_state) { // Uncomment this for debugging, so as not to make flashing difficult @@ -194,7 +194,7 @@ Key Qukeys::keyScanHook(Key mapped_key, byte row, byte col, uint8_t key_state) { if (keyToggledOn(key_state)) { // If the queue is empty and the key isn't a qukey, proceed: if (key_queue_length_ == 0 && - qukey_index == QUKEY_NOT_FOUND) + qukey_index == QUKEY_NOT_FOUND) return mapped_key; // Otherwise, queue the key and stop processing: enqueue(key_addr); @@ -245,7 +245,7 @@ void Qukeys::preReportHook(void) { // state to the alternate keycode and add it to the report uint32_t current_time = millis(); while (key_queue_length_ > 0) { - if ( lookupQukey(key_queue_[0].addr) == QUKEY_NOT_FOUND ) { + if (lookupQukey(key_queue_[0].addr) == QUKEY_NOT_FOUND) { flushKey(QUKEY_STATE_PRIMARY, IS_PRESSED | WAS_PRESSED); } else if (current_time > key_queue_[0].flush_time) { flushKey(QUKEY_STATE_ALTERNATE, IS_PRESSED | WAS_PRESSED); diff --git a/src/Kaleidoscope/Qukeys.h b/src/Kaleidoscope/Qukeys.h index 403f6b81..4c733919 100644 --- a/src/Kaleidoscope/Qukeys.h +++ b/src/Kaleidoscope/Qukeys.h @@ -105,7 +105,7 @@ class Qukeys : public KaleidoscopePlugin { //static uint8_t keyswitch_state[]; // Qukey state bitfield - static uint8_t qukey_state_[(TOTAL_KEYS)/8 + ((TOTAL_KEYS)%8 ? 1 : 0)]; + static uint8_t qukey_state_[(TOTAL_KEYS) / 8 + ((TOTAL_KEYS) % 8 ? 1 : 0)]; static bool getQukeyState(uint8_t addr) { return bitRead(qukey_state_[addr / 8], addr % 8); }