From 5953af32153a4813279c57396f6bebc798de2ae2 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Thu, 5 Jul 2018 10:43:15 -0700
Subject: Cospad QMK Configurator support and refactor (#3319)

* Refactor KEYMAP to LAYOUT standards

- Change KEYMAP to LAYOUT_ortho
- Added a new LAYOUT called LAYOUT_numpad

* Use the new LAYOUT_numpad macro

* Add QMK Configurator support

* Change LAYOUT names as per code review

* Change positioning of keys in the matrix

* fix compile issue
---
 keyboards/cospad/cospad.h | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

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

diff --git a/keyboards/cospad/cospad.h b/keyboards/cospad/cospad.h
index cbcbdaf964..36c7f3367a 100644
--- a/keyboards/cospad/cospad.h
+++ b/keyboards/cospad/cospad.h
@@ -40,13 +40,13 @@
  */
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
-#define KEYMAP( \
-    	k00, k01, k02, k03, \
+#define LAYOUT_ortho_6x4( \
+  k00, k01, k02, k03, \
 	k10, k11, k12, k13, \
 	k20, k21, k22, k23, \
 	k30, k31, k32, k33, \
 	k40, k41, k42, k43, \
-	k50, k51, k52, k53 \
+	k50, k51, k52, k53  \
 ) \
 { \
 	{k00, k01, k02, k03}, \
@@ -54,14 +54,27 @@
 	{k20, k21, k22, k23}, \
 	{k30, k31, k32, k33}, \
 	{k40, k41, k42, k43}, \
-	{k50, k51, k52, k53} \
+	{k50, k51, k52, k53}  \
+}
+
+#define LAYOUT_numpad_6x4( \
+  k00, k01, k02, k03,  \
+	k10, k11, k12, k13,  \
+	k20, k21, k22,       \
+	k30, k31, k32, k23,  \
+	k40, k41, k42,       \
+	k50,      k52, k43   \
+) \
+{ \
+	{k00, k01,   k02, k03},   \
+	{k10, k11,   k12, k13},   \
+	{k20, k21,   k22, k23},   \
+	{k30, k31,   k32, KC_NO}, \
+	{k40, k41,   k42, k43},   \
+	{k50, KC_NO, k52, KC_NO}  \
 }
 void matrix_init_user(void);
 void matrix_scan_user(void);
-/*
-inline void cospad_bl_led_on(void)	{ DDRF |= (1<<7); PORTF &= ~(1<<7); }
-inline void cospad_bl_led_off(void)	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
-*/
 
 inline void cospad_bl_led_on(void)	{ PORTF &= ~(1<<7); }
 inline void cospad_bl_led_off(void)	{ PORTF |= (1<<7); }
-- 
cgit v1.2.3