rename some variables to make them clearer

Signed-off-by: Jesse Vincent <jesse@keyboard.io>
pull/365/head
Jesse Vincent 6 years ago
parent f9e1578614
commit 380a2e8a28

@ -19,7 +19,7 @@
#include "Kaleidoscope.h" #include "Kaleidoscope.h"
#include "layers.h" #include "layers.h"
byte NumPad_::row = 255, NumPad_::col = 255; byte NumPad_::numpad_lock_key_row = 255, NumPad_::numpad_lock_key_col = 255;
uint8_t NumPad_::numPadLayer; uint8_t NumPad_::numPadLayer;
bool NumPad_::cleanupDone = true; bool NumPad_::cleanupDone = true;
bool NumPad_::originalNumLockState = false; bool NumPad_::originalNumLockState = false;
@ -70,8 +70,8 @@ kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() {
Key layer_key = Layer.getKey(numPadLayer, r, c); Key layer_key = Layer.getKey(numPadLayer, r, c);
if (k == LockLayer(numPadLayer)) { if (k == LockLayer(numPadLayer)) {
row = r; numpad_lock_key_row = r;
col = c; numpad_lock_key_col = c;
} }
if ((k != layer_key) || (k == Key_NoKey) || (k.flags != KEY_FLAGS)) { if ((k != layer_key) || (k == Key_NoKey) || (k.flags != KEY_FLAGS)) {
@ -82,11 +82,10 @@ kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() {
} }
} }
if (row > ROWS || col > COLS) if ((numpad_lock_key_row > ROWS) || (numpad_lock_key_col > COLS)) {
return kaleidoscope::EventHandlerResult::OK; return kaleidoscope::EventHandlerResult::OK;
cRGB lock_color = breath_compute(lock_hue); LEDControl.setCrgbAt(numpad_lock_key_row, numpad_lock_key_col, lock_color);
LEDControl.setCrgbAt(row, col, lock_color);
return kaleidoscope::EventHandlerResult::OK; return kaleidoscope::EventHandlerResult::OK;
} }

@ -32,7 +32,8 @@ class NumPad_ : public kaleidoscope::Plugin {
kaleidoscope::EventHandlerResult afterEachCycle(); kaleidoscope::EventHandlerResult afterEachCycle();
private: private:
static byte row, col; static uint8_t numpad_lock_key_row;
static uint8_t numpad_lock_key_col;
static bool cleanupDone; static bool cleanupDone;
static bool originalNumLockState; static bool originalNumLockState;
}; };

Loading…
Cancel
Save