From 24f6c8abd411a0f920f78736d40e10e3ef9c030a Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sun, 21 May 2017 23:20:19 -0700 Subject: [PATCH] Updating to new keycodes --- examples/Unicode/Unicode.ino | 6 +++--- src/Kaleidoscope/Unicode.cpp | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/Unicode/Unicode.ino b/examples/Unicode/Unicode.ino index adfebe0d..3dd86716 100644 --- a/examples/Unicode/Unicode.ino +++ b/examples/Unicode/Unicode.ino @@ -29,9 +29,9 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { 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_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_LeftCtrl, Key_Backspace, Key_LeftGui, Key_LeftShift, Key_skip, Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip, @@ -39,7 +39,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { 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_RShift, Key_RAlt, Key_Space, Key_RCtrl, + Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightCtrl, Key_skip ), }; diff --git a/src/Kaleidoscope/Unicode.cpp b/src/Kaleidoscope/Unicode.cpp index 98a51918..83c18a92 100644 --- a/src/Kaleidoscope/Unicode.cpp +++ b/src/Kaleidoscope/Unicode.cpp @@ -32,19 +32,19 @@ namespace KaleidoscopePlugins { Unicode::start (void) { switch (::HostOS.os ()) { case HostOS::LINUX: - Keyboard.press (Key_LCtrl.keyCode); - Keyboard.press (Key_LShift.keyCode); + Keyboard.press (Key_LeftControl.keyCode); + Keyboard.press (Key_LeftShift.keyCode); Keyboard.press (Key_U.keyCode); Keyboard.sendReport (); - Keyboard.release (Key_LCtrl.keyCode); - Keyboard.release (Key_LShift.keyCode); + Keyboard.release (Key_LeftControl.keyCode); + Keyboard.release (Key_LeftShift.keyCode); Keyboard.release (Key_U.keyCode); Keyboard.sendReport (); break; case HostOS::WINDOWS: - Keyboard.press (Key_RAlt.keyCode); + Keyboard.press (Key_RightAlt.keyCode); Keyboard.sendReport (); - Keyboard.release (Key_RAlt.keyCode); + Keyboard.release (Key_RightAlt.keyCode); Keyboard.sendReport (); Keyboard.press (Key_U.keyCode); Keyboard.sendReport (); @@ -52,7 +52,7 @@ namespace KaleidoscopePlugins { Keyboard.sendReport (); break; case HostOS::OSX: - Keyboard.press (Key_LAlt.keyCode); + Keyboard.press (Key_LeftAlt.keyCode); break; default: unicodeCustomStart (); @@ -67,7 +67,7 @@ namespace KaleidoscopePlugins { case HostOS::WINDOWS: break; case HostOS::OSX: - Keyboard.press (Key_LAlt.keyCode); + Keyboard.press (Key_LeftAlt.keyCode); break; default: unicodeCustomInput (); @@ -79,15 +79,15 @@ namespace KaleidoscopePlugins { Unicode::end (void) { switch (::HostOS.os ()) { case HostOS::LINUX: - Keyboard.press (Key_Space.keyCode); + Keyboard.press (Key_SpaceBar.keyCode); Keyboard.sendReport (); - Keyboard.release (Key_Space.keyCode); + Keyboard.release (Key_SpaceBar.keyCode); Keyboard.sendReport (); break; case HostOS::WINDOWS: break; case HostOS::OSX: - Keyboard.release (Key_LAlt.keyCode); + Keyboard.release (Key_LeftAlt.keyCode); Keyboard.sendReport (); break; default: