Merge remote-tracking branch 'origin/develop' into xap

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/halconf.h

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

keyboards/gmmk/pro/mcuconf.h

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

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)
+#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
-#    include "ansi.h"
+#    include "rev1/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_iso)
+#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
-#    include "iso.h"
+#    include "rev1/iso/iso.h"
 #endif  // GMMK Pro revisions