Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

1 files changed, 14 insertions, 7 deletions

diff --git a/keyboards/jd45/jd45.h b/keyboards/jd45/jd45.h
index 1e9de2123b..04ac6649e7 100644
--- a/keyboards/jd45/jd45.h
+++ b/keyboards/jd45/jd45.h
@@ -1,13 +1,20 @@
 #ifndef JD45_H
 #define JD45_H
 
-#include "matrix.h"
-#include "keymap.h"
-#include "backlight.h"
-#include <stddef.h>
-#include <avr/io.h>
+#include "quantum.h"
 
-void matrix_init_user(void);
-void matrix_scan_user(void);
+/* JD45 keymap definition macro
+ */
+#define KEYMAP( \
+    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, K45, K46, K47 \
+) { \
+    { KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K10, KC_##K11, KC_##K12, KC_##K13 }, \
+    { KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_NO    }, \
+    { KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_NO    }, \
+    { KC_##K38, KC_##K39, KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_##K43, KC_NO,    KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_NO    }  \
+}
 
 #endif