astyle with current project style guidelines

pull/389/head
Jesse Vincent 8 years ago
parent e1fd94e4ff
commit 3865bd8793
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -44,13 +44,13 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
}; };
void setup () { void setup() {
Kaleidoscope.setup (KEYMAP_SIZE); Kaleidoscope.setup(KEYMAP_SIZE);
Kaleidoscope.use (&LEDControl, &LEDOff, &MiamiEffect, &JukeboxEffect, &JukeboxAlternateEffect, NULL); Kaleidoscope.use(&LEDControl, &LEDOff, &MiamiEffect, &JukeboxEffect, &JukeboxAlternateEffect, NULL);
MiamiEffect.activate (); MiamiEffect.activate();
} }
void loop () { void loop() {
Kaleidoscope.loop (); Kaleidoscope.loop();
} }

@ -21,21 +21,21 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
namespace LEDEffects { namespace LEDEffects {
TriColor::TriColor (cRGB baseColor, cRGB modColor, cRGB escColor) { TriColor::TriColor(cRGB baseColor, cRGB modColor, cRGB escColor) {
this->baseColor = baseColor; this->baseColor = baseColor;
this->modColor = modColor; this->modColor = modColor;
this->escColor = escColor; this->escColor = escColor;
} }
void void
TriColor::update (void) { TriColor::update(void) {
for (uint8_t r = 0; r < ROWS; r++) { for (uint8_t r = 0; r < ROWS; r++) {
for (uint8_t c = 0; c < COLS; c++) { for (uint8_t c = 0; c < COLS; c++) {
Key k = Layer.lookup (r, c); Key k = Layer.lookup(r, c);
// Special keys are always modColor // Special keys are always modColor
if (k.flags != 0) { if (k.flags != 0) {
LEDControl.led_set_crgb_at (r, c, modColor); LEDControl.led_set_crgb_at(r, c, modColor);
continue; continue;
} }
@ -55,7 +55,7 @@ TriColor::update (void) {
break; break;
} }
LEDControl.led_set_crgb_at (r, c, color); LEDControl.led_set_crgb_at(r, c, color);
} }
} }
} }

@ -25,10 +25,10 @@ namespace KaleidoscopePlugins {
namespace LEDEffects { namespace LEDEffects {
class TriColor : public LEDMode { class TriColor : public LEDMode {
public: public:
TriColor (cRGB baseColor, cRGB modColor, cRGB escColor); TriColor(cRGB baseColor, cRGB modColor, cRGB escColor);
TriColor (cRGB baseColor, cRGB modColor) : TriColor (baseColor, modColor, modColor) {}; TriColor(cRGB baseColor, cRGB modColor) : TriColor(baseColor, modColor, modColor) {};
virtual void update (void) final; virtual void update(void) final;
private: private:
cRGB baseColor; cRGB baseColor;

Loading…
Cancel
Save