From e724801d3343c3d41cb94559b75f6bf7a5bddd77 Mon Sep 17 00:00:00 2001
From: Bartosz Nowak <9051964+DuMaM@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:42:28 +0200
Subject: [PATCH] [Keyboard] Clean up dactyl manuform unused files (#15890)
---
.../handwired/dactyl_manuform/3x5_3/3x5_3.h | 2 +-
keyboards/handwired/dactyl_manuform/4x5/4x5.h | 2 +-
.../4x5/keymaps/dvorak/config.h | 2 --
.../4x5/keymaps/dvorak/keymap.c | 4 +--
keyboards/handwired/dactyl_manuform/4x6/4x6.h | 2 +-
.../handwired/dactyl_manuform/4x6_5/4x6_5.h | 2 +-
keyboards/handwired/dactyl_manuform/5x6/5x6.h | 2 +-
.../dactyl_manuform/5x6_2_5/5x6_2_5.h | 2 +-
.../handwired/dactyl_manuform/5x6_5/5x6_5.h | 2 +-
keyboards/handwired/dactyl_manuform/5x7/5x7.h | 2 +-
keyboards/handwired/dactyl_manuform/6x6/6x6.h | 2 +-
.../handwired/dactyl_manuform/6x6_4/6x6_4.h | 2 +-
.../dactyl_manuform/6x6_kinesis/6x6_kinesis.h | 2 +-
keyboards/handwired/dactyl_manuform/6x7/6x7.h | 2 +-
.../dactyl_manuform/dactyl_manuform.c | 1 -
.../dactyl_manuform/dactyl_manuform.h | 31 -------------------
.../dactyl_manuform/dmote/62key/62key.h | 2 +-
17 files changed, 14 insertions(+), 50 deletions(-)
delete mode 100644 keyboards/handwired/dactyl_manuform/dactyl_manuform.c
delete mode 100644 keyboards/handwired/dactyl_manuform/dactyl_manuform.h
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
index 7db11618cf9214aa91629f75f68457e7ee887454..0a03dd9b1f8b6f340cf4d38dd8b92fb7b4f8f899 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
@@ -17,7 +17,7 @@ along with this program. If not, see .
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h
index 73f6be64c254326c6bea8f331fdc3910c797d023..e410c22466244ed1890fdde7b78af45ec2230a11 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
index 682c7a868b074c52a2289383700ec37d47e7506a..6b0ddbfe8e3963e89facac8aaec3d8fb664a95ae 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see .
#pragma once
-#include "../../config.h"
-
/* Use I2C or Serial, not both */
#define USE_SERIAL
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
index 0a1c90b6bf8f5b0038a8f70ec77a5a27f369ca8c..009d88fd0e6c637220832a4432c4c607b64c1d1c 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -1,6 +1,4 @@
-#include "dactyl_manuform.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
extern keymap_config_t keymap_config;
diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h
index dcdb1a39ec41d91324808b1ff60458ad25f9ae99..99b11a712a4c4319ca9d22117f36a1bcd76741bb 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
index f34d8be4dff0d5c7b1c3f2357d6e2f242c15f62f..df639cbf2273d00ea05f77d2b8457f735915e02d 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h
index 606a2134929c13d2986f48553194ec56c482e983..ebc959ddf1f536747fc105db913411b4af1303d0 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
index 790fdb069557da2dd8d09f85dc1aed44841120e4..7191119fd9406795fbae3f889e6e0c39b7532a5e 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
@@ -16,7 +16,7 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
index 794b0be9fe93eca71072060fbb6fa491493adaf2..31794265853f1eb4bc0c371981d16fe688aa6d9d 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
index 0c0c781be7c40c92181264d5b1d08f6344484f3a..7cd2597a1f584ab2b40a6240d770e735eb2ea7ed 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
index 7bff55701a25d125818d48fc5ef3a0fdf9c7f1d2..657d057787ff8bb6ad42d0f93982aac4d725f57e 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
index 7c767cae7e8ab60870ee09fee10802e8ac5024d1..74cb474a5ba4e1c575723d2e31c877aff24f6e7d 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
@@ -4,7 +4,7 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
index 00f931281b43038b975d318874edda244d8dc620..1adb7d4696851b13dcb5d771da2cca6be048e314 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
@@ -4,7 +4,7 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
index 8d69ddd097584b5fe32b419519dd978d54793950..bd66c309fce91aad375f4868da88f07e962421b3 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/6x7.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.c b/keyboards/handwired/dactyl_manuform/dactyl_manuform.c
deleted file mode 100644
index 043bbd56728d93aa7463f3c6c381a8f9aa68f5b3..0000000000000000000000000000000000000000
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dactyl_manuform.h"
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
deleted file mode 100644
index c339370f8b4ff6e2d6ce77188dc7842afc1151ab..0000000000000000000000000000000000000000
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_handwired_dactyl_manuform_4x5)
-# include "4x5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6)
-# include "4x6.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6_5)
-# include "4x6_5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6)
-# include "5x6.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_5)
-# include "5x6_5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_2_5)
-# include "5x6_2_5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x7)
-# include "5x7.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
-# include "6x6.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_4)
-# include "6x6_4.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_kinesis)
-# include "6x6_kinesis.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
-# include "6x7.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_3x5_3)
-# include "3x5_3.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)
-# include "62key.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
index 2d52e7e5fb6e42c1d546871392d9a8d912a17708..673164b424152bae5565ae076c2246968ecb3df9 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
@@ -1,6 +1,6 @@
#pragma once
-#include "dactyl_manuform.h"
+#include "quantum.h"
// This uses the same coordinate system as the program that defines
// the case model, but not the same coordinates.