Extract a couple methods and rename a variable

Signed-off-by: Jesse Vincent <jesse@keyboard.io>

src/Kaleidoscope-NumPad.cpp

@@ -36,32 +36,30 @@ static bool getNumlockState() {
 }
 
 static void syncNumlock(bool state) {
-  bool numState = getNumlockState();
+  bool numLockLEDState = getNumlockState();
-  if (numState != state) {
+  if (numLockLEDState != state) {
     kaleidoscope::hid::pressKey(Key_KeypadNumLock);
   }
 }
 
-kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() {
-  if (!Layer.isOn(numPadLayer)) {
-    bool numState = getNumlockState();
-    if (!cleanupDone) {
-      LEDControl.set_mode(LEDControl.get_mode_index());
 
-      if (!originalNumLockState) {
-        syncNumlock(false);
-        numState = false;
-      }
-      cleanupDone = true;
-    }
-    originalNumLockState = numState;
 
-    return kaleidoscope::EventHandlerResult::OK;
+void NumPad_::cleanupNumlockState() {
+  bool numLockLEDState = getNumlockState();
+  if (!cleanupDone) {
+    LEDControl.set_mode(LEDControl.get_mode_index());
+
+    if (!originalNumLockState) {
+      syncNumlock(false);
+      numLockLEDState = false;
+    }
+    cleanupDone = true;
   }
+  originalNumLockState = numLockLEDState;
 
-  cleanupDone = false;
+}
-  syncNumlock(true);
 
+void NumPad_::setKeyboardLEDColors(void) {
   LEDControl.set_mode(LEDControl.get_mode_index());
 
   for (uint8_t r = 0; r < ROWS; r++) {
@@ -82,12 +80,28 @@ kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() {
     }
   }
 
-  if ((numpad_lock_key_row > ROWS) || (numpad_lock_key_col > COLS)) {
+  if ((numpad_lock_key_row <= ROWS) && (numpad_lock_key_col <= COLS)) {
+
+
+    cRGB lock_color = breath_compute(lock_hue);
+    LEDControl.setCrgbAt(numpad_lock_key_row, numpad_lock_key_col, lock_color);
+  }
+}
+
+kaleidoscope::EventHandlerResult NumPad_::afterEachCycle() {
+  if (!Layer.isOn(numPadLayer)) {
+    cleanupNumlockState();
     return kaleidoscope::EventHandlerResult::OK;
+  }
+
+  cleanupDone = false;
+  syncNumlock(true);
 
-  LEDControl.setCrgbAt(numpad_lock_key_row, numpad_lock_key_col, lock_color);
 
+  setKeyboardLEDColors();
   return kaleidoscope::EventHandlerResult::OK;
 }
 
+
+
 NumPad_ NumPad;

src/Kaleidoscope-NumPad.h

@@ -32,6 +32,10 @@ class NumPad_ : public kaleidoscope::Plugin {
   kaleidoscope::EventHandlerResult afterEachCycle();
 
  private:
+
+  void cleanupNumlockState(void);
+  void setKeyboardLEDColors(void);
+
   static uint8_t numpad_lock_key_row;
   static uint8_t numpad_lock_key_col;
   static bool cleanupDone;