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/5x7/5x7.h | 54 ++++++++++++---------------
 1 file changed, 23 insertions(+), 31 deletions(-)

(limited to 'keyboards/handwired/dactyl_manuform/5x7/5x7.h')

diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
index c01fce957c..0c0c781be7 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
@@ -1,23 +1,16 @@
 #pragma once
 
 #include "dactyl_manuform.h"
-#include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-  #include <avr/io.h>
-  #include <avr/interrupt.h>
-#endif
-#endif
+#define XXX KC_NO
 
 #define LAYOUT_5x7( \
-    L11, L12, L13, L14, L15, L16, L17,      \
-    L21, L22, L23, L24, L25, L26, L27,      \
-    L31, L32, L33, L34, L35, L36, L37,      \
-    L41, L42, L43, L44, L45, L46,           \
-    L51, L52, L53, L54,                     \
-                        L55, L56,           \
+    L11, L12, L13, L14, L15, L16, L17, \
+    L21, L22, L23, L24, L25, L26, L27, \
+    L31, L32, L33, L34, L35, L36, L37, \
+    L41, L42, L43, L44, L45, L46, \
+    L51, L52, L53, L54, \
+                        L55, L56, \
                                   L65, L66, \
                                   L63, L64, \
          R11, R12, R13, R14, R15, R16, R17, \
@@ -25,21 +18,20 @@
          R31, R32, R33, R34, R35, R36, R37, \
               R42, R43, R44, R45, R46, R47, \
                         R54, R55, R56, R57, \
-              R52, R53,                     \
-    R62, R63,                               \
-    R64, R65                                \
-  ) \
-  { \
-    { L11,   L12,   L13, L14, L15, L16,   L17   }, \
-    { L21,   L22,   L23, L24, L25, L26,   L27   }, \
-    { L31,   L32,   L33, L34, L35, L36,   L37   }, \
-    { L41,   L42,   L43, L44, L45, L46,   KC_NO }, \
-    { L51,   L52,   L53, L54, L55, L56,   KC_NO }, \
-    { KC_NO, KC_NO, L63, L64, L65, L66,   KC_NO }, \
-    { R11,   R12,   R13, R14, R15, R16,   R17   }, \
-    { R21,   R22,   R23, R24, R25, R26,   R27   }, \
-    { R31,   R32,   R33, R34, R35, R36,   R37   }, \
-    { KC_NO, R42,   R43, R44, R45, R46,   R47   }, \
-    { KC_NO, R52,   R53, R54, R55, R56,   R57   }, \
-    { KC_NO, R62,   R63, R64, R65, KC_NO, KC_NO }  \
+              R52, R53, \
+    R62, R63, \
+    R64, R65 \
+) { \
+    { L11, L12, L13, L14, L15, L16, L17 }, \
+    { L21, L22, L23, L24, L25, L26, L27 }, \
+    { L31, L32, L33, L34, L35, L36, L37 }, \
+    { L41, L42, L43, L44, L45, L46, XXX }, \
+    { L51, L52, L53, L54, L55, L56, XXX }, \
+    { XXX, XXX, L63, L64, L65, L66, XXX }, \
+    { R11, R12, R13, R14, R15, R16, R17 }, \
+    { R21, R22, R23, R24, R25, R26, R27 }, \
+    { R31, R32, R33, R34, R35, R36, R37 }, \
+    { XXX, R42, R43, R44, R45, R46, R47 }, \
+    { XXX, R52, R53, R54, R55, R56, R57 }, \
+    { XXX, R62, R63, R64, R65, XXX, XXX } \
 }
-- 
cgit v1.2.3