aboutsummaryrefslogtreecommitdiff
path: root/combos.h
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2019-02-15 14:59:32 +0000
committerdakkar <dakkar@thenautilus.net>2019-02-15 14:59:32 +0000
commit3cc3c8831326cc50619d6f4e99de11c54b7376c9 (patch)
treeb02b51827c50a388b8abebb9d076774ee9da8ac2 /combos.h
parentsome cleanup (diff)
downloadkeyboardio-model01-3cc3c8831326cc50619d6f4e99de11c54b7376c9.tar.gz
keyboardio-model01-3cc3c8831326cc50619d6f4e99de11c54b7376c9.tar.bz2
keyboardio-model01-3cc3c8831326cc50619d6f4e99de11c54b7376c9.zip
start of the "color picker" toy
Diffstat (limited to 'combos.h')
-rw-r--r--combos.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/combos.h b/combos.h
index 38d455c..242e274 100644
--- a/combos.h
+++ b/combos.h
@@ -3,18 +3,31 @@
#include "kaleidoscope/plugin/MagicCombo.h"
#include "kaleidoscope/plugin/USB-Quirks.h"
+#include "color-picker.h"
enum {
// Toggle between Boot (6-key rollover; for BIOSes and early boot) and NKRO
// mode.
- COMBO_TOGGLE_NKRO_MODE
+ COMBO_TOGGLE_NKRO_MODE,
+ COMBO_TOGGLE_COLOR_PICKER
};
static void toggleKeyboardProtocol(uint8_t combo_index) {
USBQuirks.toggleKeyboardProtocol();
}
-USE_MAGIC_COMBOS({.action = toggleKeyboardProtocol,
+static void toggleColorPicker(uint8_t combo_index) {
+ theColorPicker.toggle();
+}
+
+USE_MAGIC_COMBOS(
+ {
+ .action = toggleKeyboardProtocol,
// Left Fn + Esc + Shift
.keys = { R3C6, R2C6, R3C7 }
+ },
+ {
+ .action = toggleColorPicker,
+ // Left Fn + Right Fn
+ .keys = { R3C6, R3C9 }
});