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

Refactor macro code to remove hand-coded numbers and make code a bit more readable

Browse Source
This commit is contained in:
Jesse Vincent 2017-10-02 19:34:57 -07:00
parent 2f0beee0db
commit ac0a2c5ab8
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Model01-Firmware.ino
View File

@ -23,8 +23,11 @@
#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_ANY 2 enum { MACRO_VERSION_INFO,
MACRO_ANY
};
#define NUMPAD_KEYMAP_ID 2 #define NUMPAD_KEYMAP_ID 2
@ -93,13 +96,16 @@ static kaleidoscope::LEDSolidColor solidBlue(0, 70, 130);
static kaleidoscope::LEDSolidColor solidIndigo(0, 0, 170); static kaleidoscope::LEDSolidColor solidIndigo(0, 0, 170);
static kaleidoscope::LEDSolidColor solidViolet(130, 0, 120); static kaleidoscope::LEDSolidColor solidViolet(130, 0, 120);
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (macroIndex == MACRO_VERSION_INFO) { static void versionInfoMacro(uint8_t keyState) {
if (keyToggledOn(keyState)) { if (keyToggledOn(keyState)) {
Macros.type(PSTR("Keyboardio Model 01 - Kaleidoscope ")); Macros.type(PSTR("Keyboardio Model 01 - Kaleidoscope "));
Macros.type(PSTR(BUILD_INFORMATION)); Macros.type(PSTR(BUILD_INFORMATION));
} }
} else if (macroIndex == MACRO_ANY) {
}
static void anyKeyMacro(uint8_t keyState) {
static Key lastKey; static Key lastKey;
if (keyToggledOn(keyState)) if (keyToggledOn(keyState))
lastKey.keyCode = Key_A.keyCode + (uint8_t)(millis() % 36); lastKey.keyCode = Key_A.keyCode + (uint8_t)(millis() % 36);
@ -107,6 +113,18 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (keyIsPressed(keyState)) if (keyIsPressed(keyState))
kaleidoscope::hid::pressKey(lastKey); kaleidoscope::hid::pressKey(lastKey);
} }
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
switch (macroIndex) {
case MACRO_VERSION_INFO:
versionInfoMacro(keyState);
break;
case MACRO_ANY:
anyKeyMacro(keyState);
break;
}
return MACRO_NONE; return MACRO_NONE;
} }