1 files changed, 49 insertions, 48 deletions

diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
index 15b6df3b1a..52932a3baa 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
+++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
@@ -1,10 +1,13 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    /* LAYER 0
-     * ,-----------------------.
-     * |   <<  |  MUTE |  >>   |  ENCODER - PRESS (MUTE) / HOLD (LAYER 2) / KNOB (VOLUME CONTROL)
+    /* LAYER 0 
+     * ,-------|ENCODER|-------.
+     * |   <<  |  MUTE |  >>   |
      * |-------+-------+-------|
      * |  STOP |  PLAY | MEDIA |
      * |-------+-------+-------|
@@ -13,72 +16,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [0] = LAYOUT_ortho_3x3(
-      KC_MPRV, LT(2, KC_MUTE), KC_MNXT,
+      KC_MPRV, LT(2, KC_MUTE), KC_MNXT, 
       KC_MSTP, KC_MPLY, KC_MSEL,
       KC_CALC, KC_MAIL, LT(1, KC_MYCM)
       ),
 
 
-    /* LAYER 1
-     * ,-----------------------.
-     * | MODE+ |RGB TOG| MODE- |  ENCODER - PRESS (NA) / KNOB (Hue Control)
+    /* LAYER 1 
+     * ,-------|ENCODER|-------.
+     * | MODE+ |RGB TOG| MODE- |
      * |-------+-------+-------|
-     * |  SPD- |  SPD+ |Bright |
+     * |Bright-| PLAIN |Bright+|
      * |-------+-------+-------|
-     * |  SAT+ |  SAT- |       |
+     * | SWIRL |BREATH |       |
      * `-----------------------'
      */
-
+    
     [1] = LAYOUT_ortho_3x3(
-      RGB_MOD, RGB_TOG, RGB_RMOD,
-      RGB_SPI, RGB_SPD, RGB_VAI,
-      RGB_SAI, RGB_SAD, KC_TRNS
+      RGB_MOD, RGB_TOG, RGB_RMOD, 
+      RGB_VAD, RGB_M_P, RGB_VAI, 
+      LT(3,RGB_M_SW), RGB_M_B, KC_TRNS
       ),
 
-
-    /* LAYER 2 (ENCODER)
-     * ,-----------------------.
-     * |       |       |       |  ENCODER - PRESS (NA) / KNOB (Arrow Left/Right)
+      
+    /* LAYER 2 
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
      * |-------+-------+-------|
      * |       |       |       |
      * |-------+-------+-------|
      * |       |       |       |
      * `-----------------------'
      */
-
+    
     [2] = LAYOUT_ortho_3x3(
-      KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS
+      ),
+
+      
+    /* LAYER 3 
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * `-----------------------'
+     */
+    
+    [3] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
       KC_TRNS, KC_TRNS, KC_TRNS
       )
 
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-
-  switch (get_highest_layer(layer_state)) {
-      case 1:
-          if (clockwise) {
-              rgblight_increase_hue();
-          } else {
-              rgblight_decrease_hue();
-          }
-          break;
-      case 2:
-          if (clockwise) {
-              tap_code(KC_RGHT);
-          } else {
-              tap_code(KC_LEFT);
-          }
-          break;
-      default:
-          if (clockwise) {
-              tap_code(KC_VOLU);
-          } else {
-              tap_code(KC_VOLD);
-          }
-          break;
-
-  }
-    return true;
-}
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
+    [2] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    [3] =  { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+};
+#endif