summaryrefslogtreecommitdiffstats
path: root/keyboards/clueboard_66
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/clueboard_66')
-rw-r--r--keyboards/clueboard_66/Makefile5
-rw-r--r--keyboards/clueboard_66/clueboard_66.h10
-rw-r--r--keyboards/clueboard_66/config.h11
-rw-r--r--keyboards/clueboard_66/readme.md2
-rw-r--r--keyboards/clueboard_66/rev1/Makefile3
-rw-r--r--keyboards/clueboard_66/rev1/config.h2
-rw-r--r--keyboards/clueboard_66/rev2/Makefile3
-rw-r--r--keyboards/clueboard_66/rev2/config.h2
-rw-r--r--keyboards/clueboard_66/rev2/rev2.h2
-rw-r--r--keyboards/clueboard_66/rev3/config.h2
-rw-r--r--keyboards/clueboard_66/rev3/rev3.h2
-rw-r--r--keyboards/clueboard_66/rules.mk2
-rw-r--r--keyboards/clueboard_66/subproject.mk1
13 files changed, 13 insertions, 34 deletions
diff --git a/keyboards/clueboard_66/Makefile b/keyboards/clueboard_66/Makefile
deleted file mode 100644
index b9bada8f8d..0000000000
--- a/keyboards/clueboard_66/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBPROJECT_DEFAULT = rev2
-
-ifndef MAKEFILE_INCLUDED
- include ../../Makefile
-endif \ No newline at end of file
diff --git a/keyboards/clueboard_66/clueboard_66.h b/keyboards/clueboard_66/clueboard_66.h
index 295a596d5a..c8989983d0 100644
--- a/keyboards/clueboard_66/clueboard_66.h
+++ b/keyboards/clueboard_66/clueboard_66.h
@@ -1,16 +1,16 @@
#ifndef CLUEBOARD_H
#define CLUEBOARD_H
-#ifdef SUBPROJECT_rev1
+#include "quantum.h"
+
+#ifdef KEYBOARD_clueboard_66_rev1
#include "rev1.h"
#endif
-#ifdef SUBPROJECT_rev2
+#ifdef KEYBOARD_clueboard_66_rev2
#include "rev2.h"
#endif
-#ifdef SUBPROJECT_rev3
+#ifdef KEYBOARD_clueboard_66_rev3
#include "rev3.h"
#endif
-#include "quantum.h"
-
#endif
diff --git a/keyboards/clueboard_66/config.h b/keyboards/clueboard_66/config.h
index 0d4e6a8746..eaf3e073fb 100644
--- a/keyboards/clueboard_66/config.h
+++ b/keyboards/clueboard_66/config.h
@@ -60,15 +60,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-
-#ifdef SUBPROJECT_rev1
- #include "rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
- #include "rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev3
- #include "rev3/config.h"
-#endif
-
#endif
diff --git a/keyboards/clueboard_66/readme.md b/keyboards/clueboard_66/readme.md
index 13859bc242..c2423096ec 100644
--- a/keyboards/clueboard_66/readme.md
+++ b/keyboards/clueboard_66/readme.md
@@ -13,6 +13,6 @@ A fully customizable 66% keyboard.
Make example for this keyboard (after setting up your build environment):
- make clueboard-rev3-default
+ make clueboard/rev3:default
See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/clueboard_66/rev1/Makefile b/keyboards/clueboard_66/rev1/Makefile
deleted file mode 100644
index 191c6bb664..0000000000
--- a/keyboards/clueboard_66/rev1/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef MAKEFILE_INCLUDED
- include ../../../Makefile
-endif \ No newline at end of file
diff --git a/keyboards/clueboard_66/rev1/config.h b/keyboards/clueboard_66/rev1/config.h
index f40876ffbf..519e4d3ecb 100644
--- a/keyboards/clueboard_66/rev1/config.h
+++ b/keyboards/clueboard_66/rev1/config.h
@@ -1,7 +1,7 @@
#ifndef REV2_CONFIG_H
#define REV2_CONFIG_H
-#include "../config.h"
+#include "config_common.h"
#define PRODUCT_ID 0x2301
#define DEVICE_VER 0x0003
diff --git a/keyboards/clueboard_66/rev2/Makefile b/keyboards/clueboard_66/rev2/Makefile
deleted file mode 100644
index 191c6bb664..0000000000
--- a/keyboards/clueboard_66/rev2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef MAKEFILE_INCLUDED
- include ../../../Makefile
-endif \ No newline at end of file
diff --git a/keyboards/clueboard_66/rev2/config.h b/keyboards/clueboard_66/rev2/config.h
index bc34fc07bb..3c22c5b4a6 100644
--- a/keyboards/clueboard_66/rev2/config.h
+++ b/keyboards/clueboard_66/rev2/config.h
@@ -1,7 +1,7 @@
#ifndef REV2_CONFIG_H
#define REV2_CONFIG_H
-#include "../config.h"
+#include "config_common.h"
#define PRODUCT_ID 0x2320
#define DEVICE_VER 0x0001
diff --git a/keyboards/clueboard_66/rev2/rev2.h b/keyboards/clueboard_66/rev2/rev2.h
index 75015ec024..da7ce500f9 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 "clueboard_66.h"
/* Clueboard matrix layout
* ,-----------------------------------------------------------. ,---.
diff --git a/keyboards/clueboard_66/rev3/config.h b/keyboards/clueboard_66/rev3/config.h
index cd12db22e1..5e645c78f0 100644
--- a/keyboards/clueboard_66/rev3/config.h
+++ b/keyboards/clueboard_66/rev3/config.h
@@ -1,7 +1,7 @@
#ifndef REV3_CONFIG_H
#define REV3_CONFIG_H
-#include "../config.h"
+#include "config_common.h"
#define PRODUCT_ID 0x2370
#define DEVICE_VER 0x0001
diff --git a/keyboards/clueboard_66/rev3/rev3.h b/keyboards/clueboard_66/rev3/rev3.h
index fd6f983441..7fd243c809 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 "clueboard_66.h"
/* Clueboard matrix layout
* ,-----------------------------------------------------------. ,---.
diff --git a/keyboards/clueboard_66/rules.mk b/keyboards/clueboard_66/rules.mk
index afbb531a24..abab3bd5b7 100644
--- a/keyboards/clueboard_66/rules.mk
+++ b/keyboards/clueboard_66/rules.mk
@@ -19,3 +19,5 @@ RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality
MIDI_ENABLE = no # MIDI controls
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+
+DEFAULT_FOLDER = clueboard_66/rev2
diff --git a/keyboards/clueboard_66/subproject.mk b/keyboards/clueboard_66/subproject.mk
deleted file mode 100644
index 7c9b39598d..0000000000
--- a/keyboards/clueboard_66/subproject.mk
+++ /dev/null
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = rev2