diff --git a/examples/GhostInTheFirmware/GhostInTheFirmware.ino b/examples/GhostInTheFirmware/GhostInTheFirmware.ino index 8fd67dae..ca8a4aa1 100644 --- a/examples/GhostInTheFirmware/GhostInTheFirmware.ino +++ b/examples/GhostInTheFirmware/GhostInTheFirmware.ino @@ -23,119 +23,119 @@ #include const Key keymaps[][ROWS][COLS] PROGMEM = { - [0] = KEYMAP_STACKED - ( - ___, ___, ___, ___, ___, ___, M(0), - ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, ___, - - ___, ___, ___, ___, - ___, - - ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, ___, + [0] = KEYMAP_STACKED + ( + ___, ___, ___, ___, ___, ___, M(0), + ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, - ___ - ), + ___, ___, ___, ___, + ___, + + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + + ___, ___, ___, ___, + ___ + ), }; static Key eventDropper (Key mappedKey, byte row, byte col, uint8_t keyState) { - return Key_NoKey; + return Key_NoKey; } const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { - if (macroIndex == 0 && key_toggled_on (keyState)) - GhostInTheFirmware.activate (); + if (macroIndex == 0 && key_toggled_on (keyState)) + GhostInTheFirmware.activate (); - return MACRO_NONE; + return MACRO_NONE; } static const KaleidoscopePlugins::GhostInTheFirmware::GhostKey ghostKeys[] PROGMEM = { - {0, 6, 200, 50}, - {0, 5, 200, 50}, - {0, 4, 200, 50}, - {0, 3, 200, 50}, - {0, 2, 200, 50}, - {0, 1, 200, 50}, - {0, 0, 200, 50}, - {1, 0, 200, 50}, - {1, 1, 200, 50}, - {1, 2, 200, 50}, - {1, 3, 200, 50}, - {1, 4, 200, 50}, - {1, 5, 200, 50}, - {1, 6, 200, 50}, - {2, 6, 200, 50}, - {2, 5, 200, 50}, - {2, 4, 200, 50}, - {2, 3, 200, 50}, - {2, 2, 200, 50}, - {2, 1, 200, 50}, - {2, 0, 200, 50}, - {3, 0, 200, 50}, - {3, 1, 200, 50}, - {3, 3, 200, 50}, - {3, 4, 200, 50}, - {3, 5, 200, 50}, - {0, 7, 200, 50}, - {1, 7, 200, 50}, - {2, 7, 200, 50}, - {3, 7, 200, 50}, - {3, 6, 200, 50}, - - {3, 9, 200, 50}, - {3, 8, 200, 50}, - {2, 8, 200, 50}, - {1, 8, 200, 50}, - {0, 8, 200, 50}, - {3, 10, 200, 50}, - {3, 11, 200, 50}, - {3, 12, 200, 50}, - {3, 13, 200, 50}, - {3, 14, 200, 50}, - {3, 15, 200, 50}, - {2, 15, 200, 50}, - {2, 14, 200, 50}, - {2, 13, 200, 50}, - {2, 12, 200, 50}, - {2, 11, 200, 50}, - {2, 10, 200, 50}, - {2, 9, 200, 50}, - {1, 9, 200, 50}, - {1, 10, 200, 50}, - {1, 11, 200, 50}, - {1, 12, 200, 50}, - {1, 13, 200, 50}, - {1, 14, 200, 50}, - {1, 15, 200, 50}, - {0, 15, 200, 50}, - {0, 14, 200, 50}, - {0, 13, 200, 50}, - {0, 12, 200, 50}, - {0, 11, 200, 50}, - {0, 10, 200, 50}, - {0, 9, 200, 50}, - - {0, 0, 0, 0} + {0, 6, 200, 50}, + {0, 5, 200, 50}, + {0, 4, 200, 50}, + {0, 3, 200, 50}, + {0, 2, 200, 50}, + {0, 1, 200, 50}, + {0, 0, 200, 50}, + {1, 0, 200, 50}, + {1, 1, 200, 50}, + {1, 2, 200, 50}, + {1, 3, 200, 50}, + {1, 4, 200, 50}, + {1, 5, 200, 50}, + {1, 6, 200, 50}, + {2, 6, 200, 50}, + {2, 5, 200, 50}, + {2, 4, 200, 50}, + {2, 3, 200, 50}, + {2, 2, 200, 50}, + {2, 1, 200, 50}, + {2, 0, 200, 50}, + {3, 0, 200, 50}, + {3, 1, 200, 50}, + {3, 3, 200, 50}, + {3, 4, 200, 50}, + {3, 5, 200, 50}, + {0, 7, 200, 50}, + {1, 7, 200, 50}, + {2, 7, 200, 50}, + {3, 7, 200, 50}, + {3, 6, 200, 50}, + + {3, 9, 200, 50}, + {3, 8, 200, 50}, + {2, 8, 200, 50}, + {1, 8, 200, 50}, + {0, 8, 200, 50}, + {3, 10, 200, 50}, + {3, 11, 200, 50}, + {3, 12, 200, 50}, + {3, 13, 200, 50}, + {3, 14, 200, 50}, + {3, 15, 200, 50}, + {2, 15, 200, 50}, + {2, 14, 200, 50}, + {2, 13, 200, 50}, + {2, 12, 200, 50}, + {2, 11, 200, 50}, + {2, 10, 200, 50}, + {2, 9, 200, 50}, + {1, 9, 200, 50}, + {1, 10, 200, 50}, + {1, 11, 200, 50}, + {1, 12, 200, 50}, + {1, 13, 200, 50}, + {1, 14, 200, 50}, + {1, 15, 200, 50}, + {0, 15, 200, 50}, + {0, 14, 200, 50}, + {0, 13, 200, 50}, + {0, 12, 200, 50}, + {0, 11, 200, 50}, + {0, 10, 200, 50}, + {0, 9, 200, 50}, + + {0, 0, 0, 0} }; void setup () { - Serial.begin (9600); + Serial.begin (9600); - Kaleidoscope.setup (KEYMAP_SIZE); + Kaleidoscope.setup (KEYMAP_SIZE); - GhostInTheFirmware.configure (ghostKeys); - StalkerEffect.configure (STALKER (BlazingTrail, NULL)); + GhostInTheFirmware.configure (ghostKeys); + StalkerEffect.configure (STALKER (BlazingTrail, NULL)); - Kaleidoscope.use (&LEDControl, &GhostInTheFirmware, &StalkerEffect, &Macros, - NULL); - event_handler_hook_use (eventDropper); + Kaleidoscope.use (&LEDControl, &GhostInTheFirmware, &StalkerEffect, &Macros, + NULL); + event_handler_hook_use (eventDropper); } void loop () { - Kaleidoscope.loop (); + Kaleidoscope.loop (); } diff --git a/src/Kaleidoscope/GhostInTheFirmware.cpp b/src/Kaleidoscope/GhostInTheFirmware.cpp index 973b9d2a..254f95f2 100644 --- a/src/Kaleidoscope/GhostInTheFirmware.cpp +++ b/src/Kaleidoscope/GhostInTheFirmware.cpp @@ -20,68 +20,68 @@ #include namespace KaleidoscopePlugins { - GhostInTheFirmware::GhostKey *GhostInTheFirmware::ghostKeys; - bool GhostInTheFirmware::isActive; - bool GhostInTheFirmware::isPressed; - uint16_t GhostInTheFirmware::currentPos; - uint32_t GhostInTheFirmware::startTime; - uint16_t GhostInTheFirmware::pressTimeOut; - uint16_t GhostInTheFirmware::delayTimeOut; +GhostInTheFirmware::GhostKey *GhostInTheFirmware::ghostKeys; +bool GhostInTheFirmware::isActive; +bool GhostInTheFirmware::isPressed; +uint16_t GhostInTheFirmware::currentPos; +uint32_t GhostInTheFirmware::startTime; +uint16_t GhostInTheFirmware::pressTimeOut; +uint16_t GhostInTheFirmware::delayTimeOut; - GhostInTheFirmware::GhostInTheFirmware (void) { - } +GhostInTheFirmware::GhostInTheFirmware (void) { +} - void - GhostInTheFirmware::begin (void) { +void +GhostInTheFirmware::begin (void) { loop_hook_use (this->loopHook); - } +} - void - GhostInTheFirmware::activate (void) { +void +GhostInTheFirmware::activate (void) { isActive = true; - } +} - void - GhostInTheFirmware::configure (const GhostKey ghostKeys_[]) { +void +GhostInTheFirmware::configure (const GhostKey ghostKeys_[]) { ghostKeys = (GhostKey *)ghostKeys_; - } +} - void - GhostInTheFirmware::loopHook (bool postClear) { +void +GhostInTheFirmware::loopHook (bool postClear) { if (postClear || !isActive) - return; + return; if (pressTimeOut == 0) { - pressTimeOut = pgm_read_word (&(ghostKeys[currentPos].pressTime)); - delayTimeOut = pgm_read_word (&(ghostKeys[currentPos].delay)); + pressTimeOut = pgm_read_word (&(ghostKeys[currentPos].pressTime)); + delayTimeOut = pgm_read_word (&(ghostKeys[currentPos].delay)); - if (pressTimeOut == 0) { - currentPos = 0; - isActive = false; - return; - } - isPressed = true; - startTime = millis (); - } else { - if (isPressed && ((millis () - startTime) > pressTimeOut)) { - isPressed = false; + if (pressTimeOut == 0) { + currentPos = 0; + isActive = false; + return; + } + isPressed = true; startTime = millis (); + } else { + if (isPressed && ((millis () - startTime) > pressTimeOut)) { + isPressed = false; + startTime = millis (); - byte row = pgm_read_byte (&(ghostKeys[currentPos].row)); - byte col = pgm_read_byte (&(ghostKeys[currentPos].col)); + byte row = pgm_read_byte (&(ghostKeys[currentPos].row)); + byte col = pgm_read_byte (&(ghostKeys[currentPos].col)); - handle_keyswitch_event (Key_NoKey, row, col, WAS_PRESSED); - } else if (isPressed) { - byte row = pgm_read_byte (&(ghostKeys[currentPos].row)); - byte col = pgm_read_byte (&(ghostKeys[currentPos].col)); + handle_keyswitch_event (Key_NoKey, row, col, WAS_PRESSED); + } else if (isPressed) { + byte row = pgm_read_byte (&(ghostKeys[currentPos].row)); + byte col = pgm_read_byte (&(ghostKeys[currentPos].col)); - handle_keyswitch_event (Key_NoKey, row, col, IS_PRESSED); - } else if ((millis () - startTime) > delayTimeOut) { - currentPos++; - pressTimeOut = 0; - } + handle_keyswitch_event (Key_NoKey, row, col, IS_PRESSED); + } else if ((millis () - startTime) > delayTimeOut) { + currentPos++; + pressTimeOut = 0; + } } - } +} }; diff --git a/src/Kaleidoscope/GhostInTheFirmware.h b/src/Kaleidoscope/GhostInTheFirmware.h index 36c932a7..51a74dcd 100644 --- a/src/Kaleidoscope/GhostInTheFirmware.h +++ b/src/Kaleidoscope/GhostInTheFirmware.h @@ -21,13 +21,13 @@ #include namespace KaleidoscopePlugins { - class GhostInTheFirmware : public KaleidoscopePlugin { +class GhostInTheFirmware : public KaleidoscopePlugin { public: typedef struct { - byte row; - byte col; - uint16_t pressTime; - uint16_t delay; + byte row; + byte col; + uint16_t pressTime; + uint16_t delay; } GhostKey; GhostInTheFirmware (void); @@ -46,7 +46,7 @@ namespace KaleidoscopePlugins { static uint16_t delayTimeOut; static void loopHook (bool postClear); - }; +}; };