GH60: readme cleanup, Refactor, and Configurator update (#3164)

[qmk_firmware.git] / keyboards / gh60 / gh60.h

diff --git a/keyboards/gh60/gh60.h b/keyboards/gh60/gh60.h
index d2f018ce69d96066b06bdeb3daf817c6c215a958..c72fb23e5084a94e3a720c0f945112bb13c8d138 100644 (file)
--- a/keyboards/gh60/gh60.h
+++ b/keyboards/gh60/gh60.h
@@ -28,7 +28,7 @@ inline void gh60_wasd_leds_off(void)          { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 /* GH60 keymap definition macro
  * K2C, K31 and  K3C are extra keys for ISO
  */
-#define KEYMAP( \
+#define LAYOUT( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
@@ -43,7 +43,7 @@ inline void gh60_wasd_leds_off(void)          { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 }
 
 /* ANSI variant. No extra keys for ISO */
-#define KEYMAP_ANSI( \
+#define LAYOUT_60_ansi( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
@@ -58,7 +58,7 @@ inline void gh60_wasd_leds_off(void)          { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 }
 
 /* ISO variant. Remove useless ANSI keys */
-#define KEYMAP_ISO( \
+#define LAYOUT_60_iso( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
@@ -74,7 +74,7 @@ inline void gh60_wasd_leds_off(void)          { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 
 
 /* HHKB Variant */
-#define KEYMAP_HHKB( \
+#define LAYOUT_60_ansi_split_bs_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
@@ -88,8 +88,19 @@ inline void gh60_wasd_leds_off(void)         { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
     { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    K49, K4A, K4B, K4C, K4D }  \
 }
 
-#define LAYOUT_60_ansi KEYMAP_ANSI
-#define LAYOUT_60_iso KEYMAP_ISO
-#define LAYOUT_60_ansi_split_bs_rshift KEYMAP_HHKB
+/* ANSI with split Right Shift. No extra keys for ISO */
+#define LAYOUT_60_ansi_split_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3C, \
+    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO,    K2D }, \
+    { K30, KC_NO,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    KC_NO, K4A, K4B, K4C, K4D }  \
+}
 
 #endif