aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Vincent <jesse@keyboard.io>2017-06-07 15:21:20 -0700
committerJesse Vincent <jesse@keyboard.io>2017-06-07 15:21:20 -0700
commit9f75928b200f986bfc64b7a769e42af472098ea1 (patch)
tree6dd3528ec816d0f0720061af56979d046a0bb3bf
parente92cdf6b58b655eae2332c367a175797802e86a7 (diff)
downloadModel01-Firmware-9f75928b200f986bfc64b7a769e42af472098ea1.tar.gz
Model01-Firmware-9f75928b200f986bfc64b7a769e42af472098ea1.zip
"make astyle"
-rw-r--r--Model01-Firmware.ino86
1 files changed, 43 insertions, 43 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 4de228d..daaa0b1 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -76,58 +76,58 @@ ___ \
)
const Key keymaps[][ROWS][COLS] PROGMEM = {
- QWERTY,
- GENERIC_FN2,
- NUMPAD
+ QWERTY,
+ GENERIC_FN2,
+ NUMPAD
};
-static LEDSolidColor solidRed (160, 0, 0);
-static LEDSolidColor solidOrange (140, 70, 0);
-static LEDSolidColor solidYellow (130, 100, 0);
-static LEDSolidColor solidGreen (0, 160, 0);
-static LEDSolidColor solidBlue (0, 70, 130);
-static LEDSolidColor solidIndigo (0, 0, 170);
-static LEDSolidColor solidViolet (130, 0, 120);
+static LEDSolidColor solidRed(160, 0, 0);
+static LEDSolidColor solidOrange(140, 70, 0);
+static LEDSolidColor solidYellow(130, 100, 0);
+static LEDSolidColor solidGreen(0, 160, 0);
+static LEDSolidColor solidBlue(0, 70, 130);
+static LEDSolidColor solidIndigo(0, 0, 170);
+static LEDSolidColor solidViolet(130, 0, 120);
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)) {
- Serial.print("Keyboardio keyboard driver v0.00");
- return MACRO(I(25),
- D(LeftShift), T(M), U(LeftShift), T(O), T(D), T(E), T(L),
- T(Spacebar),
- W(100),
- T(0), T(1),
- END);
- } else if (macroIndex == MACRO_ANY && key_toggled_on(keyState)) {
- Keyboard.press(Key_A.keyCode + (uint8_t)(millis() % 36) );
- Keyboard.sendReport();
- }
- return MACRO_NONE;
+ if (macroIndex == TOGGLENUMLOCK && key_toggled_on(keyState)) {
+ return NumLock.toggle(Macros.row, Macros.col, NUMPAD_KEYMAP);
+ } else if (macroIndex == 1 && key_toggled_on(keyState)) {
+ Serial.print("Keyboardio keyboard driver v0.00");
+ return MACRO(I(25),
+ D(LeftShift), T(M), U(LeftShift), T(O), T(D), T(E), T(L),
+ T(Spacebar),
+ W(100),
+ T(0), T(1),
+ END);
+ } else if (macroIndex == MACRO_ANY && key_toggled_on(keyState)) {
+ Keyboard.press(Key_A.keyCode + (uint8_t)(millis() % 36));
+ Keyboard.sendReport();
+ }
+ return MACRO_NONE;
}
void setup() {
- Kaleidoscope.setup(KEYMAP_SIZE);
-
- Kaleidoscope.use(&TestMode,
- &LEDControl, &LEDOff,
- &solidRed, &solidOrange, &solidYellow, &solidGreen, &solidBlue, &solidIndigo, &solidViolet,
- &LEDBreatheEffect, &LEDRainbowEffect, &LEDRainbowWaveEffect, &LEDChaseEffect,
- &AlphaSquareEffect,
- &StalkerEffect,
- &NumLock,
-
- &Macros,
- &MouseKeys,
- NULL);
-
- AlphaSquare.color = { 255,0,0 };
- StalkerEffect.configure (STALKER (BlazingTrail, NULL));
- LEDOff.activate();
+ Kaleidoscope.setup(KEYMAP_SIZE);
+
+ Kaleidoscope.use(&TestMode,
+ &LEDControl, &LEDOff,
+ &solidRed, &solidOrange, &solidYellow, &solidGreen, &solidBlue, &solidIndigo, &solidViolet,
+ &LEDBreatheEffect, &LEDRainbowEffect, &LEDRainbowWaveEffect, &LEDChaseEffect,
+ &AlphaSquareEffect,
+ &StalkerEffect,
+ &NumLock,
+
+ &Macros,
+ &MouseKeys,
+ NULL);
+
+ AlphaSquare.color = { 255, 0, 0 };
+ StalkerEffect.configure(STALKER(BlazingTrail, NULL));
+ LEDOff.activate();
}
void loop() {
- Kaleidoscope.loop();
+ Kaleidoscope.loop();
}