aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerryMathews <terry@terrymathews.net>2020-05-19 16:15:16 -0400
committerGitHub <noreply@github.com>2020-05-19 21:15:16 +0100
commit58e3b01f37b35cdf77fb44f14765b11215104b24 (patch)
tree52f2547b5ecc0df4eb73a69e3e9a577484f3c306
parent6c2008c6883e34aa921223bc841636ee6ae336ad (diff)
downloadqmk_firmware-58e3b01f37b35cdf77fb44f14765b11215104b24.tar.gz
qmk_firmware-58e3b01f37b35cdf77fb44f14765b11215104b24.zip
Candybar: VIA support for lefty and righty (#9066)
* Candybar: VIA support for lefty and righty * Update keyboards/candybar/lefty/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/candybar/righty/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/candybar/lefty/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
-rw-r--r--keyboards/candybar/lefty/config.h4
-rw-r--r--keyboards/candybar/lefty/keymaps/via/keymap.c38
-rw-r--r--keyboards/candybar/lefty/keymaps/via/rules.mk1
-rw-r--r--keyboards/candybar/lefty/rules.mk2
-rw-r--r--keyboards/candybar/righty/config.h4
-rw-r--r--keyboards/candybar/righty/keymaps/via/keymap.c38
-rw-r--r--keyboards/candybar/righty/keymaps/via/rules.mk1
-rw-r--r--keyboards/candybar/righty/rules.mk2
8 files changed, 84 insertions, 6 deletions
diff --git a/keyboards/candybar/lefty/config.h b/keyboards/candybar/lefty/config.h
index c15396713..e8a1f0081 100644
--- a/keyboards/candybar/lefty/config.h
+++ b/keyboards/candybar/lefty/config.h
@@ -19,8 +19,8 @@
19#include "config_common.h" 19#include "config_common.h"
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 22#define VENDOR_ID 0x544B //TK
23#define PRODUCT_ID 0x6060 23#define PRODUCT_ID 0x0003
24#define DEVICE_VER 0x0006 24#define DEVICE_VER 0x0006
25#define MANUFACTURER The Key Company 25#define MANUFACTURER The Key Company
26#define PRODUCT Candybar 26#define PRODUCT Candybar
diff --git a/keyboards/candybar/lefty/keymaps/via/keymap.c b/keyboards/candybar/lefty/keymaps/via/keymap.c
new file mode 100644
index 000000000..153fd99c5
--- /dev/null
+++ b/keyboards/candybar/lefty/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
1/* Copyright 2018 Jack Humbert
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include QMK_KEYBOARD_H
18
19#define _BL 0
20#define _FL 1
21
22const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23 /* Keymap _BL: Base Layer (Default Layer)
24 */
25[_BL] = LAYOUT(
26 KC_P7 , KC_P8, KC_P9 , KC_PAST, KC_ESC , KC_Q , KC_W , KC_E, KC_R , KC_T , KC_Y, KC_U , KC_I , KC_O , KC_P , KC_DEL , KC_BSPC , \
27 KC_P4 , KC_P5, KC_P6 , KC_PMNS, KC_TAB , KC_A , KC_S , KC_D, KC_F , KC_G , KC_H, KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , \
28 KC_P1 , KC_P2, KC_P3 , KC_PPLS, KC_LSFT, KC_Z , KC_X, KC_C , KC_V , KC_B, KC_N , KC_M , KC_COMM, KC_DOT , KC_UP ,KC_RSFT , \
29 MO(_FL), KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC , KC_BSPC, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT),
30
31 /* Keymap _FL: Function Layer
32 */
33 [_FL] = LAYOUT(
34 KC_P7 , KC_P8, KC_P9 , KC_VOLU, RESET , KC_Q , KC_W , KC_E, KC_R , KC_T , KC_Y, KC_U , KC_I , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
35 KC_P4 , KC_P5, KC_P6 , KC_VOLD, KC_TAB , KC_A , KC_SLCK, KC_D, KC_F , KC_G , KC_H, KC_J , KC_K , KC_L , KC_QUOT, KC_BSLS , \
36 KC_P1 , KC_P2, KC_P3 , KC_PEQL, KC_LSFT, KC_Z , KC_X, KC_CAPS, KC_V , KC_B, KC_NLCK, KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
37 KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
38};
diff --git a/keyboards/candybar/lefty/keymaps/via/rules.mk b/keyboards/candybar/lefty/keymaps/via/rules.mk
new file mode 100644
index 000000000..036bd6d1c
--- /dev/null
+++ b/keyboards/candybar/lefty/keymaps/via/rules.mk
@@ -0,0 +1 @@
VIA_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/candybar/lefty/rules.mk b/keyboards/candybar/lefty/rules.mk
index cb1b83288..52ef91c47 100644
--- a/keyboards/candybar/lefty/rules.mk
+++ b/keyboards/candybar/lefty/rules.mk
@@ -7,7 +7,7 @@ MCU = STM32F072
7# EXTRAFLAGS+=-flto 7# EXTRAFLAGS+=-flto
8LINK_TIME_OPTIMIZATION_ENABLE = yes 8LINK_TIME_OPTIMIZATION_ENABLE = yes
9BACKLIGHT_ENABLE = no 9BACKLIGHT_ENABLE = no
10BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) 11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
12MOUSEKEY_ENABLE = no # Mouse keys 12MOUSEKEY_ENABLE = no # Mouse keys
13EXTRAKEY_ENABLE = yes # Audio control and System control 13EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/keyboards/candybar/righty/config.h b/keyboards/candybar/righty/config.h
index c15396713..500453784 100644
--- a/keyboards/candybar/righty/config.h
+++ b/keyboards/candybar/righty/config.h
@@ -19,8 +19,8 @@
19#include "config_common.h" 19#include "config_common.h"
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0xFEED 22#define VENDOR_ID 0x544B //TK
23#define PRODUCT_ID 0x6060 23#define PRODUCT_ID 0x0002
24#define DEVICE_VER 0x0006 24#define DEVICE_VER 0x0006
25#define MANUFACTURER The Key Company 25#define MANUFACTURER The Key Company
26#define PRODUCT Candybar 26#define PRODUCT Candybar
diff --git a/keyboards/candybar/righty/keymaps/via/keymap.c b/keyboards/candybar/righty/keymaps/via/keymap.c
new file mode 100644
index 000000000..8f4cc08c7
--- /dev/null
+++ b/keyboards/candybar/righty/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
1/* Copyright 2018 Jack Humbert
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include QMK_KEYBOARD_H
18
19#define _BL 0
20#define _FL 1
21
22const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23 /* Keymap _BL: Base Layer (Default Layer)
24 */
25[_BL] = LAYOUT(
26 KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, \
27 KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, \
28 KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, \
29 KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_LEFT,KC_DOWN,KC_RGHT,KC_P0,KC_PDOT,KC_PENT),
30
31 /* Keymap _FL: Function Layer
32 */
33[_FL] = LAYOUT(
34 RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
35 KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
36 KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
37 KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
38};
diff --git a/keyboards/candybar/righty/keymaps/via/rules.mk b/keyboards/candybar/righty/keymaps/via/rules.mk
new file mode 100644
index 000000000..036bd6d1c
--- /dev/null
+++ b/keyboards/candybar/righty/keymaps/via/rules.mk
@@ -0,0 +1 @@
VIA_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/candybar/righty/rules.mk b/keyboards/candybar/righty/rules.mk
index cb1b83288..52ef91c47 100644
--- a/keyboards/candybar/righty/rules.mk
+++ b/keyboards/candybar/righty/rules.mk
@@ -7,7 +7,7 @@ MCU = STM32F072
7# EXTRAFLAGS+=-flto 7# EXTRAFLAGS+=-flto
8LINK_TIME_OPTIMIZATION_ENABLE = yes 8LINK_TIME_OPTIMIZATION_ENABLE = yes
9BACKLIGHT_ENABLE = no 9BACKLIGHT_ENABLE = no
10BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) 11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
12MOUSEKEY_ENABLE = no # Mouse keys 12MOUSEKEY_ENABLE = no # Mouse keys
13EXTRAKEY_ENABLE = yes # Audio control and System control 13EXTRAKEY_ENABLE = yes # Audio control and System control