From 2dab029bcfb84b1fdd8fd0ef4d41ba41b9b5a109 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 11 Jul 2022 05:51:29 -0700
Subject: Peej Rosaline Refactor (#17564)

---
 keyboards/peej/rosaline/rosaline.h | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

(limited to 'keyboards/peej/rosaline/rosaline.h')

diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h
index 1e41a2e95e..22125f3188 100644
--- a/keyboards/peej/rosaline/rosaline.h
+++ b/keyboards/peej/rosaline/rosaline.h
@@ -20,39 +20,11 @@
 
 #define XXX KC_NO
 
-#define LAYOUT_staggered_40( \
-	k00, k01, k10, k20, k21, k30, k31, k40, k41, k50, k60, k61, k70, k71, \
-	k02, k11, k12, k22, k23, k32, k33, k42, k51, k52, k62, k63, k72, \
-	k03, k13, k14, k24, k34, k35, k43, k44, k53, k54, k64, k73, k74, \
-	k04, k05, k15, k25, k45, k55, k56, k65, k66, k75, k76 \
-) \
-{ \
-	{ k00, k10, k20, k30, k40, k50, k60, k70 }, \
-	{ k01, k11, k21, k31, k41, k51, k61, k71 }, \
-	{ k02, k12, k22, k32, k42, k52, k62, k72 }, \
-	{ k03, k13, k23, k33, k43, k53, k63, k73 }, \
-	{ k04, k14, k24, k34, k44, k54, k64, k74 }, \
-	{ k05, k15, k25, k35, k45, k55, k65, k75 }, \
-	{ XXX, XXX, XXX, XXX, XXX, k56, k66, k76 }, \
-	{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_ortho_4x15( \
-	k00, k04, k10, k14, k20, k24, k30, k34, k40, k44, k50, k54, k60, k64, k70, \
-	k01, k05, k11, k15, k21, k25, k31, k35, k41, k45, k51, k55, k61, k65, k71, \
-	k02, k06, k12, k16, k22, k26, k32, k36, k42, k46, k52, k56, k62, k66, k72, \
-	k03, k07, k13, k17, k23, k27, k33, k37, k43, k47, k53, k57, k63, k67, k73 \
-) \
-{ \
-	{ k00, k10, k20, k30, k40, k50, k60, k70 }, \
-	{ k01, k11, k21, k31, k41, k51, k61, k71 }, \
-	{ k02, k12, k22, k32, k42, k52, k62, k72 }, \
-	{ k03, k13, k23, k33, k43, k53, k63, k73 }, \
-	{ k04, k14, k24, k34, k44, k54, k64, XXX }, \
-	{ k05, k15, k25, k35, k45, k55, k65, XXX }, \
-	{ k06, k16, k26, k36, k46, k56, k66, XXX }, \
-	{ k07, k17, k27, k37, k47, k57, k67, XXX } \
-}
+#if defined(KEYBOARD_peej_rosaline_staggered)
+    #include "staggered.h"
+#elif defined(KEYBOARD_peej_rosaline_ortho)
+    #include "ortho.h"
+#endif
 
 #define LED1 C5
 #define LED2 C4
-- 
cgit v1.2.1