aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Macros.cpp9
-rw-r--r--src/MagicCombo.cpp2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Macros.cpp b/src/Macros.cpp
index 27b6b21..e1c567a 100644
--- a/src/Macros.cpp
+++ b/src/Macros.cpp
@@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
**********************************************************************/
+#include <Kaleidoscope.h>
#include <Kaleidoscope-OneShot.h>
#include "Macros.h"
@@ -30,10 +31,10 @@
*/
#define TopRow(k1, k2) \
if (keyToggledOn(keyState)) { \
- if (kaleidoscope::Runtime.hid().keyboard().isModifierKeyActive(Key_LeftControl) || \
- ::OneShot.isModifierActive(Key_LeftControl) || \
- kaleidoscope::Runtime.hid().keyboard().isModifierKeyActive(Key_RightAlt) || \
- ::OneShot.isModifierActive(Key_RightAlt)) \
+ if (Kaleidoscope.hid().keyboard().isModifierKeyActive(Key_LeftControl) || \
+ OneShot.isModifierActive(Key_LeftControl) || \
+ Kaleidoscope.hid().keyboard().isModifierKeyActive(Key_RightAlt) || \
+ OneShot.isModifierActive(Key_RightAlt)) \
return MACRO(Dr(k2)); \
else \
return MACRO(Dr(k1)); \
diff --git a/src/MagicCombo.cpp b/src/MagicCombo.cpp
index a67566e..f24e221 100644
--- a/src/MagicCombo.cpp
+++ b/src/MagicCombo.cpp
@@ -21,5 +21,5 @@
#include "MagicCombo.h"
void comboMiddleClick(uint8_t combo_index) {
- ::Macros.play(MACRO(T(mouseBtnM)));
+ Macros.play(MACRO(T(mouseBtnM)));
}