aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-22 17:14:44 +0000
committerQMK Bot <hello@qmk.fm>2021-04-22 17:14:44 +0000
commit6be87836dcd6a6cb4b75bf631f8b158d72691cf9 (patch)
tree94c5c1145979fd2f54c8cfdc8b566988b1c565dd
parent417803d7ae7a1fa84658ca547498c8d815543f20 (diff)
parentffa1507c2c27cf9d1e6fcceeb5a7810a8d2eae19 (diff)
downloadqmk_firmware-6be87836dcd6a6cb4b75bf631f8b158d72691cf9.tar.gz
qmk_firmware-6be87836dcd6a6cb4b75bf631f8b158d72691cf9.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/planck/config.h3
-rw-r--r--keyboards/planck/keymaps/via/keymap.c97
-rw-r--r--keyboards/planck/keymaps/via/readme.md8
-rw-r--r--keyboards/planck/keymaps/via/rules.mk2
-rw-r--r--keyboards/planck/light/config.h3
-rw-r--r--keyboards/planck/rev1/config.h1
-rw-r--r--keyboards/planck/rev2/config.h1
-rw-r--r--keyboards/planck/rev3/config.h1
-rw-r--r--keyboards/planck/rev4/config.h1
-rw-r--r--keyboards/planck/rev5/config.h1
-rw-r--r--keyboards/planck/rev6/config.h1
11 files changed, 115 insertions, 4 deletions
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index f7dce7020..71111eca2 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -21,8 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21#include "config_common.h" 21#include "config_common.h"
22 22
23/* USB Device descriptor parameter */ 23/* USB Device descriptor parameter */
24#define VENDOR_ID 0xFEED 24#define VENDOR_ID 0x03A8
25#define PRODUCT_ID 0x6060
26#define MANUFACTURER OLKB 25#define MANUFACTURER OLKB
27#define PRODUCT Planck 26#define PRODUCT Planck
28 27
diff --git a/keyboards/planck/keymaps/via/keymap.c b/keyboards/planck/keymaps/via/keymap.c
new file mode 100644
index 000000000..d469cd6ae
--- /dev/null
+++ b/keyboards/planck/keymaps/via/keymap.c
@@ -0,0 +1,97 @@
1/* Copyright 2015-2017 Jack Humbert
2 * Updated 2020 mixedfeelings
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#include QMK_KEYBOARD_H
19
20#define LOWER FN_MO13
21#define RAISE FN_MO23
22
23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24
25 /* Qwerty
26 * ,-----------------------------------------------------------------------------------.
27 * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
28 * |------+------+------+------+------+------+------+------+------+------+------+------|
29 * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
30 * |------+------+------+------+------+------+------+------+------+------+------+------|
31 * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
32 * |------+------+------+------+------+------+------+------+------+------+------+------|
33 * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
34 * `-----------------------------------------------------------------------------------'
35 */
36 [0] = LAYOUT_ortho_4x12 (
37 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
38 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
39 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT,
40 KC_NO, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
41 ),
42
43 /* Lower
44 * ,-----------------------------------------------------------------------------------.
45 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
46 * |------+------+------+------+------+------+------+------+------+------+------+------|
47 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
48 * |------+------+------+------+------+------+------+------+------+------+------+------|
49 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | |
50 * |------+------+------+------+------+------+------+------+------+------+------+------|
51 * | | | | | | | | Next | Vol- | Vol+ | Play |
52 * `-----------------------------------------------------------------------------------'
53 */
54 [1] = LAYOUT_ortho_4x12 (
55 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
56 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
57 KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, KC_TRNS,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
59 ),
60
61 /* Raise
62 * ,-----------------------------------------------------------------------------------.
63 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
64 * |------+------+------+------+------+------+------+------+------+------+------+------|
65 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
66 * |------+------+------+------+------+------+------+------+------+------+------+------|
67 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | |
68 * |------+------+------+------+------+------+------+------+------+------+------+------|
69 * | | | | | | | | Next | Vol- | Vol+ | Play |
70 * `-----------------------------------------------------------------------------------'
71 */
72 [2] = LAYOUT_ortho_4x12 (
73 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
74 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
75 KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, KC_TRNS,
76 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
77 ),
78
79 /* Utility
80 * ,-----------------------------------------------------------------------------------.
81 * | |RESET |DEBUG | | | | | | | | |Del |
82 * |------+------+------+------+------+------+------+------+------+------+------+------|
83 * | | | | | | | | | | | | |
84 * |------+------+------+------+------+------+------+------+------+------+------+------|
85 * | | | | | | | | | | | | |
86 * |------+------+------+------+------+------+------+------+------+------+------+------|
87 * | | | | | | | | | | | |
88 * `-----------------------------------------------------------------------------------'
89 */
90 [3] = LAYOUT_ortho_4x12 (
91 KC_TRNS, RESET, DEBUG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
92 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
93 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
94 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
95 )
96
97};
diff --git a/keyboards/planck/keymaps/via/readme.md b/keyboards/planck/keymaps/via/readme.md
new file mode 100644
index 000000000..a3cd80f1d
--- /dev/null
+++ b/keyboards/planck/keymaps/via/readme.md
@@ -0,0 +1,8 @@
1# VIA QWERTY layout for Planck Rev6
2A heavily simplified version of the Planck Layout that deals with VIA layer limit by stripping out Dvorak, Colemak, and Plover layouts as well as all internal audio, lighting, and mod switching keys.
3
4Predefined Layers:
5- 0 - Default Planck QWERTY keymap (minus lighting control, plus SHIFT ENTER)
6- 1 - Default Planck LOWER keymap
7- 2 - Default Planck RAISE keymap
8- 3 - UTILITY keymap (RESET, DEBUG)
diff --git a/keyboards/planck/keymaps/via/rules.mk b/keyboards/planck/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/planck/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
index c570ec766..ccf9f0984 100644
--- a/keyboards/planck/light/config.h
+++ b/keyboards/planck/light/config.h
@@ -5,8 +5,7 @@
5 5
6#undef PRODUCT 6#undef PRODUCT
7#define PRODUCT Planck Light 7#define PRODUCT Planck Light
8#undef PRODUCT_ID 8#define PRODUCT_ID 0xBEA2
9#define PRODUCT_ID 0x6065
10#define DEVICE_VER 0x0001 9#define DEVICE_VER 0x0001
11 10
12#undef MATRIX_ROW_PINS 11#undef MATRIX_ROW_PINS
diff --git a/keyboards/planck/rev1/config.h b/keyboards/planck/rev1/config.h
index 397887a73..82f9acd8f 100644
--- a/keyboards/planck/rev1/config.h
+++ b/keyboards/planck/rev1/config.h
@@ -1,3 +1,4 @@
1#pragma once 1#pragma once
2 2
3#define PRODUCT_ID 0xAE01
3#define DEVICE_VER 0x0001 4#define DEVICE_VER 0x0001
diff --git a/keyboards/planck/rev2/config.h b/keyboards/planck/rev2/config.h
index bed78bca3..09ec6c447 100644
--- a/keyboards/planck/rev2/config.h
+++ b/keyboards/planck/rev2/config.h
@@ -1,3 +1,4 @@
1#pragma once 1#pragma once
2 2
3#define PRODUCT_ID 0xAE01
3#define DEVICE_VER 0x0002 4#define DEVICE_VER 0x0002
diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h
index fd6f0460e..a57e42dfb 100644
--- a/keyboards/planck/rev3/config.h
+++ b/keyboards/planck/rev3/config.h
@@ -1,3 +1,4 @@
1#pragma once 1#pragma once
2 2
3#define PRODUCT_ID 0xAE01
3#define DEVICE_VER 0x0003 4#define DEVICE_VER 0x0003
diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h
index 572852bbf..c802efa8d 100644
--- a/keyboards/planck/rev4/config.h
+++ b/keyboards/planck/rev4/config.h
@@ -1,3 +1,4 @@
1#pragma once 1#pragma once
2 2
3#define PRODUCT_ID 0xAE01
3#define DEVICE_VER 0x0004 4#define DEVICE_VER 0x0004
diff --git a/keyboards/planck/rev5/config.h b/keyboards/planck/rev5/config.h
index 936922078..c2ff086f3 100644
--- a/keyboards/planck/rev5/config.h
+++ b/keyboards/planck/rev5/config.h
@@ -1,3 +1,4 @@
1#pragma once 1#pragma once
2 2
3#define PRODUCT_ID 0xAE01
3#define DEVICE_VER 0x0005 4#define DEVICE_VER 0x0005
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 055610c69..63c44001f 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -19,6 +19,7 @@
19#define REV6_CONFIG_H 19#define REV6_CONFIG_H
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define PRODUCT_ID 0xA4F9
22#define DEVICE_VER 0x0006 23#define DEVICE_VER 0x0006
23 24
24#undef MATRIX_ROWS 25#undef MATRIX_ROWS