Bring Space Cadet up to new Key API

pull/389/head
Jesse Vincent 8 years ago
parent e008887261
commit 0238bd29ed
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -25,9 +25,9 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
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_PageDn, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
Key_LCtrl, Key_Backspace, Key_LGUI, Key_LShift, Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
Key_skip, Key_skip,
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,
@ -35,7 +35,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
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_RShift, Key_RAlt, Key_Space, Key_RCtrl, Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
Key_skip Key_skip
), ),
}; };

@ -80,8 +80,8 @@ namespace KaleidoscopePlugins {
// if we have a state, but the key in question is not either of the shifts, // if we have a state, but the key in question is not either of the shifts,
// return. This can happen when another key is released, and that should not // return. This can happen when another key is released, and that should not
// interrupt us. // interrupt us.
if (mappedKey.raw != Key_LShift.raw && if (mappedKey.raw != Key_LeftShift.raw &&
mappedKey.raw != Key_RShift.raw) mappedKey.raw != Key_RightShift.raw)
return mappedKey; return mappedKey;
// if a key toggled off (and that must be one of the shifts at this point), // if a key toggled off (and that must be one of the shifts at this point),

Loading…
Cancel
Save