From c9102f9e35f479bd7d5dd06ce10a5089b199fb0d Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Fri, 18 May 2018 21:00:48 -0700
Subject: Renamed jd40's LAYOUT to LAYOUT_kc (#3000)

Made a new LAYOUT without all the KC_##
---
 keyboards/jd40/jd40.h | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'keyboards/jd40/jd40.h')

diff --git a/keyboards/jd40/jd40.h b/keyboards/jd40/jd40.h
index 0000bc7ed..3ed6149f0 100644
--- a/keyboards/jd40/jd40.h
+++ b/keyboards/jd40/jd40.h
@@ -4,7 +4,7 @@
 #include "quantum.h"
 #include "led.h"
 
-/* GH60 LEDs 
+/* GH60 LEDs
  *   GPIO pads
  *   0 F7 WASD LEDs
  *   1 F6 ESC LED
@@ -13,7 +13,7 @@
  *   B2 Capslock LED
  *   B0 not connected
  */
- 
+
  /*
 inline void gh60_caps_led_on(void)      { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
 inline void gh60_poker_leds_on(void)    { DDRF |=  (1<<4); PORTF &= ~(1<<4); }
@@ -30,7 +30,7 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 
 /* JD40 MKII keymap definition macro
  */
-#define LAYOUT( \
+#define LAYOUT_kc( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \
 	K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
 	K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, \
@@ -42,4 +42,16 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
     { KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_NO,    KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_NO    }  \
 }
 
+#define LAYOUT( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \
+	K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
+	K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, \
+	K35, K36, K37, K38, K39, K40, K41, K42, K43, K44 \
+) { \
+    { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12 }, \
+    { K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, KC_NO    }, \
+    { K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, KC_NO    }, \
+    { K35, K36, K37, K38, K39, KC_NO,    K40, K41, K42, K43, K44, KC_NO    }  \
+}
+
 #endif
-- 
cgit v1.2.3-24-g4f1b