Merge pull request #141 from cdisselkoen/update-for-new-Macros-API

Update for changes to Kaleidoscope-Macros no longer requiring END

examples/AppSwitcher/Macros.cpp

@@ -35,16 +35,16 @@ const macro_t *macroAppSwitch(uint8_t keyState) {
 
   // Key was just pressed, or is being held
   if (keyIsPressed(keyState)) {
-    return MACRO(Dr(mod), D(Tab), END);
+    return MACRO(Dr(mod), D(Tab));
   }
   // Key was just released
   if (keyToggledOff(keyState)) {
-    return MACRO(U(Tab), Dr(mod), END);
+    return MACRO(U(Tab), Dr(mod));
   }
   // Key is not pressed, and was not just released.
   // if appSwitchActive is true, we continue holding Alt.
   if (appSwitchActive) {
-    return MACRO(Dr(mod), END);
+    return MACRO(Dr(mod));
   }
   // otherwise we do nothing
   return MACRO_NONE;

examples/Kaleidoscope/Kaleidoscope.ino

@@ -84,8 +84,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
                  D(LeftShift), T(M), U(LeftShift), T(O), T(D), T(E), T(L),
                  T(Spacebar),
                  W(100),
-                 T(0), T(1),
+                 T(0), T(1));
-                 END);
   }
   return MACRO_NONE;
 }