make astyle

pull/389/head
Jesse Vincent 8 years ago
parent 5d6f385791
commit 1a9f3e1a33
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -21,51 +21,51 @@
#include <Kaleidoscope-Escape-OneShot.h> #include <Kaleidoscope-Escape-OneShot.h>
const Key keymaps[][ROWS][COLS] PROGMEM = { const Key keymaps[][ROWS][COLS] PROGMEM = {
[0] = KEYMAP_STACKED [0] = KEYMAP_STACKED
( (
Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, 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_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_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_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
OSM(LeftControl), Key_Backspace, OSM(LeftGui), Key_LeftShift, OSM(LeftControl), Key_Backspace, OSM(LeftGui), Key_LeftShift,
Key_Keymap1_Momentary, Key_Keymap1_Momentary,
Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip, 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_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_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_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
Key_RightShift, OSM(RightAlt), Key_Spacebar, OSM(RightControl), Key_RightShift, OSM(RightAlt), Key_Spacebar, OSM(RightControl),
OSL(1) 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 () { void setup () {
Kaleidoscope.use (&OneShot, &EscapeOneShot, NULL); Kaleidoscope.use (&OneShot, &EscapeOneShot, NULL);
Kaleidoscope.setup (KEYMAP_SIZE); Kaleidoscope.setup (KEYMAP_SIZE);
} }
void loop () { void loop () {
Kaleidoscope.loop (); Kaleidoscope.loop ();
} }

@ -22,28 +22,28 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
EscapeOneShot::EscapeOneShot (void) { EscapeOneShot::EscapeOneShot (void) {
} }
void void
EscapeOneShot::begin (void) { EscapeOneShot::begin (void) {
event_handler_hook_use (eventHandlerHook); event_handler_hook_use (eventHandlerHook);
} }
Key Key
EscapeOneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) { EscapeOneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) {
if (mappedKey.raw != Key_Escape.raw || if (mappedKey.raw != Key_Escape.raw ||
(keyState & INJECTED) || (keyState & INJECTED) ||
!key_toggled_on (keyState)) !key_toggled_on (keyState))
return mappedKey; return mappedKey;
if (!OneShot::isActive ()) if (!OneShot::isActive ())
return mappedKey; return mappedKey;
OneShot::cancel (); OneShot::cancel ();
return Key_NoKey; return Key_NoKey;
} }
}; };
KaleidoscopePlugins::EscapeOneShot EscapeOneShot; KaleidoscopePlugins::EscapeOneShot EscapeOneShot;

@ -19,7 +19,7 @@
#include <Kaleidoscope.h> #include <Kaleidoscope.h>
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class EscapeOneShot : public KaleidoscopePlugin { class EscapeOneShot : public KaleidoscopePlugin {
public: public:
EscapeOneShot (void); EscapeOneShot (void);
@ -27,7 +27,7 @@ namespace KaleidoscopePlugins {
private: private:
static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState); static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState);
}; };
}; };
extern KaleidoscopePlugins::EscapeOneShot EscapeOneShot; extern KaleidoscopePlugins::EscapeOneShot EscapeOneShot;

Loading…
Cancel
Save