From 4e28c82534955f663409fc19677c85ca524224b6 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Fri, 6 Mar 2020 01:18:28 +0100 Subject: Replace deprecated interfaces. --- src/Macros.cpp | 4 ++-- src/TapDance.cpp | 2 +- src/TapDance.h | 2 +- 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); -- cgit v1.2.3