From: skullY <skullydazed@gmail.com>
Date: Sat, 21 Oct 2017 20:51:02 +0000 (-0700)
Subject: Fix the naming for clueboard files
X-Git-Url: https://git.donarmstrong.com/?p=qmk_firmware.git;a=commitdiff_plain;h=9bb259b660925c7a5cd64b3a0a4484cdf757b504

Fix the naming for clueboard files
---

diff --git a/docs/contributing.md b/docs/contributing.md
index 755dd012f..58af8ce53 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -80,7 +80,7 @@ We have a few different types of changes in QMK, each requiring a different leve
 * Make sure your code change actually compiles.
   * Keymaps: Make sure that `make keyboard:your_new_keymap` does not return an error
   * Keyboards: Make sure that `make keyboard:all` does not return any errors
-  * Core: Make sure that `make allkb` does not return any errors.
+  * Core: Make sure that `make all` does not return any errors.
 * Make sure commit messages are understandable on their own. You should put a short description (no more than 70 characters) on the first line, the second line should be empty, and on the 3rd and later lines you should describe your commit in detail, if required. Example:
 
 ```
diff --git a/keyboards/clueboard/17/17.c b/keyboards/clueboard/17/17.c
new file mode 100644
index 000000000..f84e3253e
--- /dev/null
+++ b/keyboards/clueboard/17/17.c
@@ -0,0 +1,60 @@
+#include "17.h"
+
+int pwm_level;
+
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+    matrix_init_user();
+
+    // JTAG disable for PORT F. write JTD bit twice within four cycles.
+    MCUCR |= (1<<JTD);
+    MCUCR |= (1<<JTD);
+};
+
+void led_set_kb(uint8_t usb_led)
+{
+    print("led_set\n");
+}
+
+void backlight_init_ports(void)
+{
+    // Set C7 to output
+    DDRC |= (1<<7);
+
+    // Initialize the timer
+    TC4H = 0x03;
+    OCR4C = 0xFF;
+    TCCR4A = 0b10000010;
+    TCCR4B = 0b00000001;
+}
+
+void backlight_set(uint8_t level)
+{
+    // Determine the PWM level
+    switch (level)
+    {
+        case 0:
+            // 33%
+            pwm_level = 0x54;
+            break;
+        case 1:
+            // 66%
+            pwm_level = 0xA8;
+            break;
+        case 2:
+            // 100%
+            pwm_level = 0xFF;
+            break;
+        case 3:
+            // 0%
+            pwm_level = 0x00;
+            break;
+        default:
+            xprintf("Unknown level: %d\n", level);
+    }
+
+    // Write the PWM level to the timer
+    TC4H = pwm_level >> 8;
+    OCR4A = 0xFF & pwm_level;
+}
diff --git a/keyboards/clueboard/17/17.h b/keyboards/clueboard/17/17.h
new file mode 100644
index 000000000..5e4a5999e
--- /dev/null
+++ b/keyboards/clueboard/17/17.h
@@ -0,0 +1,36 @@
+#ifndef CLUEPAD_H
+#define CLUEPAD_H
+
+#include "quantum.h"
+
+
+/* Cluepad matrix layout
+ * .-------------------.
+ * |NLCK|   /|   *|   -|
+ * |-------------------|
+ * |   7|   8|   9|    |
+ * |--------------|    |
+ * |   4|   5|   6|   +|
+ * |-------------------|
+ * |   1|   2|   3|    |
+ * |--------------|    |
+ * |        0|   .| Ent|
+ * '-------------------'
+ */
+// The first section contains all of the arguments
+// The second converts the arguments into a two-dimensional array
+#define KEYMAP( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, \
+    k30, k31, k32, k33, \
+    k40,      k42 \
+) { \
+    { k00, k01, k02, k03, }, \
+    { k10, k11, k12, k13, }, \
+    { k20, k21, k22, KC_NO, }, \
+    { k30, k31, k32, k33, }, \
+    { k40, KC_NO, k42, KC_NO } \
+}
+
+#endif
diff --git a/keyboards/clueboard/17/clueboard_17.c b/keyboards/clueboard/17/clueboard_17.c
deleted file mode 100644
index 04cc81217..000000000
--- a/keyboards/clueboard/17/clueboard_17.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "clueboard_17.h"
-
-int pwm_level;
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-
-    // JTAG disable for PORT F. write JTD bit twice within four cycles.
-    MCUCR |= (1<<JTD);
-    MCUCR |= (1<<JTD);
-};
-
-void led_set_kb(uint8_t usb_led)
-{
-    print("led_set\n");
-}
-
-void backlight_init_ports(void)
-{
-    // Set C7 to output
-    DDRC |= (1<<7);
-
-    // Initialize the timer
-    TC4H = 0x03;
-    OCR4C = 0xFF;
-    TCCR4A = 0b10000010;
-    TCCR4B = 0b00000001;
-}
-
-void backlight_set(uint8_t level)
-{
-    // Determine the PWM level
-    switch (level)
-    {
-        case 0:
-            // 33%
-            pwm_level = 0x54;
-            break;
-        case 1:
-            // 66%
-            pwm_level = 0xA8;
-            break;
-        case 2:
-            // 100%
-            pwm_level = 0xFF;
-            break;
-        case 3:
-            // 0%
-            pwm_level = 0x00;
-            break;
-        default:
-            xprintf("Unknown level: %d\n", level);
-    }
-
-    // Write the PWM level to the timer
-    TC4H = pwm_level >> 8;
-    OCR4A = 0xFF & pwm_level;
-}
diff --git a/keyboards/clueboard/17/clueboard_17.h b/keyboards/clueboard/17/clueboard_17.h
deleted file mode 100644
index 5e4a5999e..000000000
--- a/keyboards/clueboard/17/clueboard_17.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef CLUEPAD_H
-#define CLUEPAD_H
-
-#include "quantum.h"
-
-
-/* Cluepad matrix layout
- * .-------------------.
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|    |
- * |--------------|    |
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3|    |
- * |--------------|    |
- * |        0|   .| Ent|
- * '-------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define KEYMAP( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, k33, \
-    k40,      k42 \
-) { \
-    { k00, k01, k02, k03, }, \
-    { k10, k11, k12, k13, }, \
-    { k20, k21, k22, KC_NO, }, \
-    { k30, k31, k32, k33, }, \
-    { k40, KC_NO, k42, KC_NO } \
-}
-
-#endif
diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
index 7a0d51851..e8f3525a8 100644
--- a/keyboards/clueboard/17/keymaps/default/keymap.c
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_17.h"
+#include "17.h"
 
 #include "backlight.h"
 
diff --git a/keyboards/clueboard/60/60.c b/keyboards/clueboard/60/60.c
new file mode 100644
index 000000000..aac4e94c3
--- /dev/null
+++ b/keyboards/clueboard/60/60.c
@@ -0,0 +1,24 @@
+/* Copyright 2017 skully <skullydazed@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "60.h"
+
+void matrix_init_kb(void) {
+
+}
+
+void matrix_scan_kb(void) {
+
+}
diff --git a/keyboards/clueboard/60/60.h b/keyboards/clueboard/60/60.h
new file mode 100644
index 000000000..ffff18f9e
--- /dev/null
+++ b/keyboards/clueboard/60/60.h
@@ -0,0 +1,105 @@
+/* Copyright 2017 skully <skullydazed@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef CLUEBOARD60_H
+#define CLUEBOARD60_H
+
+#include "quantum.h"
+
+/*
+ * These are shortcuts to help you work with the various layout options. If your 
+ * keymap works with one of the LAYOUT_...() macros you are encouraged to use that
+ * and to contribute your keymap to the corresponding layout in 
+ * `qmk_firmware/layouts/community`.
+ */
+
+/* The fully-featured KEYMAP() that has every single key available in the matrix.
+ */
+#define KEYMAP(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
+     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,  k2e, \
+    k30, k31,  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, k3e, \
+    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, k2e, }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, k3e, }, \
+    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
+}
+
+/* A layout that matches the Apple Extended Keyboard's main area. No split keys,
+ * 3 mods on either side of the spacebar.
+ */
+#define KEYMAP_AEK(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,   k0e, \
+     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
+     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
+       k30,   k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c, \
+    k40,  k41,  k42,               k47,                         k4b, k4c, k4e \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, KC_NO, k2e, }, \
+    { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO, }, \
+    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4b, k4c, KC_NO, k4e, }, \
+}
+
+/* Standard 60% ANSI layout */
+#define LAYOUT_60_ansi(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,   k0e, \
+     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
+     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
+       k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,        k3c, \
+    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, KC_NO, k2e, }, \
+    { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO, }, \
+    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
+}
+
+/* Standard 60% ISO layout */
+#define LAYOUT_60_iso(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,   k0e, \
+     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   \
+     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,  k2e, \
+    k30, k31,  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, \
+    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, KC_NO, }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, k2e, }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO, }, \
+    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
+}
+
+/* Split Backspace and Right Shift ANSI layout. */
+#define LAYOUT_60_ansi_split_bs_rshift(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
+     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
+       k30,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, k3e, \
+    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, KC_NO, k2e, }, \
+    { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, k3e, }, \
+    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
+}
+#endif
diff --git a/keyboards/clueboard/60/clueboard_60.c b/keyboards/clueboard/60/clueboard_60.c
deleted file mode 100644
index a0b74db72..000000000
--- a/keyboards/clueboard/60/clueboard_60.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2017 skully <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "clueboard_60.h"
-
-void matrix_init_kb(void) {
-
-}
-
-void matrix_scan_kb(void) {
-
-}
diff --git a/keyboards/clueboard/60/clueboard_60.h b/keyboards/clueboard/60/clueboard_60.h
deleted file mode 100644
index ffff18f9e..000000000
--- a/keyboards/clueboard/60/clueboard_60.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2017 skully <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef CLUEBOARD60_H
-#define CLUEBOARD60_H
-
-#include "quantum.h"
-
-/*
- * These are shortcuts to help you work with the various layout options. If your 
- * keymap works with one of the LAYOUT_...() macros you are encouraged to use that
- * and to contribute your keymap to the corresponding layout in 
- * `qmk_firmware/layouts/community`.
- */
-
-/* The fully-featured KEYMAP() that has every single key available in the matrix.
- */
-#define KEYMAP(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
-     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,  k2e, \
-    k30, k31,  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, k3e, \
-    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, k2e, }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, k3e, }, \
-    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
-}
-
-/* A layout that matches the Apple Extended Keyboard's main area. No split keys,
- * 3 mods on either side of the spacebar.
- */
-#define KEYMAP_AEK(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,   k0e, \
-     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
-     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
-       k30,   k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c, \
-    k40,  k41,  k42,               k47,                         k4b, k4c, k4e \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, KC_NO, k2e, }, \
-    { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO, }, \
-    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4b, k4c, KC_NO, k4e, }, \
-}
-
-/* Standard 60% ANSI layout */
-#define LAYOUT_60_ansi(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,   k0e, \
-     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
-     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
-       k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,        k3c, \
-    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, KC_NO, k2e, }, \
-    { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO, }, \
-    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
-}
-
-/* Standard 60% ISO layout */
-#define LAYOUT_60_iso(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,   k0e, \
-     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   \
-     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,  k2e, \
-    k30, k31,  k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, \
-    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO, k0e, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, KC_NO, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, k2e, }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO, }, \
-    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
-}
-
-/* Split Backspace and Right Shift ANSI layout. */
-#define LAYOUT_60_ansi_split_bs_rshift(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-     k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
-     k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
-       k30,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, k3e, \
-    k40,  k41,  k42,               k47,                    k4a, k4b, k4c, k4e \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, KC_NO, k2e, }, \
-    { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, k3e, }, \
-    { k40, k41, k42, KC_NO, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, k4b, k4c, KC_NO, k4e, }, \
-}
-#endif
diff --git a/keyboards/clueboard/60/keymaps/default/keymap.c b/keyboards/clueboard/60/keymaps/default/keymap.c
index e662057f0..1b0c71264 100644
--- a/keyboards/clueboard/60/keymaps/default/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_60.h"
+#include "60.h"
 
 #define _______ KC_TRNS
 
diff --git a/keyboards/clueboard/60/keymaps/default_aek/keymap.c b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
index d2d3db772..63b1d8ba2 100644
--- a/keyboards/clueboard/60/keymaps/default_aek/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_60.h"
+#include "60.h"
 
 #define _______ KC_TRNS
 
diff --git a/keyboards/clueboard/66/66.c b/keyboards/clueboard/66/66.c
new file mode 100644
index 000000000..15d7422f1
--- /dev/null
+++ b/keyboards/clueboard/66/66.c
@@ -0,0 +1 @@
+#include "66.h"
diff --git a/keyboards/clueboard/66/66.h b/keyboards/clueboard/66/66.h
new file mode 100644
index 000000000..c8989983d
--- /dev/null
+++ b/keyboards/clueboard/66/66.h
@@ -0,0 +1,16 @@
+#ifndef CLUEBOARD_H
+#define CLUEBOARD_H
+
+#include "quantum.h"
+
+#ifdef KEYBOARD_clueboard_66_rev1
+    #include "rev1.h"
+#endif
+#ifdef KEYBOARD_clueboard_66_rev2
+    #include "rev2.h"
+#endif
+#ifdef KEYBOARD_clueboard_66_rev3
+    #include "rev3.h"
+#endif
+
+#endif
diff --git a/keyboards/clueboard/66/clueboard_66.c b/keyboards/clueboard/66/clueboard_66.c
deleted file mode 100644
index 1e000e62d..000000000
--- a/keyboards/clueboard/66/clueboard_66.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "clueboard_66.h"
diff --git a/keyboards/clueboard/66/clueboard_66.h b/keyboards/clueboard/66/clueboard_66.h
deleted file mode 100644
index c8989983d..000000000
--- a/keyboards/clueboard/66/clueboard_66.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef CLUEBOARD_H
-#define CLUEBOARD_H
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_clueboard_66_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_clueboard_66_rev2
-    #include "rev2.h"
-#endif
-#ifdef KEYBOARD_clueboard_66_rev3
-    #include "rev3.h"
-#endif
-
-#endif
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index bc50afa2f..d23b4cb84 100644
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index 78eb43390..4a5fa72db 100644
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
index b2921cca2..4759823e8 100644
--- a/keyboards/clueboard/66/keymaps/colemak/keymap.c
+++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c
index ad623c548..869165392 100644
--- a/keyboards/clueboard/66/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
index dd38e904c..9b03ae3ad 100644
--- a/keyboards/clueboard/66/keymaps/jokrik/keymap.c
+++ b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
index 8c3568e59..8f54a7bea 100644
--- a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index 6df7d7869..66915de1b 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
index 260f97477..bf577d1aa 100644
--- a/keyboards/clueboard/66/keymaps/maximised/keymap.c
+++ b/keyboards/clueboard/66/keymaps/maximised/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index 15e068aa1..e3422a5a6 100644
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
index 112670d66..1c9f21d42 100644
--- a/keyboards/clueboard/66/keymaps/serubin/keymap.c
+++ b/keyboards/clueboard/66/keymaps/serubin/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
index 0d57e38a1..cf6223efb 100644
--- a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/skully/keymap.c b/keyboards/clueboard/66/keymaps/skully/keymap.c
index 2e23948b2..8ec2bed07 100644
--- a/keyboards/clueboard/66/keymaps/skully/keymap.c
+++ b/keyboards/clueboard/66/keymaps/skully/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
index c61b32f8b..095623ccc 100644
--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index 4bf2465a9..4eeb719f9 100644
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 #include "tetris_text.h"
 
 // Helpful defines
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index dab959bdc..91f5250c7 100644
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index fb83aaa24..83c9a6716 100644
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/xyverz/keymap.c b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
index b725b11dd..d7093f0a3 100644
--- a/keyboards/clueboard/66/keymaps/xyverz/keymap.c
+++ b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
@@ -1,7 +1,7 @@
 // Xyverz' keymap.
 // It's based on the default keymap, but Dvorak!
 
-#include "clueboard_66.h"
+#include "66.h"
 
 // Used for SHIFT_ESC
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
diff --git a/keyboards/clueboard/66/rev1/rev1.h b/keyboards/clueboard/66/rev1/rev1.h
index cc94085f9..ca54df1ec 100644
--- a/keyboards/clueboard/66/rev1/rev1.h
+++ b/keyboards/clueboard/66/rev1/rev1.h
@@ -1,7 +1,7 @@
 #ifndef REV1_H
 #define REV1_H
 
-#include "../clueboard_66.h"
+#include "../66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard/66/rev2/rev2.h b/keyboards/clueboard/66/rev2/rev2.h
index da7ce500f..9a1b72719 100644
--- a/keyboards/clueboard/66/rev2/rev2.h
+++ b/keyboards/clueboard/66/rev2/rev2.h
@@ -1,7 +1,7 @@
 #ifndef REV2_H
 #define REV2_H
 
-#include "clueboard_66.h"
+#include "66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard/66/rev3/rev3.h b/keyboards/clueboard/66/rev3/rev3.h
index 7fd243c80..9f3cdb105 100644
--- a/keyboards/clueboard/66/rev3/rev3.h
+++ b/keyboards/clueboard/66/rev3/rev3.h
@@ -1,7 +1,7 @@
 #ifndef REV3_H
 #define REV3_H
 
-#include "clueboard_66.h"
+#include "66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard/card/card.c b/keyboards/clueboard/card/card.c
new file mode 100644
index 000000000..9b4b397d9
--- /dev/null
+++ b/keyboards/clueboard/card/card.c
@@ -0,0 +1,98 @@
+#include "card.h"
+#define BL_RED OCR1B
+#define BL_GREEN OCR1A
+#define BL_BLUE OCR1C
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+
+	matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+	// put your per-action keyboard code here
+	// runs for every action, just before processing by the firmware
+
+	return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+	led_set_user(usb_led);
+}
+
+void backlight_init_ports(void)
+{
+	// Set B5, B6, and B7 as output
+	DDRB |= (1<<7)|(1<<6)|(1<<5);
+
+	// Setup PWM
+	ICR1 = 0xFFFF;
+	TCCR1A = 0b10101010;
+	TCCR1B = 0b00011001;
+
+	BL_RED = 0xFFFF;
+	BL_GREEN = 0xFFFF;
+	BL_BLUE = 0xFFFF;
+}
+
+void backlight_set(uint8_t level)
+{
+	// Set the RGB color
+	switch (level)
+	{
+	case 0:
+		// Off
+		BL_RED = 0xFFFF;
+		BL_GREEN = 0xFFFF;
+		BL_BLUE = 0xFFFF;
+		break;
+	case 1:
+		// Red
+		BL_RED = 0x0000;
+		BL_GREEN = 0xFFFF;
+		BL_BLUE = 0xFFFF;
+		break;
+	case 2:
+		// Green
+		BL_RED = 0xFFFF;
+		BL_GREEN = 0x0000;
+		BL_BLUE = 0xFFFF;
+		break;
+	case 3:
+		// Blue
+		BL_RED = 0xFFFF;
+		BL_GREEN = 0xFFFF;
+		BL_BLUE = 0x0000;
+		break;
+	case 4:
+		// Magenta
+		BL_RED = 0x4000;
+		BL_GREEN = 0x4000;
+		BL_BLUE = 0x4000;
+		break;
+	case 5:
+		// Purple
+		BL_RED = 0x0000;
+		BL_GREEN = 0xFFFF;
+		BL_BLUE = 0x0000;
+		break;
+	case 6:
+		// Yellow
+		BL_RED = 0x0000;
+		BL_GREEN = 0x0000;
+		BL_BLUE = 0xFFFF;
+		break;
+	default:
+		xprintf("Unknown level: %d\n", level);
+	}
+}
diff --git a/keyboards/clueboard/card/card.h b/keyboards/clueboard/card/card.h
new file mode 100644
index 000000000..3342a0823
--- /dev/null
+++ b/keyboards/clueboard/card/card.h
@@ -0,0 +1,22 @@
+#ifndef CLUECARD_H
+#define CLUECARD_H
+
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+// The first section contains all of the arguements
+// The second converts the arguments into a two-dimensional array
+#define KEYMAP( \
+	k00, k01, k02, \
+	k10, k12, \
+	k20, k21, k22, \
+	k11, \
+	k30, k31, k32 \
+) { \
+	{ k00, k01, k02, }, \
+	{ k10, k11, k12, }, \
+	{ k20, k21, k22, }, \
+	{ k30, k31, k32, } \
+}
+
+#endif
diff --git a/keyboards/clueboard/card/cluecard.c b/keyboards/clueboard/card/cluecard.c
deleted file mode 100644
index 81db252d2..000000000
--- a/keyboards/clueboard/card/cluecard.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "cluecard.h"
-#define BL_RED OCR1B
-#define BL_GREEN OCR1A
-#define BL_BLUE OCR1C
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
-void backlight_init_ports(void)
-{
-	// Set B5, B6, and B7 as output
-	DDRB |= (1<<7)|(1<<6)|(1<<5);
-
-	// Setup PWM
-	ICR1 = 0xFFFF;
-	TCCR1A = 0b10101010;
-	TCCR1B = 0b00011001;
-
-	BL_RED = 0xFFFF;
-	BL_GREEN = 0xFFFF;
-	BL_BLUE = 0xFFFF;
-}
-
-void backlight_set(uint8_t level)
-{
-	// Set the RGB color
-	switch (level)
-	{
-	case 0:
-		// Off
-		BL_RED = 0xFFFF;
-		BL_GREEN = 0xFFFF;
-		BL_BLUE = 0xFFFF;
-		break;
-	case 1:
-		// Red
-		BL_RED = 0x0000;
-		BL_GREEN = 0xFFFF;
-		BL_BLUE = 0xFFFF;
-		break;
-	case 2:
-		// Green
-		BL_RED = 0xFFFF;
-		BL_GREEN = 0x0000;
-		BL_BLUE = 0xFFFF;
-		break;
-	case 3:
-		// Blue
-		BL_RED = 0xFFFF;
-		BL_GREEN = 0xFFFF;
-		BL_BLUE = 0x0000;
-		break;
-	case 4:
-		// Magenta
-		BL_RED = 0x4000;
-		BL_GREEN = 0x4000;
-		BL_BLUE = 0x4000;
-		break;
-	case 5:
-		// Purple
-		BL_RED = 0x0000;
-		BL_GREEN = 0xFFFF;
-		BL_BLUE = 0x0000;
-		break;
-	case 6:
-		// Yellow
-		BL_RED = 0x0000;
-		BL_GREEN = 0x0000;
-		BL_BLUE = 0xFFFF;
-		break;
-	default:
-		xprintf("Unknown level: %d\n", level);
-	}
-}
diff --git a/keyboards/clueboard/card/cluecard.h b/keyboards/clueboard/card/cluecard.h
deleted file mode 100644
index 3342a0823..000000000
--- a/keyboards/clueboard/card/cluecard.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef CLUECARD_H
-#define CLUECARD_H
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define KEYMAP( \
-	k00, k01, k02, \
-	k10, k12, \
-	k20, k21, k22, \
-	k11, \
-	k30, k31, k32 \
-) { \
-	{ k00, k01, k02, }, \
-	{ k10, k11, k12, }, \
-	{ k20, k21, k22, }, \
-	{ k30, k31, k32, } \
-}
-
-#endif
diff --git a/keyboards/clueboard/card/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
index cd87750a8..5fa6ae20a 100644
--- a/keyboards/clueboard/card/keymaps/default/keymap.c
+++ b/keyboards/clueboard/card/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "cluecard.h"
+#include "card.h"
 #ifdef AUDIO_ENABLE
 	#include "audio.h"
 #endif
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
index 74c95ce8a..15cf5325d 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
@@ -1,4 +1,4 @@
-#include "cluecard.h"
+#include "card.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = KEYMAP(