aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Macros.cpp4
-rw-r--r--src/TapDance.cpp2
-rw-r--r--src/TapDance.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Macros.cpp b/src/Macros.cpp
index c8013cc..27b6b21 100644
--- a/src/Macros.cpp
+++ b/src/Macros.cpp
@@ -30,9 +30,9 @@
*/
#define TopRow(k1, k2) \
if (keyToggledOn(keyState)) { \
- if (kaleidoscope::hid::isModifierKeyActive(Key_LeftControl) || \
+ if (kaleidoscope::Runtime.hid().keyboard().isModifierKeyActive(Key_LeftControl) || \
::OneShot.isModifierActive(Key_LeftControl) || \
- kaleidoscope::hid::isModifierKeyActive(Key_RightAlt) || \
+ kaleidoscope::Runtime.hid().keyboard().isModifierKeyActive(Key_RightAlt) || \
::OneShot.isModifierActive(Key_RightAlt)) \
return MACRO(Dr(k2)); \
else \
diff --git a/src/TapDance.cpp b/src/TapDance.cpp
index e5f870d..7af5393 100644
--- a/src/TapDance.cpp
+++ b/src/TapDance.cpp
@@ -20,7 +20,7 @@
#include "TapDance.h"
bool cancelOneShot = false;
-void tapDanceAction(uint8_t tapDanceIndex, byte row, byte col, uint8_t tapCount,
+void tapDanceAction(uint8_t tapDanceIndex, KeyAddr keyAddr, uint8_t tapCount,
kaleidoscope::plugin::TapDance::ActionType tapDanceAction) {
/* Cancel any pending on-shot effects when a tap-dance key is released */
if (tapDanceAction == kaleidoscope::plugin::TapDance::Release)
diff --git a/src/TapDance.h b/src/TapDance.h
index ff90f5e..7129259 100644
--- a/src/TapDance.h
+++ b/src/TapDance.h
@@ -27,5 +27,5 @@ enum {
};
extern bool cancelOneShot;
-extern void tapDanceAction(uint8_t tapDanceIndex, byte row, byte col, uint8_t tapCount,
+extern void tapDanceAction(uint8_t tapDanceIndex, KeyAddr keyAddr, uint8_t tapCount,
kaleidoscope::plugin::TapDance::ActionType tapDanceAction);