aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Vincent <jesse@keyboard.io>2017-06-11 19:40:55 +0800
committerJesse Vincent <jesse@keyboard.io>2017-06-11 19:40:55 +0800
commit221101c6aa64281b999fc9ee900af5deae7c3be0 (patch)
treed7eca42afe2e20fad0b74a45aa4ecd102f13ffef
parentThat's a stacked keymap (diff)
downloadkeyboardio-model01-221101c6aa64281b999fc9ee900af5deae7c3be0.tar.gz
keyboardio-model01-221101c6aa64281b999fc9ee900af5deae7c3be0.tar.bz2
keyboardio-model01-221101c6aa64281b999fc9ee900af5deae7c3be0.zip
Macro.type needs PSTR() macros around strings.
Algernon talked me out of putting the newline in the macro
-rw-r--r--Model01-Firmware.ino7
1 files changed, 3 insertions, 4 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 967beea..ed99935 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -99,9 +99,8 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (macroIndex == TOGGLENUMLOCK && key_toggled_on(keyState)) {
return NumLock.toggle(Macros.row, Macros.col, NUMPAD_KEYMAP);
} else if (macroIndex == 1 && key_toggled_on(keyState)) {
- Macros.type("Keyboardio Model 01 - Kaleidoscope ");
- Macros.type(BUILD_INFORMATION);
- Macros.type("\n");
+ Macros.type(PSTR("Keyboardio Model 01 - Kaleidoscope "));
+ Macros.type(PSTR(BUILD_INFORMATION));
} else if (macroIndex == MACRO_ANY && key_toggled_on(keyState)) {
Keyboard.press(Key_A.keyCode + (uint8_t)(millis() % 36));
Keyboard.sendReport();
@@ -111,7 +110,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
void setup() {
Kaleidoscope.setup(KEYMAP_SIZE);
-
+ BootKeyboard.begin();
Kaleidoscope.use(&TestMode,
&LEDControl, &LEDOff,
&solidRed, &solidOrange, &solidYellow, &solidGreen, &solidBlue, &solidIndigo, &solidViolet,