summaryrefslogtreecommitdiffstats
path: root/keyboards/planck
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-11-14 16:11:29 -0500
committerGitHub <noreply@github.com>2017-11-14 16:11:29 -0500
commitec3e065f0d2c65175384699cb11fa388250fa914 (patch)
treee66837d6af1a30b739303bfa06043edf12f9fcc1 /keyboards/planck
parent3c15c48e6a5c584d225d369ea458f9a3f9cd3d57 (diff)
QMK DFU bootloader generation (#2009)
* adds :bootloader target * update planck and preonic revisions * remove references to .h files for planck * update preonic keymap * only add keyboard.h files that exist * add production target * hook things up with the new lufa variables * update rules for planck/preonic * back backlight key turn of status led when pressed * add manufacturer/product strings to bootloader
Diffstat (limited to 'keyboards/planck')
-rw-r--r--keyboards/planck/config.h7
-rw-r--r--keyboards/planck/keymaps/default/keymap.c2
-rw-r--r--keyboards/planck/planck.h7
-rw-r--r--keyboards/planck/rev3/rev3.c1
-rw-r--r--keyboards/planck/rev3/rev3.h6
-rw-r--r--keyboards/planck/rev4/rev4.c1
-rw-r--r--keyboards/planck/rev4/rev4.h6
-rw-r--r--keyboards/planck/rev5/config.h8
-rw-r--r--keyboards/planck/rev5/info.json3
-rw-r--r--keyboards/planck/rev5/rules.mk1
-rw-r--r--keyboards/planck/rules.mk2
11 files changed, 21 insertions, 23 deletions
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index bc7ec031ec..452a99d746 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define MANUFACTURER OLKB
-#define PRODUCT The Planck Keyboard
+#define PRODUCT Planck
#define DESCRIPTION A compact ortholinear keyboard
/* key matrix size */
@@ -36,6 +36,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
#define UNUSED_PINS
+#define QMK_ESC_OUTPUT F1
+#define QMK_ESC_INPUT D5
+#define QMK_LED E6
+#define QMK_SPEAKER C6
+
#define AUDIO_VOICES
#define C6_AUDIO
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 48b02de38e..87789e1d93 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -224,8 +224,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef BACKLIGHT_ENABLE
backlight_step();
#endif
+ PORTE &= ~(1<<6);
} else {
unregister_code(KC_RSFT);
+ PORTE |= (1<<6);
}
return false;
break;
diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h
index 7638b8cc92..6bc6a03209 100644
--- a/keyboards/planck/planck.h
+++ b/keyboards/planck/planck.h
@@ -32,11 +32,4 @@
#define KEYMAP LAYOUT_planck_grid
#define LAYOUT_ortho_4x12 LAYOUT_planck_grid
-#ifdef KEYBOARD_planck_rev3
- #include "rev3.h"
-#endif
-#ifdef KEYBOARD_planck_rev4
- #include "rev4.h"
-#endif
-
#endif
diff --git a/keyboards/planck/rev3/rev3.c b/keyboards/planck/rev3/rev3.c
deleted file mode 100644
index 9ccd1d8803..0000000000
--- a/keyboards/planck/rev3/rev3.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev3.h" \ No newline at end of file
diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h
deleted file mode 100644
index 50a09741d5..0000000000
--- a/keyboards/planck/rev3/rev3.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef REV3_H
-#define REV3_H
-
-#include "planck.h"
-
-#endif \ No newline at end of file
diff --git a/keyboards/planck/rev4/rev4.c b/keyboards/planck/rev4/rev4.c
deleted file mode 100644
index 98a75d2ed1..0000000000
--- a/keyboards/planck/rev4/rev4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev4.h" \ No newline at end of file
diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h
deleted file mode 100644
index 74ec05460a..0000000000
--- a/keyboards/planck/rev4/rev4.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef REV4_H
-#define REV4_H
-
-#include "planck.h"
-
-#endif \ No newline at end of file
diff --git a/keyboards/planck/rev5/config.h b/keyboards/planck/rev5/config.h
new file mode 100644
index 0000000000..696eda73bc
--- /dev/null
+++ b/keyboards/planck/rev5/config.h
@@ -0,0 +1,8 @@
+#ifndef REV5_CONFIG_H
+#define REV5_CONFIG_H
+
+#include "config_common.h"
+
+#define DEVICE_VER 0x0005
+
+#endif \ No newline at end of file
diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json
new file mode 100644
index 0000000000..3d984961ae
--- /dev/null
+++ b/keyboards/planck/rev5/info.json
@@ -0,0 +1,3 @@
+{
+ "identifier": "FEED:6060:0005"
+} \ No newline at end of file
diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk
new file mode 100644
index 0000000000..3b22e0a01b
--- /dev/null
+++ b/keyboards/planck/rev5/rules.mk
@@ -0,0 +1 @@
+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 27753cfda8..df575cd6be 100644
--- a/keyboards/planck/rules.mk
+++ b/keyboards/planck/rules.mk
@@ -69,4 +69,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
LAYOUTS = ortho_4x12 planck_mit planck_grid
-DEFAULT_FOLDER = planck/rev4
+DEFAULT_FOLDER = planck/rev5