Move GMMK Pro to allow for multiple revisions (qmk#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>

data/mappings/keyboard_aliases.json

@@ -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'

keyboards/gmmk/pro/config.h

@@ -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

keyboards/gmmk/pro/pro.h

@@ -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

keyboards/gmmk/pro/ansi/readme.md → keyboards/gmmk/pro/rev1/ansi/readme.md

@@ -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:
 

keyboards/gmmk/pro/rev1/config.h

@@ -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

keyboards/gmmk/pro/rev1/halconf.h

@@ -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>

keyboards/gmmk/pro/iso/readme.md → keyboards/gmmk/pro/rev1/iso/readme.md

@@ -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:
 

keyboards/gmmk/pro/rev1/mcuconf.h

@@ -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