1
0

"make astyle"

This commit is contained in:
Jesse Vincent 2017-06-07 15:21:20 -07:00
parent e92cdf6b58
commit 9f75928b20
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

View File

@ -81,17 +81,17 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
NUMPAD NUMPAD
}; };
static LEDSolidColor solidRed (160, 0, 0); static LEDSolidColor solidRed(160, 0, 0);
static LEDSolidColor solidOrange (140, 70, 0); static LEDSolidColor solidOrange(140, 70, 0);
static LEDSolidColor solidYellow (130, 100, 0); static LEDSolidColor solidYellow(130, 100, 0);
static LEDSolidColor solidGreen (0, 160, 0); static LEDSolidColor solidGreen(0, 160, 0);
static LEDSolidColor solidBlue (0, 70, 130); static LEDSolidColor solidBlue(0, 70, 130);
static LEDSolidColor solidIndigo (0, 0, 170); static LEDSolidColor solidIndigo(0, 0, 170);
static LEDSolidColor solidViolet (130, 0, 120); static LEDSolidColor solidViolet(130, 0, 120);
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { 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"); Serial.print("Keyboardio keyboard driver v0.00");
return MACRO(I(25), return MACRO(I(25),
@ -101,7 +101,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
T(0), T(1), T(0), T(1),
END); 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();
} }
return MACRO_NONE; return MACRO_NONE;
@ -122,8 +122,8 @@ void setup() {
&MouseKeys, &MouseKeys,
NULL); NULL);
AlphaSquare.color = { 255,0,0 }; AlphaSquare.color = { 255, 0, 0 };
StalkerEffect.configure (STALKER (BlazingTrail, NULL)); StalkerEffect.configure(STALKER(BlazingTrail, NULL));
LEDOff.activate(); LEDOff.activate();
} }