diff options
| author | Brian Cully <bjc@kublai.com> | 2018-11-02 18:41:53 -0400 |
|---|---|---|
| committer | Brian Cully <bjc@kublai.com> | 2018-11-02 18:41:53 -0400 |
| commit | b2cac8d80e8bf69878cb0d4e66fd5ba3d6e600d7 (patch) | |
| tree | a43cb15c2f34dfa83e39b9532d6b55bbeb5e8b51 | |
| parent | ecc4357332b738bb2d431a9d33f4c8ac487c35d7 (diff) | |
| parent | ab471273bc69c5243032d6e39451b2424ff57d1e (diff) | |
| download | Model01-Firmware-b2cac8d80e8bf69878cb0d4e66fd5ba3d6e600d7.tar.gz Model01-Firmware-b2cac8d80e8bf69878cb0d4e66fd5ba3d6e600d7.zip | |
Merge remote-tracking branch 'keyboardio/master'
| -rw-r--r-- | Model01-Firmware.ino | 8 | ||||
| -rw-r--r-- | src/Model01-Firmware.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino index cee8db3..24308f7 100644 --- a/Model01-Firmware.ino +++ b/Model01-Firmware.ino @@ -13,6 +13,7 @@ #include <Kaleidoscope-MagicCombo.h> #include <Kaleidoscope-USB-Quirks.h> #include <Kaleidoscope-EEPROM-Settings.h> +#include <Kaleidoscope-EEPROM-Keymap.h> #include <Kaleidoscope-HostOS.h> #include <Kaleidoscope-Syster.h> #include <Kaleidoscope-Unicode.h> @@ -149,11 +150,14 @@ static void versionInfoMacro(uint8_t keyState) { static void anyKeyMacro(uint8_t keyState) { static Key lastKey; - if (keyToggledOn(keyState)) + bool toggledOn = false; + if (keyToggledOn(keyState)) { lastKey.keyCode = Key_A.keyCode + (uint8_t)(millis() % 36); + toggledOn = true; + } if (keyIsPressed(keyState)) - kaleidoscope::hid::pressKey(lastKey); + kaleidoscope::hid::pressKey(lastKey, toggledOn); } const macro_t *emoteMacro(uint8_t macroIndex, uint8_t keyState) { diff --git a/src/Model01-Firmware.h b/src/Model01-Firmware.h index e69de29..8a4dc34 100644 --- a/src/Model01-Firmware.h +++ b/src/Model01-Firmware.h @@ -0,0 +1,2 @@ +// Lets make cpplint happy! +#pragma once |