From 468f7054558153cbf7f7ece3cf8775e1f3d28fe9 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 27 Jul 2021 22:00:38 +1000
Subject: Dactyl Manuform cleanup (#13686)

---
 keyboards/handwired/dactyl_manuform/6x6/6x6.h | 63 ++++++++++++---------------
 1 file changed, 27 insertions(+), 36 deletions(-)

(limited to 'keyboards/handwired/dactyl_manuform/6x6/6x6.h')

diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
index 039e6b40df..821abe0308 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -1,42 +1,33 @@
 #pragma once
 
 #include "dactyl_manuform.h"
-#include "quantum.h"
 
+#define XXX KC_NO
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-  #include <avr/io.h>
-  #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT_6x6(\
-  L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
-  L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
-            L52, L53,                                              R52, R53,           \
-                      L54, L55,                          R50, R51,                     \
-                                L64, L65,      R60, R61,                               \
-                                L62, L63,      R62, R63                                \
-  ) \
-  { \
-    { L00,   L01,   L02, L03, L04, L05 }, \
-    { L10,   L11,   L12, L13, L14, L15 }, \
-    { L20,   L21,   L22, L23, L24, L25 }, \
-    { L30,   L31,   L32, L33, L34, L35 }, \
-    { L40,   L41,   L42, L43, L44, L45 }, \
-    { KC_NO, KC_NO, L52, L53, L54, L55 }, \
-    { KC_NO, KC_NO, L62, L63, L64, L65 }, \
-                                          \
-    { R00, R01, R02, R03, R04,   R05   }, \
-    { R10, R11, R12, R13, R14,   R15   }, \
-    { R20, R21, R22, R23, R24,   R25   }, \
-    { R30, R31, R32, R33, R34,   R35   }, \
-    { R40, R41, R42, R43, R44,   R45   }, \
-    { R50, R51, R52, R53, KC_NO, KC_NO }, \
-    { R60, R61, R62, R63, KC_NO, KC_NO }  \
+#define LAYOUT_6x6( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+              L52, L53,                                              R52, R53, \
+                        L54, L55,                          R50, R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { XXX, XXX, L52, L53, L54, L55 }, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { R50, R51, R52, R53, XXX, XXX }, \
+    { R60, R61, R62, R63, XXX, XXX } \
 }
-- 
cgit v1.2.3