From dbdbbbd5c9b1458f682eec661d0a17f91dccb4dc Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Wed, 26 Sep 2018 12:17:54 -0700
Subject: Keyboard: Refactor XMMX keyboard to XMMX and Toad (#3955)

* pull out toad keyboard and get it compiling

* refactor xmmx

* use the correct LAYOUT macros

* move LED code out to toad.c file

* move LED code out to xmmx.c file

* adjust for correct number of columns and pins used

* remove led set user
---
 keyboards/xmmx/xmmx.h | 96 +++------------------------------------------------
 1 file changed, 5 insertions(+), 91 deletions(-)

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

diff --git a/keyboards/xmmx/xmmx.h b/keyboards/xmmx/xmmx.h
index ad6ae30146..22d0f1480d 100644
--- a/keyboards/xmmx/xmmx.h
+++ b/keyboards/xmmx/xmmx.h
@@ -4,7 +4,7 @@
 #include "quantum.h"
 
 // 80% keyboard: default - all keys
-#define KEYMAP( \
+#define LAYOUT_all( \
 	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016,       \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013, K114, K115, K116, \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,       \
@@ -21,7 +21,7 @@
 }
 
 // 80% keyboard: ANSI Winkey
-#define KEYMAP_ANSI_WK( \
+#define LAYOUT_ansi_wk( \
 	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
@@ -38,7 +38,7 @@
 }
 
 // 80% keyboard: ANSI Winkeyless
-#define KEYMAP_ANSI_WKL( \
+#define LAYOUT_ansi_wkl( \
 	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
@@ -55,7 +55,7 @@
 }
 
 // 80% keyboard: ISO Winkey
-#define KEYMAP_ISO_WK( \
+#define LAYOUT_iso_wk( \
 	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, \
@@ -72,7 +72,7 @@
 }
 
 // 80% keyboard: ISO Winkeyless
-#define KEYMAP_ISO_WKL( \
+#define LAYOUT_iso_wkl( \
 	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, \
@@ -88,90 +88,4 @@
 	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513, K514, K515, K516 }  \
 }
 
-
-// 70% keyboard: default - all keys
-#define TOAD_KEYMAP( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,        \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,        \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,        \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513         \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
-}
-
-// 70% keyboard: ANSI Winkey
-#define TOAD_KEYMAP_ANSI_WK( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,  \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313 }, \
-	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
-}
-
-// 70% keyboard: ANSI Winkeyless
-#define TOAD_KEYMAP_ANSI_WKL( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,  \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500,       K502,                         K507,                   K511,       K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313 }, \
-	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513 }  \
-}
-
-// 70% keyboard: ISO Winkey
-#define TOAD_KEYMAP_ISO_WK( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,        \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513 }  \
-}
-
-// 70% keyboard: ISO Winkeyless
-#define TOAD_KEYMAP_ISO_WKL( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,        \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,        \
-	K500,       K502,                         K507,                   K511,       K513   \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \
-	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513 }  \
-}
-
 #endif
-- 
cgit v1.2.3