From a0a4c9102c51d9032af270920447d0d6d3bac7bc Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Tue, 24 Apr 2018 09:01:40 -0700
Subject: Add Generic Keymap for my boards (#2795)

* add mechmerlin 60 ansi layout

* put meaningful #defines

* missed the backslash

* add merlin split layout

* rename to have a -ansi

* Add appropriate readme files

* rename KEYMAP to LAYOUT

* support for default layout

* support for the community keymaps

* make sure I don't break the configurator

* Don't break the configurator Merlin
---
 keyboards/1up60rgb/1up60rgb.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyboards/1up60rgb/1up60rgb.h')

diff --git a/keyboards/1up60rgb/1up60rgb.h b/keyboards/1up60rgb/1up60rgb.h
index 1f7b7aabea..969fd5b4a9 100644
--- a/keyboards/1up60rgb/1up60rgb.h
+++ b/keyboards/1up60rgb/1up60rgb.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
+#define LAYOUT_all( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
 	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
@@ -25,7 +25,7 @@
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
 	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, \
 	K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
-) KEYMAP( \
+) LAYOUT_all( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K013,\
 	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K214, \
@@ -40,7 +40,7 @@
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
 	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, \
 	K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
-) KEYMAP( \
+) LAYOUT_all( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K013,\
 	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
@@ -55,7 +55,7 @@
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
 	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
 	K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
-) KEYMAP( \
+) LAYOUT_all( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\
 	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
 	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K214, \
-- 
cgit v1.2.1