Fix variable references

Signed-off-by: Evy Bongers <[email protected]>

Author: EvyBongers

plugins/Kaleidoscope-Colormap-Overlay/src/kaleidoscope/plugin/Colormap-Overlay.cpp

@@ -99,11 +99,12 @@ EventHandlerResult ColormapOverlay::onFocusEvent(const char *input) {
     return EventHandlerResult::OK;
 
   if (::Focus.isEOL()) {
-    for (uint8_t layer = 0; layer < defaultcolormap::colormap_layers; layer++) {
-      for (int8_t i = 0; i < Runtime.device().numKeys(); i++) {
+    for (uint8_t layer = 0; layer < layer_count; layer++) {
+      for (int8_t key_index_ = 0; key_index_ < Runtime.device().numKeys(); key_index_++) {
+        KeyAddr k = KeyAddr(key_index_);
         for (uint8_t overlay_index{0}; overlay_index < overlay_count_; ++overlay_index) {
           Overlay overlay = overlays_[overlay_index];
-          if ((overlay.addr == k) && (overlay.layer == top_layer)) {
+          if ((overlay.addr == k) && (overlay.layer == layer)) {
             ::Focus.send(overlay.palette_index);
           }
         }

plugins/Kaleidoscope-Colormap-Overlay/src/kaleidoscope/plugin/Colormap-Overlay.h

@@ -79,8 +79,8 @@ class ColormapOverlay : public kaleidoscope::Plugin {
   void configureOverlays(uint8_t **overlays) {
     // First count how many overlays we'll need
     uint8_t count = 0;
-    for (int layer_ = 0; layer_ < _layer_count; layer_++) {
-      for (int key_index_ = 0; key_index_ < kaleidoscope_internal::device.matrix_rows * kaleidoscope_internal::device.matrix_columns; key_index_++) {
+    for (uint8_t layer_ = 0; layer_ < _layer_count; layer_++) {
+      for (uint8_t key_index_ = 0; key_index_ < kaleidoscope_internal::device.matrix_rows * kaleidoscope_internal::device.matrix_columns; key_index_++) {
         int8_t color_index_ = overlays[layer_][key_index_];
         if (color_index_ >= 0 && color_index_ < ::LEDPaletteTheme.getPaletteSize() &&
             color_index_ != no_color_overlay) {
@@ -113,6 +113,7 @@ class ColormapOverlay : public kaleidoscope::Plugin {
     overlays_      = new_overlays;
     overlay_count_ = count;
   }
+
   // A wildcard value for an overlay that applies on every layer.
   static constexpr int8_t layer_wildcard{-1};
   static constexpr int8_t no_color_overlay{-1};