aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Vincent <jesse@keyboard.io>2017-02-19 18:28:17 -0800
committerJesse Vincent <jesse@keyboard.io>2017-02-19 18:28:17 -0800
commit52e7bd7b10aa48d430c1879b19497d239c54153c (patch)
tree52cb4b71b35a7b92be7ff311e7b0ca264b9aae10
parentSlgihtly clean up the macro index code (diff)
downloadkeyboardio-model01-52e7bd7b10aa48d430c1879b19497d239c54153c.tar.gz
keyboardio-model01-52e7bd7b10aa48d430c1879b19497d239c54153c.tar.bz2
keyboardio-model01-52e7bd7b10aa48d430c1879b19497d239c54153c.zip
Initial implementation of 'Any' key
-rw-r--r--Model01-Firmware.ino7
1 files changed, 6 insertions, 1 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 8a40aae..e2f3aab 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -20,6 +20,8 @@
uint8_t primary_keymap = 0;
uint8_t temporary_keymap = 0;
+#define MACRO_ANY 2
+#define Key_Any M(MACRO_ANY)
#define NUMPAD_KEYMAP 2
#define COLEMAK KEYMAP ( \
@@ -77,7 +79,7 @@ uint8_t temporary_keymap = 0;
)
#define QWERTY KEYMAP ( \
- ___, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, ___, Key_6, Key_7, Key_8, Key_9, Key_0, Key_ToggleNumlock, \
+ ___, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, Key_Any, Key_6, Key_7, Key_8, Key_9, Key_0, Key_ToggleNumlock, \
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals, \
Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote, \
Key_PageDn, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, ___, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus, \
@@ -121,6 +123,9 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
W(100),
T(0), T(1),
END);
+ } else if (macroIndex == MACRO_ANY && key_toggled_on(keyState)) {
+ Keyboard.press(Key_A.keyCode + (uint8_t)(millis() % 36) );
+ Keyboard.sendReport();
}
return MACRO_NONE;
}