From 18fe127ac2be3678bef18d2e2dc6580456fed2dc Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 3 Jun 2017 22:46:56 -0700 Subject: [PATCH] astyle with current project style guidelines --- src/Kaleidoscope-Numlock.cpp | 68 ++++++++++++++++++------------------ src/Kaleidoscope-Numlock.h | 10 +++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Kaleidoscope-Numlock.cpp b/src/Kaleidoscope-Numlock.cpp index fc4e8393..15fe07a8 100644 --- a/src/Kaleidoscope-Numlock.cpp +++ b/src/Kaleidoscope-Numlock.cpp @@ -10,59 +10,59 @@ byte NumLock_::row = 255, NumLock_::col = 255; cRGB numpad_color; -NumLock_::NumLock_ (void) { +NumLock_::NumLock_(void) { } void -NumLock_::begin (void) { - us = LEDControl.mode_add (this); - numpad_color.r=255; +NumLock_::begin(void) { + us = LEDControl.mode_add(this); + numpad_color.r=255; } void -NumLock_::init (void) { - if (!isActive) { - LEDControl.next_mode(); - } +NumLock_::init(void) { + if (!isActive) { + LEDControl.next_mode(); + } } void -NumLock_::update (void) { - for (uint8_t r = 0; r < ROWS; r++) { - for (uint8_t c = 0; c < COLS; c++) { - Key k = Layer.lookup (r, c); +NumLock_::update(void) { + for (uint8_t r = 0; r < ROWS; r++) { + for (uint8_t c = 0; c < COLS; c++) { + Key k = Layer.lookup(r, c); - if (k.raw < Key_KeypadNumLock.raw || k.raw > Key_KeypadDot.raw) - continue; + if (k.raw < Key_KeypadNumLock.raw || k.raw > Key_KeypadDot.raw) + continue; - LEDControl.led_set_crgb_at(r, c, numpad_color); - } + LEDControl.led_set_crgb_at(r, c, numpad_color); } + } - if (row > ROWS || col > COLS) - return; + if (row > ROWS || col > COLS) + return; - cRGB color = breath_compute(); - LEDControl.led_set_crgb_at (row, col, color); + cRGB color = breath_compute(); + LEDControl.led_set_crgb_at(row, col, color); } const macro_t * -NumLock_::toggle (byte row_, byte col_, uint8_t numPadLayer) { - row = row_; - col = col_; +NumLock_::toggle(byte row_, byte col_, uint8_t numPadLayer) { + row = row_; + col = col_; - if (Layer.isOn (numPadLayer)) { - isActive = false; - LEDControl.set_mode (previousLEDMode); - Layer.off (numPadLayer); - } else { - isActive = true; - previousLEDMode = LEDControl.get_mode (); - LEDControl.set_mode (us); - Layer.on (numPadLayer); - } + if (Layer.isOn(numPadLayer)) { + isActive = false; + LEDControl.set_mode(previousLEDMode); + Layer.off(numPadLayer); + } else { + isActive = true; + previousLEDMode = LEDControl.get_mode(); + LEDControl.set_mode(us); + Layer.on(numPadLayer); + } - return MACRO(T(KeypadNumLock), END); + return MACRO(T(KeypadNumLock), END); } NumLock_ NumLock; diff --git a/src/Kaleidoscope-Numlock.h b/src/Kaleidoscope-Numlock.h index b118f411..3dc27052 100644 --- a/src/Kaleidoscope-Numlock.h +++ b/src/Kaleidoscope-Numlock.h @@ -9,14 +9,14 @@ class NumLock_ : public LEDMode { public: - NumLock_ (void); + NumLock_(void); - virtual void begin (void) final; + virtual void begin(void) final; - virtual void update (void) final; - virtual void init (void) final; + virtual void update(void) final; + virtual void init(void) final; - static const macro_t *toggle (byte row, byte col, uint8_t numPadLayer); + static const macro_t *toggle(byte row, byte col, uint8_t numPadLayer); private: static uint8_t previousLEDMode;