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

Update the versioning macro to hopefully pull verison info in from the build system

Browse Source
This commit is contained in:
Jesse Vincent 2017-06-09 18:08:34 -07:00
parent 9f987624d5
commit d04098d212
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Model01-Firmware.ino
View File

@ -4,6 +4,11 @@
#define DEBUG_SERIAL false #define DEBUG_SERIAL false
#ifndef BUILD_INFORMATION
#define BUILD_INFORMATION "locally built"
#endif
#include "Kaleidoscope-MouseKeys.h" #include "Kaleidoscope-MouseKeys.h"
#include "Kaleidoscope-Macros.h" #include "Kaleidoscope-Macros.h"
#include "Kaleidoscope-LEDControl.h" #include "Kaleidoscope-LEDControl.h"
@ -19,7 +24,8 @@
#include "Kaleidoscope-LED-AlphaSquare.h" #include "Kaleidoscope-LED-AlphaSquare.h"
#include "Kaleidoscope-Model01-TestMode.h" #include "Kaleidoscope-Model01-TestMode.h"
#define MACRO_VERSION_INFO 1
#define Macro_VersionInfo M(MACRO_VERSION_INFO)
#define MACRO_ANY 2 #define MACRO_ANY 2
#define Macro_Any M(MACRO_ANY) #define Macro_Any M(MACRO_ANY)
#define NUMPAD_KEYMAP 2 #define NUMPAD_KEYMAP 2
@ -43,7 +49,7 @@ ___ \
#define NUMPAD KEYMAP_STACKED (\ #define NUMPAD KEYMAP_STACKED (\
___, ___, ___, ___, ___, ___, ___, \ ___, ___, ___, ___, ___, ___, Macro_VersionInfo, \
___, ___, ___, ___, ___, ___, ___, \ ___, ___, ___, ___, ___, ___, ___, \
___, ___, ___, ___, ___, ___, \ ___, ___, ___, ___, ___, ___, \
___, ___, ___, ___, ___, ___, ___, \ ___, ___, ___, ___, ___, ___, ___, \
@ -93,13 +99,9 @@ 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)) {
Serial.print("Keyboardio keyboard driver v0.00"); Macros.type("Keyboardio Model 01 - Kaleidoscope ");
return MACRO(I(25), Macros.type(BUILD_INFORMATION);
D(LeftShift), T(M), U(LeftShift), T(O), T(D), T(E), T(L), Macros.type("\n");
T(Spacebar),
W(100),
T(0), T(1),
END);
} 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();