Move GMMK Pro to allow for multiple revisions (#16423)

* Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility.

* GMMK PRO MCU Updates only (removed other kbs)

* fix problems

* Optimize the code.

* Update form develop branch

* Update

* Updater from qmk/develop

* Update

* Update config.h

* Update config.h

* Remove gmmk pro rev2

* move moults31/keymap.c

* Update

* tidy up

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: zvecr <git@zvecr.com>

5 files changed, 0 insertions, 469 deletions

diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h b/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h
deleted file mode 100644
index ed78f99eca..0000000000
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Jonavin Eng
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define TAPPING_TOGGLE 2
-// TT set to two taps
-
-/*  Handle GRAVESC combo keys */
-#define GRAVE_ESC_ALT_OVERRIDE
-    //Always send Escape if Alt is pressed
-#define GRAVE_ESC_CTRL_OVERRIDE
-    //Always send Escape if Control is pressed
-
-#define TAPPING_TERM 180
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
-
-// add fifth layer for colemak  -- set "COLEMAK_LAYER_ENABLE = yes" in rules.mk to enable
-#if defined COLEMAK_LAYER_ENABLE
-    #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-    #define _COLEMAK 4
-#endif // COLEMAK_LAYER_ENABLE
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c
deleted file mode 100644
index 0d318885f4..0000000000
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Jonavin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_map.h"
-#include "jonavin.h"
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Ins           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    [_BASE] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,           KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        TT(_LOWER), KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFTCAPSWIN,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_FN1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CALC,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RESET,            KC_HOME,
-        KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
-        _______,          RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
-        _______, KC_WINLCK, _______,                            _______,                          _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-
-    [_LOWER] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, _______,          _______,
-        _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_TAB,  KC_P4,   KC_P5,   KC_P6,   KC_PDOT, _______, _______, _______,          KC_HOME,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_PAST,          KC_PENT,          KC_END,
-        _______,          KC_NO,   KC_DEL,  KC_INS,  KC_NO,   KC_NO,   KC_NO,   KC_P0, KC_00, KC_PDOT, KC_PSLS,         _______, RCTL(KC_PGUP), _______,
-        _______, _______, _______,                            KC_BSPC,                            _______, _______, _______, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)
-    ),
-
-   [_RAISE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-
-#ifdef COLEMAK_LAYER_ENABLE
-    [_COLEMAK] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,           KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        TT(_LOWER), KC_A, KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFTCAPSWIN,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-#endif // COLEMAK_LAYER_ENABLE
-};
-
-#if defined(ENCODER_ENABLE) && !defined(ENCODER_DEFAULTACTIONS_ENABLE)     // Encoder Functionality when not using userspace defaults
-    void encoder_action_rgbhue(bool clockwise) {
-        if (clockwise)
-            rgblight_increase_hue_noeeprom();
-        else
-            rgblight_decrease_hue_noeeprom();
-    }
-
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-        uint8_t mods_state = get_mods();
-        if (mods_state & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, encoder changes layers
-            encoder_action_layerchange(clockwise);
-        } else if (mods_state & MOD_BIT(KC_RSFT) ) { // If you are holding R shift, Page up/dn
-            unregister_mods(MOD_BIT(KC_RSFT));
-            encoder_action_navpage(clockwise);
-            register_mods(MOD_BIT(KC_RSFT));
-        } else if (mods_state & MOD_BIT(KC_LCTL)) {  // if holding Left Ctrl, navigate next/prev word
-            encoder_action_navword(clockwise);
-        } else if (mods_state & MOD_BIT(KC_RCTL)) {  // if holding Right Ctrl, change rgb hue/colour
-            encoder_action_rgbhue(clockwise);
-        } else if (mods_state & MOD_BIT(KC_LALT)) {  // if holding Left Alt, change media next/prev track
-            encoder_action_mediatrack(clockwise);
-        } else  {
-            switch(get_highest_layer(layer_state)) {
-            case _FN1:
-                #ifdef IDLE_TIMEOUT_ENABLE
-                    timeout_update_threshold(clockwise);
-                #endif
-                break;
-            default:
-                encoder_action_volume(clockwise);       // Otherwise it just changes volume
-                break;
-            }
-        }
-        return true;
-    }
-#endif // ENCODER_ENABLE && !ENCODER_DEFAULTACTIONS_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-    // Capslock, Scroll lock and Numlock  indicator on Left side lights.
-    void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-        if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
-        if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
-            rgb_matrix_set_color(LED_L1, RGB_GREEN);
-            rgb_matrix_set_color(LED_L2, RGB_GREEN);
-        }
-
-        #ifdef INVERT_NUMLOCK_INDICATOR
-            if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {   // on if NUM lock is OFF
-                rgb_matrix_set_color(LED_L3, RGB_MAGENTA);
-                rgb_matrix_set_color(LED_L4, RGB_MAGENTA);
-            }
-        #else
-            if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {   // Normal, on if NUM lock is ON
-                rgb_matrix_set_color(LED_L3, RGB_MAGENTA);
-                rgb_matrix_set_color(LED_L4, RGB_MAGENTA);
-            }
-        #endif // INVERT_NUMLOCK_INDICATOR
-
-        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
-            rgb_matrix_set_color(LED_L5, RGB_RED);
-            rgb_matrix_set_color(LED_L6, RGB_RED);
-            rgb_matrix_set_color(LED_L7, RGB_RED);
-        }
-        if (keymap_config.no_gui) {
-            rgb_matrix_set_color(LED_LWIN, RGB_RED);  //light up Win key when disabled
-        }
-        switch(get_highest_layer(layer_state)){  // special handling per layer
-        case _FN1:  // on Fn layer select what the encoder does when pressed
-            rgb_matrix_set_color(LED_R2, RGB_RED);
-            rgb_matrix_set_color(LED_R3, RGB_RED);
-            rgb_matrix_set_color(LED_R4, RGB_RED);
-            rgb_matrix_set_color(LED_FN, RGB_RED); //FN key
-
-            // Add RGB Timeout Indicator -- shows 0 to 139 using F row and num row;  larger numbers using 16bit code
-            uint16_t timeout_threshold = get_timeout_threshold();
-            if (timeout_threshold <= 10) rgb_matrix_set_color(LED_LIST_FUNCROW[timeout_threshold], RGB_RED);
-            else if (timeout_threshold < 140) {
-                rgb_matrix_set_color(LED_LIST_FUNCROW[(timeout_threshold / 10)], RGB_RED);
-                rgb_matrix_set_color(LED_LIST_NUMROW[(timeout_threshold % 10)], RGB_RED);
-            } else { // >= 140 minutes, just show these 3 lights
-                rgb_matrix_set_color(LED_LIST_NUMROW[10], RGB_RED);
-                rgb_matrix_set_color(LED_LIST_NUMROW[11], RGB_RED);
-                rgb_matrix_set_color(LED_LIST_NUMROW[12], RGB_RED);
-            }
-            break;
-        case _LOWER:
-            for (uint8_t i=0; i<ARRAYSIZE(LED_LIST_NUMPAD); i++) {
-                rgb_matrix_set_color(LED_LIST_NUMPAD[i], RGB_MAGENTA);
-            }
-            rgb_matrix_set_color(LED_R4, RGB_MAGENTA);
-            rgb_matrix_set_color(LED_R5, RGB_MAGENTA);
-            rgb_matrix_set_color(LED_R6, RGB_MAGENTA);
-            break;
-        case _RAISE:
-            rgb_matrix_set_color(LED_R6, RGB_GREEN);
-            rgb_matrix_set_color(LED_R7, RGB_GREEN);
-            rgb_matrix_set_color(LED_R8, RGB_GREEN);
-            break;
-#ifdef COLEMAK_LAYER_ENABLE
-       case _COLEMAK:
-            for (uint8_t i=0; i<ARRAYSIZE(LED_SIDE_RIGHT); i++) {
-                rgb_matrix_set_color(LED_SIDE_RIGHT[i], RGB_BLUE);
-            }
-            break;
-#endif
-        default:
-            break;
-        }
-    }
-
-    void suspend_power_down_user(void) {
-        rgb_matrix_set_suspend_state(true);
-    }
-
-    void suspend_wakeup_init_user(void) {
-        rgb_matrix_set_suspend_state(false);
-    }
-#endif
-
-
-void keyboard_post_init_keymap(void) {
-    // keyboard_post_init_user() moved to userspace
-    #ifdef RGB_MATRIX_ENABLE
-        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
-        rgb_matrix_set_color_all(RGB_NAUTILUS); // Default startup colour
-        activate_rgb_nightmode(false);  // Set to true if you want to startup in nightmode, otherwise use Fn + Z to toggle
-    #endif
-}
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md
deleted file mode 100644
index 6e8d6ba8a5..0000000000
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# jonavin's GMMK Pro layout
-
-- Add Fn layer keys from Glorious Core mapping that's missing in the default qmk mapping
-- Add PrtScr, Scroll Lock, Break, NumLock to Fn layer
-- Implement Win key lock using Fn+Win like in Glorious Core firmware
-- Layer 2 mod on Caps Lock with double-tap to switch to this layer, double tap to switch back
-- Layer 2 provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry
-- Layer 2 left spacebar Backspace
-- add double tap of Left Shift to toggle Caps Lock
-- additional encoder functionality
-    - FN Layer - change rgb idle timeout
-    - holding Left shift, change layers
-    - holding right shift, Navigate page up/down
-    - holding Left Ctrl, navigate prev/next word
-    - holding Right Ctrl, changes RGB hue/colour
-    - holding Left Alt, change media prev/next track
-    - default is change volume
-    
-- LED/RGB Functionality
-    - RGB idle timeout (default 5 minutes)
-        - Can be changed in FN layer with < and > or encoder
-        - setting to zero disables timeout
-        - indicators in FN layer using RGB in FN and number rows to show the timeout in minutes
-    - LED address location map as enum definition in rgb_matrix_map.h
-    - LED group lists for arrows, numpad, F row, num row, left and right side LEDs
-    - default startup in single mode with default colour 
-    - Capslock, Scroll Lock, and Num Lock (not set) indicator on left side LED
-    - Layer indicator on right side LED
-    - Fn key light up red when Fn layer activate
-    - Win Key light up red when Win Lock mode enabled
-    - Layer 2 activation lights up Numpad area
-    - Fn + Z to turn off all RGB lights except rgb indicators; press again to toggle
-
-rules.mk OPTIONS - Active features from userspace
-STARTUP_NUMLOCK_ON = yes
-    - turns on NUMLOCK by default
-
-ENCODER_DEFAULTACTIONS_ENABLE = yes
-    - Enabled default encoder funtions
-  
-TD_LSFT_CAPSLOCK_ENABLE = yes
-    - This will enable double tap on Left Shift to toggle CAPSLOCK when using KC_LSFTCAPS
-
-IDLE_TIMEOUT_ENABLE = yes
-    - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
-
-INVERT_NUMLOCK_INDICATOR
-    - inverts the Num lock indicator, LED is on when num lokc is off
-
-COLEMAK_LAYER_ENABLE = yes
-    - Enabled optional 5th layer for COLEMAK layout
-    - Use Shift and encoder to enter 5th layer, right led indicator lights up BLUE
-    
-## All layers diagram
-Default layer
-![image](https://user-images.githubusercontent.com/71780717/124177658-82324880-da7e-11eb-9421-b69100131062.png)
-
-Fn Layer
-![image](https://user-images.githubusercontent.com/71780717/131255937-06c9691b-835f-4c94-93e6-6d1dc3de272b.png)
-
-Layer 2 (Caps Lock Mod)
-![image](https://user-images.githubusercontent.com/71780717/124177683-8b231a00-da7e-11eb-9434-e2475f679a54.png)
-
-Optional COLEMAK layer
-![image](https://user-images.githubusercontent.com/71780717/131235050-980d2f54-2d23-4ae8-a83f-9fcdbe60d6cb.png)
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h
deleted file mode 100644
index 1ee5388905..0000000000
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright 2021 Jonavin Eng
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef RGB_MATRIX_ENABLE
-
-    // Custom RGB Colours
-    #define RGB_GODSPEED 0x00, 0xE4, 0xFF // colour for matching keycaps
-    #define RGB_NAUTILUS 0x00, 0xA4, 0xA9 // Naurilus Font colours
-
-    // RGB LED locations
-    enum led_location_map {
-        LED_ESC, // 0, ESC, k13
-        LED_GRV, // 1, ~, k16
-        LEB_TAB, // 2, Tab, k11
-        LED_CAPS, // 3, Caps, k21
-        LED_LSFT, // 4, Sh_L, k00
-        LED_LCTL, // 5, Ct_L, k06
-        LED_F1, // 6, F1, k26
-        LED_1, // 7, 1, k17
-        LED_Q, // 8, Q, k10
-        LED_A, // 9, A, k12
-        LED_Z, // 10, Z, k14
-        LED_LWIN, // 11, Win_L, k90
-        LED_F2, // 12, F2, k36
-        LED_2, // 13, 2, k27
-        LED_W, // 14, W, k20
-        LED_S, // 15, S, k22
-        LED_X, // 16, X, k24
-        LED_LALT, // 17, Alt_L, k93
-        LED_F3, // 18, F3, k31
-        LED_3, // 19, 3, k37
-        LED_E, // 20, E, k30
-        LED_D, // 21, D, k32
-        LED_C, // 22, C, k34
-        LED_F4, // 23, F4, k33
-        LED_4, // 24, 4, k47
-        LED_R, // 25, R, k40
-        LED_F, // 26, F, k42
-        LED_V, // 27, V, k44
-        LED_F5, // 28, F5, k07
-        LED_5, // 29, 5, k46
-        LED_T, // 30, T, k41
-        LED_G, // 31, G, k43
-        LED_B, // 32, B, k45
-        LED_SPC, // 33, SPACE, k94
-        LED_F6, // 34, F6, k63
-        LED_6, // 35, 6, k56
-        LED_Y, // 36, Y, k51
-        LED_H, // 37, H, k53
-        LED_N, // 38, N, k55
-        LED_F7, // 39, F7, k71
-        LED_7, // 40, 7, k57
-        LED_U, // 41, U, k50
-        LED_J, // 42, J, k52
-        LED_M, // 43, M, k54
-        LED_F8, // 44, F8, k76
-        LED_8, // 45, 8, k67
-        LED_I, // 46, I, k60
-        LED_K, // 47, K, k62
-        LED_COMM, // 48, ,, k64
-        LED_RALT, // 49, Alt_R, k95
-        LED_F9, // 50, F9, ka6
-        LED_9, // 51, 9, k77
-        LED_O, // 52, O, k70
-        LED_L, // 53, L, k72
-        LED_DOT, // 54, ., k74
-        LED_FN, // 55, FN, k92
-        LED_F10, // 56, F10, ka7
-        LED_0, // 57, 0, k87
-        LED_P, // 58, P, k80
-        LED_SCLN, // 59, ;, k82
-        LED_SLSH, // 60, ?, k85
-        LED_F11, // 61, F11, ka3
-        LED_MINS, // 62, -, k86
-        LED_LBRC, // 63, [, k81
-        LED_QUOT, // 64, ", k83
-        LED_RCTL, // 65, Ct_R, k04
-        LED_F12, // 66, F12, ka5
-        LED_L1, // 67, LED, l01
-        LED_R1, // 68, LED, l11
-        LED_INS, // 69, Prt, k97  -- remapped to INS
-        LED_L2, // 70, LED, l02
-        LED_R2, // 71, LED, l12
-        LED_DEL, // 72, Del, k65
-        LED_L3, // 73, LED, l03
-        LED_R3, // 74, LED, l13
-        LED_PGUP, // 75, PgUp, k15
-        LED_L4, // 76, LED, l04
-        LED_R4, // 77, LED, l14
-        LED_EQL, // 78, =, k66
-        LED_RIGHT, // 79, Right, k05
-        LED_L5, // 80, LED, l05
-        LED_R5, // 81, LED, l15
-        LED_END, // 82, End, k75
-        LED_L6, // 83, LED, l06
-        LED_R6, // 84, LED, l16
-        LED_BSPC, // 85, BSpc, ka1
-        LED_PGDN, // 86, PgDn, k25
-        LED_L7, // 87, LED, l07
-        LED_R7, // 88, LED, l17
-        LED_RBRC, // 89, ], k61
-        LED_RSFT, // 90, Sh_R, k91
-        LED_L8, // 91, LED, l08
-        LED_R8, // 92, LED, l18
-        LED_BSLS, // 93, \, ka2
-        LED_UP, // 94, Up, k35
-        LED_LEFT, // 95, Left, k03
-        LED_ENT, // 96, Enter, ka4
-        LED_DOWN // 97, Down, k73
-    };
-
-    const uint8_t LED_LIST_WASD[] = { LED_W, LED_A, LED_S, LED_D };
-
-    const uint8_t LED_LIST_ARROWS[] = { LED_LEFT, LED_RIGHT, LED_UP, LED_DOWN };
-
-    const uint8_t LED_LIST_FUNCROW[] = { LED_ESC, LED_F1, LED_F2, LED_F3, LED_F4, LED_F5, LED_F6, LED_F7, LED_F8, LED_F9, LED_F10, LED_F11, LED_F12, LED_INS};
-
-    const uint8_t LED_LIST_NUMROW[] = { LED_GRV, LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, LED_MINS, LED_EQL, LED_BSPC, LED_DEL};
-
-    const uint8_t LED_LIST_NUMPAD[] = {
-        LED_7, LED_8, LED_9,
-        LED_U, LED_I, LED_O,
-        LED_J, LED_K, LED_L,
-        LED_M, LED_COMM, LED_DOT
-        };
-
-    const uint8_t LED_SIDE_LEFT[] = { LED_L1, LED_L2, LED_L3, LED_L4, LED_L5, LED_L6, LED_L7, LED_L8};
-
-    const uint8_t LED_SIDE_RIGHT[] = { LED_R1, LED_R2, LED_R3, LED_R4, LED_R5, LED_R6, LED_R7, LED_R8};
-
-#endif
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
deleted file mode 100644
index 1ffc2058a2..0000000000
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-TAP_DANCE_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-
-TD_LSFT_CAPSLOCK_ENABLE = yes
-IDLE_TIMEOUT_ENABLE = yes
-STARTUP_NUMLOCK_ON = yes
-ENCODER_DEFAULTACTIONS_ENABLE = no
-
-COLEMAK_LAYER_ENABLE = yes  #Enable Colemak layer / set to no to disable
-INVERT_NUMLOCK_INDICATOR = yes