summaryrefslogtreecommitdiff
path: root/keyboards/planck
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/planck')
-rw-r--r--keyboards/planck/config.h7
-rw-r--r--keyboards/planck/planck.c2
-rw-r--r--keyboards/planck/planck.h8
-rw-r--r--keyboards/planck/rev3/config.h2
-rw-r--r--keyboards/planck/rev3/rev3.h2
-rw-r--r--keyboards/planck/rev3/rules.mk6
-rw-r--r--keyboards/planck/rev4/config.h2
-rw-r--r--keyboards/planck/rev4/rev4.h2
-rw-r--r--keyboards/planck/rev4/rules.mk6
-rw-r--r--keyboards/planck/rules.mk2
10 files changed, 12 insertions, 27 deletions
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index c86f8491ee..ebaf3fb641 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -81,11 +81,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-#ifdef SUBPROJECT_rev3
- #include "rev3/config.h"
-#endif
-#ifdef SUBPROJECT_rev4
- #include "rev4/config.h"
-#endif
+#include QMK_SUBPROJECT_CONFIG_H
#endif
diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c
index 3980b02f50..caef2fe5fa 100644
--- a/keyboards/planck/planck.c
+++ b/keyboards/planck/planck.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include QMK_KEYBOARD_H
#ifdef ONEHAND_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h
index 10f17b4a46..c055d73cb6 100644
--- a/keyboards/planck/planck.h
+++ b/keyboards/planck/planck.h
@@ -1,12 +1,7 @@
#ifndef PLANCK_H
#define PLANCK_H
-#ifdef SUBPROJECT_rev3
- #include "rev3.h"
-#endif
-#ifdef SUBPROJECT_rev4
- #include "rev4.h"
-#endif
+#include QMK_SUBPROJECT_H
#include "quantum.h"
@@ -37,5 +32,6 @@
}
#define KEYMAP PLANCK_GRID
+#define LAYOUT_ortho_4x12 PLANCK_GRID
#endif
diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h
index cc37874e83..ade11ffe13 100644
--- a/keyboards/planck/rev3/config.h
+++ b/keyboards/planck/rev3/config.h
@@ -1,7 +1,7 @@
#ifndef REV3_CONFIG_H
#define REV3_CONFIG_H
-#include "../config.h"
+#include QMK_KEYBOARD_CONFIG_H
#define DEVICE_VER 0x0003
diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h
index 628951d97d..e5e05236c4 100644
--- a/keyboards/planck/rev3/rev3.h
+++ b/keyboards/planck/rev3/rev3.h
@@ -1,6 +1,6 @@
#ifndef REV3_H
#define REV3_H
-#include "../planck.h"
+#include QMK_KEYBOARD_H
#endif \ No newline at end of file
diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk
index 5594096823..1148571007 100644
--- a/keyboards/planck/rev3/rules.mk
+++ b/keyboards/planck/rev3/rules.mk
@@ -1,5 +1 @@
-AUDIO_ENABLE = no # Audio output on port C6
-
-ifndef QUANTUM_DIR
- include ../../../Makefile
-endif \ No newline at end of file
+AUDIO_ENABLE = no # Audio output on port C6 \ No newline at end of file
diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h
index 98189fba71..dcc76c11c9 100644
--- a/keyboards/planck/rev4/config.h
+++ b/keyboards/planck/rev4/config.h
@@ -1,7 +1,7 @@
#ifndef REV4_CONFIG_H
#define REV4_CONFIG_H
-#include "../config.h"
+#include QMK_KEYBOARD_CONFIG_H
#define DEVICE_VER 0x0004
diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h
index e4cf1800b8..2d35df19d8 100644
--- a/keyboards/planck/rev4/rev4.h
+++ b/keyboards/planck/rev4/rev4.h
@@ -1,6 +1,6 @@
#ifndef REV4_H
#define REV4_H
-#include "../planck.h"
+#include QMK_KEYBOARD_H
#endif \ No newline at end of file
diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk
index 01d848e98c..3b22e0a01b 100644
--- a/keyboards/planck/rev4/rules.mk
+++ b/keyboards/planck/rev4/rules.mk
@@ -1,5 +1 @@
-AUDIO_ENABLE = yes # Audio output on port C6
-
-ifndef QUANTUM_DIR
- include ../../../Makefile
-endif \ No newline at end of file
+AUDIO_ENABLE = yes # Audio output on port C6 \ No newline at end of file
diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk
index 5580bb387b..8f8477c18a 100644
--- a/keyboards/planck/rules.mk
+++ b/keyboards/planck/rules.mk
@@ -66,3 +66,5 @@ API_SYSEX_ENABLE = no
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_4x12 \ No newline at end of file