wxcafe/Model01-Firmware
1
0
Fork 0
Code Releases Activity

Macro.type needs PSTR() macros around strings.

Browse Source 
Algernon talked me out of putting the newline in the macro
This commit is contained in:
Jesse Vincent 2017-06-11 19:40:55 +08:00
parent 8cf3f68cf4
commit 221101c6aa
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Model01-Firmware.ino
View File

@ -99,9 +99,8 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (macroIndex == TOGGLENUMLOCK && key_toggled_on(keyState)) { if (macroIndex == TOGGLENUMLOCK && key_toggled_on(keyState)) {
return NumLock.toggle(Macros.row, Macros.col, NUMPAD_KEYMAP); return NumLock.toggle(Macros.row, Macros.col, NUMPAD_KEYMAP);
} else if (macroIndex == 1 && key_toggled_on(keyState)) { } else if (macroIndex == 1 && key_toggled_on(keyState)) {
Macros.type("Keyboardio Model 01 - Kaleidoscope "); Macros.type(PSTR("Keyboardio Model 01 - Kaleidoscope "));
Macros.type(BUILD_INFORMATION); Macros.type(PSTR(BUILD_INFORMATION));
Macros.type("\n");
} else if (macroIndex == MACRO_ANY && key_toggled_on(keyState)) { } else if (macroIndex == MACRO_ANY && key_toggled_on(keyState)) {
Keyboard.press(Key_A.keyCode + (uint8_t)(millis() % 36)); Keyboard.press(Key_A.keyCode + (uint8_t)(millis() % 36));
Keyboard.sendReport(); Keyboard.sendReport();
@ -111,7 +110,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
void setup() { void setup() {
Kaleidoscope.setup(KEYMAP_SIZE); Kaleidoscope.setup(KEYMAP_SIZE);
BootKeyboard.begin();
Kaleidoscope.use(&TestMode, Kaleidoscope.use(&TestMode,
&LEDControl, &LEDOff, &LEDControl, &LEDOff,
&solidRed, &solidOrange, &solidYellow, &solidGreen, &solidBlue, &solidIndigo, &solidViolet, &solidRed, &solidOrange, &solidYellow, &solidGreen, &solidBlue, &solidIndigo, &solidViolet,