From 5199c41cfd20d1f986fa1ebba3adf824991323ae Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Fri, 8 Apr 2022 12:09:58 +0200 Subject: Fix build with AVR 1.85 and keyboardio a916561. And arduino-mk=1.5.2-2.1, gcc-avr=1:5.4.0+Atmel3.6.2-3, avr-libc=1:2.0.0+Atmel3.6.2-3. --- src/Macros.cpp | 12 +++++------- src/Macros.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Macros.cpp b/src/Macros.cpp index e1c567a..529bfca 100644 --- a/src/Macros.cpp +++ b/src/Macros.cpp @@ -30,18 +30,16 @@ * https://github.com/keyboardio/Kaleidoscope/issues/647 */ #define TopRow(k1, k2) \ - if (keyToggledOn(keyState)) { \ - if (Kaleidoscope.hid().keyboard().isModifierKeyActive(Key_LeftControl) || \ - OneShot.isModifierActive(Key_LeftControl) || \ - Kaleidoscope.hid().keyboard().isModifierKeyActive(Key_RightAlt) || \ - OneShot.isModifierActive(Key_RightAlt)) \ + if (keyToggledOn(event.state)) { \ + if (Kaleidoscope.hid().keyboard().wasModifierKeyActive(Key_LeftControl) || \ + Kaleidoscope.hid().keyboard().wasModifierKeyActive(Key_RightAlt)) \ return MACRO(Dr(k2)); \ else \ return MACRO(Dr(k1)); \ }; -const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { - switch (macroIndex) { +const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) { + switch (macro_id) { case AT: TopRow(LSHIFT(Key_2), Key_2); case STAR: TopRow(LSHIFT(Key_8), Key_3); case DOLLAR: TopRow(LSHIFT(Key_4), Key_4); diff --git a/src/Macros.h b/src/Macros.h index 829308c..5e4395c 100644 --- a/src/Macros.h +++ b/src/Macros.h @@ -34,4 +34,4 @@ enum { , RIGHT_BRACKET }; -extern const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState); +extern const macro_t *macroAction(uint8_t macro_id, KeyEvent &event); -- cgit v1.2.3