125 files changed, 82 insertions(+), 23 deletions(-)

M data/mappings/keyboard_aliases.json
M keyboards/gmmk/pro/config.h
D keyboards/gmmk/pro/halconf.h
D keyboards/gmmk/pro/mcuconf.h
M keyboards/gmmk/pro/pro.h
R keyboards/gmmk/pro/{ => rev1}/ansi/ansi.c
R keyboards/gmmk/pro/{ => rev1}/ansi/ansi.h
R keyboards/gmmk/pro/{ => rev1}/ansi/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/info.json
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/alexmarmon/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/alexmarmon/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrewcharnley/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrewcharnley/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrewcharnley/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/batin/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/benschaeff/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/benschaeff/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/cedrikl/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/cedrikl/rgb_matrix_map.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/cedrikl/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/default/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gigahawk/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gigahawk/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/caps_word.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/caps_word.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/rgb_matrix_map.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jackkenney/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/rgb_matrix_map.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/lalitmaganti/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/lalitmaganti/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/lalitmaganti/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/ansi.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/helpers.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/keymap_helpers.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/.gitignore
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/README.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/encoder.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/encoder.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/fun.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/mike1808.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/mike1808.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/process_record.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/process_record.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/utils.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/utils.h
R keyboards/gmmk/pro/{ => rev1/ansi}/keymaps/moults31/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/paddlegame.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/rgb_matrix_map.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/config.h
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/via/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/via/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/wholesomeducky/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/keymap.c
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/keymap.json
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/rules.mk
R keyboards/gmmk/pro/{ => rev1}/ansi/readme.md
R keyboards/gmmk/pro/{ => rev1}/ansi/rules.mk
A keyboards/gmmk/pro/rev1/config.h
A keyboards/gmmk/pro/rev1/halconf.h
R keyboards/gmmk/pro/{ => rev1}/iso/config.h
R keyboards/gmmk/pro/{ => rev1}/iso/info.json
R keyboards/gmmk/pro/{ => rev1}/iso/iso.c
R keyboards/gmmk/pro/{ => rev1}/iso/iso.h
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/chofstede/keymap.c
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/chofstede/readme.md
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/default/keymap.c
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/config.h
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/keymap.c
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/readme.md
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/rgb_matrix_map.h
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/rules.mk
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/via/keymap.c
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/via/rules.mk
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vitoni/config.h
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vitoni/keymap.c
R keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vitoni/readme.adoc
R keyboards/gmmk/pro/{ => rev1}/iso/readme.md
R keyboards/gmmk/pro/{ => rev1}/iso/rules.mk
A keyboards/gmmk/pro/rev1/mcuconf.h

@@ 165,7 165,13 @@
           target: 'gh60/revc'
     },
     'gmmk/pro': {
-          target: 'gmmk/pro/ansi'
+          target: 'gmmk/pro/rev1/ansi'
+    },
+    'gmmk/pro/ansi': {
+        target: 'gmmk/pro/rev1/ansi'
+    },
+    'gmmk/pro/iso': {
+        target: 'gmmk/pro/rev1/iso'
     },
     'handwired/ferris': {
           target: 'ferris/0_1'

@@ 53,7 53,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* SPI Config for LED Driver */
-#define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5
 #define SPI_MOSI_PIN A6
 #define SPI_MISO_PIN A7

@@ 1,7 0,0 @@
-#pragma once
-
-#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
-#include_next <halconf.h>

@@ 1,6 0,0 @@
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE

@@ 18,8 18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_gmmk_pro_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_iso)
-#    include "iso.h"
+#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
+#    include "rev1/ansi/ansi.h"
+#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
+#    include "rev1/iso/iso.h"
 #endif  // GMMK Pro revisions

@@ 8,11 8,11 @@ A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the STM32
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gmmk/pro/ansi:default
+    make gmmk/pro/rev1/ansi:default
 
 Flashing example for this keyboard:
 
-    make gmmk/pro/ansi:default:flash
+    make gmmk/pro/rev1/ansi:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 

@@ 0,0 1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * 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
+
+#include "config_common.h"
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPID1

@@ 0,0 1,23 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * 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 HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>

@@ 8,11 8,11 @@ A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the STM32
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gmmk/pro/iso:default
+    make gmmk/pro/rev1/iso:default
 
 Flashing example for this keyboard:
 
-    make gmmk/pro/iso:default:flash
+    make gmmk/pro/rev1/iso:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 

@@ 0,0 1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * 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
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE