From 380a2e8a28944810196ffb9059294dde93c61835 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Fri, 24 Aug 2018 00:24:59 -0700 Subject: [PATCH] rename some variables to make them clearer Signed-off-by: Jesse Vincent --- src/Kaleidoscope-NumPad.cpp | 11 +++++------ src/Kaleidoscope-NumPad.h | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Kaleidoscope-NumPad.cpp b/src/Kaleidoscope-NumPad.cpp index 2755efc8..16e480e9 100644 --- a/src/Kaleidoscope-NumPad.cpp +++ b/src/Kaleidoscope-NumPad.cpp @@ -19,7 +19,7 @@ #include "Kaleidoscope.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; bool NumPad_::cleanupDone = true; bool NumPad_::originalNumLockState = false; @@ -70,8 +70,8 @@ kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() { Key layer_key = Layer.getKey(numPadLayer, r, c); if (k == LockLayer(numPadLayer)) { - row = r; - col = c; + numpad_lock_key_row = r; + numpad_lock_key_col = c; } 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; - cRGB lock_color = breath_compute(lock_hue); - LEDControl.setCrgbAt(row, col, lock_color); + LEDControl.setCrgbAt(numpad_lock_key_row, numpad_lock_key_col, lock_color); return kaleidoscope::EventHandlerResult::OK; } diff --git a/src/Kaleidoscope-NumPad.h b/src/Kaleidoscope-NumPad.h index 2487b64a..843a14da 100644 --- a/src/Kaleidoscope-NumPad.h +++ b/src/Kaleidoscope-NumPad.h @@ -32,7 +32,8 @@ class NumPad_ : public kaleidoscope::Plugin { kaleidoscope::EventHandlerResult afterEachCycle(); private: - static byte row, col; + static uint8_t numpad_lock_key_row; + static uint8_t numpad_lock_key_col; static bool cleanupDone; static bool originalNumLockState; };