Go back to Qukeys.

SpaceCadet, while it fixes the rollover issue, gets in the way of
chording and combinations of holds and taps on modifiers (e.g.,
holding left control while tapping right control), so go back to
Qukeys and hope the rollover stuff can be fixed.

1 files changed, 30 insertions, 19 deletions

diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index fb9239d..6297b31 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -11,6 +11,7 @@
 #include <Kaleidoscope-Model01-TestMode.h>
 #include <Kaleidoscope-HostPowerManagement.h>
 #include <Kaleidoscope-MagicCombo.h>
+#include <Kaleidoscope-Qukeys.h>
 #include <Kaleidoscope-USB-Quirks.h>
 #include <Kaleidoscope-EEPROM-Settings.h>
 #include <Kaleidoscope-EEPROM-Keymap.h>
@@ -74,16 +75,16 @@ KEYMAPS(
    Key_Backtick,    Key_Quote,     Key_Comma,   Key_Period, Key_P, Key_Y, Key_Tab,
    Key_PageUp,      Key_A,         Key_O,       Key_E,      Key_U, Key_I,
    Key_PageDown,    Key_Semicolon, Key_Q,       Key_J,      Key_K, Key_X, Key_LeftGui,
-   //Key_LeftBracket, Key_Backspace, LSHIFT(Key_LeftBracket), LSHIFT(Key_9),
-   Key_LeftControl, Key_Backspace, Key_LeftAlt, Key_LeftShift,
+   Key_LeftBracket, Key_Backspace, LSHIFT(Key_LeftBracket), LSHIFT(Key_9),
+   //Key_LeftControl, Key_Backspace, Key_LeftAlt, Key_LeftShift,
    ShiftToLayer(FUNCTION),
 
    LockLayer(EMOTES), Key_6, Key_7, Key_8, Key_9, Key_0, LockLayer(NUMPAD),
    Key_Enter,         Key_F, Key_G, Key_C, Key_R, Key_L, Key_Slash,
                       Key_D, Key_H, Key_T, Key_N, Key_S, Key_Minus,
    SYSTER,            Key_B, Key_M, Key_W, Key_V, Key_Z, Key_Equals,
-   //LSHIFT(Key_0), LSHIFT(Key_RightBracket), Key_Spacebar, Key_RightBracket,
-   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
+   LSHIFT(Key_0), LSHIFT(Key_RightBracket), Key_Spacebar, Key_RightBracket,
+   //Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    ShiftToLayer(FUNCTION)),
 
   [FUNCTION] = KEYMAP_STACKED
@@ -246,10 +247,9 @@ static void toggleKeyboardProtocol(uint8_t combo_index) {
 /** Magic combo list, a list of key combo and action pairs the firmware should
  * recognise.
  */
-USE_MAGIC_COMBOS({.action = toggleKeyboardProtocol,
-                  // Left Fn + Esc + Shift
-                  .keys = { R3C6, R2C6, R3C7 }
-                 });
+USE_MAGIC_COMBOS([COMBO_TOGGLE_NKRO_MODE] = {.action = toggleKeyboardProtocol,
+                                             // Left Fn + Esc + Shift
+                                             .keys = { R3C6, R2C6, R3C7 }});
 
 static LayerHighlighter emoteHighlighter(EMOTES);
 
@@ -259,7 +259,8 @@ static LayerHighlighter emoteHighlighter(EMOTES);
 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings,
                           HostOS,
                           Unicode,
-                          SpaceCadet,
+                          Qukeys,
+                          //SpaceCadet,
                           //MacrosOnTheFly,
                           Syster,
                           // LEDControl provides support for other LED
@@ -316,16 +317,26 @@ void setup() {
   emoteHighlighter.color = CRGB(255, 255, 0);
   LEDBreatheEffect.hue = 212;
 
-  static kaleidoscope::plugin::SpaceCadet::KeyBinding spaceCadetMap[] = {
-    {Key_LeftControl,  Key_LeftBracket,       250},
-    {Key_RightControl, Key_RightBracket,      250},
-    {Key_LeftAlt,      Key_LeftCurlyBracket,  250},
-    {Key_RightAlt,     Key_RightCurlyBracket, 250},
-    {Key_LeftShift,    Key_LeftParen,         250},
-    {Key_RightShift,   Key_RightParen,        250},
-    SPACECADET_MAP_END
-  };
-  SpaceCadet.map = spaceCadetMap;
+  QUKEYS(kaleidoscope::plugin::Qukey(0, 3, 7, Key_LeftShift),
+         kaleidoscope::plugin::Qukey(0, 3, 8, Key_RightShift),
+         kaleidoscope::plugin::Qukey(0, 0, 7, Key_LeftControl),
+         kaleidoscope::plugin::Qukey(0, 0, 8, Key_RightControl),
+         kaleidoscope::plugin::Qukey(0, 2, 7, Key_LeftAlt),
+         kaleidoscope::plugin::Qukey(0, 2, 8, Key_RightAlt),
+         kaleidoscope::plugin::Qukey(0, 2, 9, Key_RightGui));
+  Qukeys.setTimeout(200);
+  Qukeys.setReleaseDelay(20);
+
+  // static kaleidoscope::plugin::SpaceCadet::KeyBinding spaceCadetMap[] = {
+  //   {Key_LeftControl,  Key_LeftBracket,       250},
+  //   {Key_RightControl, Key_RightBracket,      250},
+  //   {Key_LeftAlt,      Key_LeftCurlyBracket,  250},
+  //   {Key_RightAlt,     Key_RightCurlyBracket, 250},
+  //   {Key_LeftShift,    Key_LeftParen,         250},
+  //   {Key_RightShift,   Key_RightParen,        250},
+  //   SPACECADET_MAP_END
+  // };
+  // SpaceCadet.map = spaceCadetMap;
 
   // Turn off LEDs when keyboard is idle for 300 seconds.
   IdleLEDs.idle_time_limit = 300;