diff options
author | Diego Song <diego.m.song@gmail.com> | 2020-03-19 19:33:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-19 16:33:13 -0700 |
commit | 1c7c5daad4ba78ea42d9bb0a1f74dc57733bf1dc (patch) | |
tree | 8fd7227bb88ab4d90b323102497360600e4f03bd | |
parent | aeab11da8857e5e6d9959993b96782811fbd0a26 (diff) | |
download | qmk_firmware-1c7c5daad4ba78ea42d9bb0a1f74dc57733bf1dc.tar.gz qmk_firmware-1c7c5daad4ba78ea42d9bb0a1f74dc57733bf1dc.zip |
VIA Support for GH60 (#8442)
* VIA Support: GH60 Rev C and GH60 Satan
* Corrected GH60 VIA default keymap
* Corrected GH60 VIA default keymap pt 2
* Copied default keymap over via default keymap
* Satan GH60 default corrected for VIA
* Satan GH60 default corrected for VIA pt 2
* Satan GH60 LTO enable for size
* Transparent 4th dynamic layer for GH60 Via support
* Update keyboards/gh60/revc/info.json
* Update keyboards/gh60/satan/info.json
* Update keyboards/gh60/satan/info.json
* Removed deprecated JSON keys gh60/revc/info.json
* Removed inline comment next to VID for GH60 Satan
-rw-r--r-- | keyboards/gh60/revc/config.h | 9 | ||||
-rw-r--r-- | keyboards/gh60/revc/info.json | 7 | ||||
-rw-r--r-- | keyboards/gh60/revc/keymaps/via/keymap.c | 53 | ||||
-rw-r--r-- | keyboards/gh60/revc/keymaps/via/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/gh60/satan/config.h | 6 | ||||
-rw-r--r-- | keyboards/gh60/satan/info.json | 2 | ||||
-rw-r--r-- | keyboards/gh60/satan/keymaps/via/keymap.c | 53 | ||||
-rw-r--r-- | keyboards/gh60/satan/keymaps/via/rules.mk | 2 |
8 files changed, 121 insertions, 12 deletions
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h index e0cfa7268..8c24b1e7e 100644 --- a/keyboards/gh60/revc/config.h +++ b/keyboards/gh60/revc/config.h | |||
@@ -14,14 +14,17 @@ GNU General Public License for more details. | |||
14 | You should have received a copy of the GNU General Public License | 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/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | */ | 16 | */ |
17 | |||
18 | #pragma once | ||
19 | |||
17 | #include "config_common.h" | 20 | #include "config_common.h" |
18 | 21 | ||
19 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
20 | #define VENDOR_ID 0xFEED | 23 | #define VENDOR_ID 0x4335 // GEEKhack |
21 | #define PRODUCT_ID 0x6060 | 24 | #define PRODUCT_ID 0x0001 |
22 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
23 | #define MANUFACTURER geekhack | 26 | #define MANUFACTURER geekhack |
24 | #define PRODUCT GH60 | 27 | #define PRODUCT GH60 Rev C |
25 | #define DESCRIPTION t.m.k. keyboard firmware for GH60 | 28 | #define DESCRIPTION t.m.k. keyboard firmware for GH60 |
26 | 29 | ||
27 | /* key matrix size */ | 30 | /* key matrix size */ |
diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json index bbfa1f2da..7a8a19c1e 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/info.json | |||
@@ -1,10 +1,7 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "GH60", | 2 | "keyboard_name": "GH60 Rev C", |
3 | "url": "http://qmk.fm/keyboards/gh60", | 3 | "url": "", |
4 | "maintainer": "qmk", | 4 | "maintainer": "qmk", |
5 | "keyboard_folder": "gh60", | ||
6 | "processor": "atmega32u4", | ||
7 | "manufacturer": "geekhack", | ||
8 | "width": 15, | 5 | "width": 15, |
9 | "height": 5, | 6 | "height": 5, |
10 | "layouts": { | 7 | "layouts": { |
diff --git a/keyboards/gh60/revc/keymaps/via/keymap.c b/keyboards/gh60/revc/keymaps/via/keymap.c new file mode 100644 index 000000000..653636c73 --- /dev/null +++ b/keyboards/gh60/revc/keymaps/via/keymap.c | |||
@@ -0,0 +1,53 @@ | |||
1 | /* Copyright 2020 Diego Song | ||
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 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
20 | |||
21 | [0] = LAYOUT_all( /* 0: qwerty */ | ||
22 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, | ||
23 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | ||
24 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, | ||
25 | KC_LSFT, TG(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | ||
26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL | ||
27 | ), | ||
28 | |||
29 | [1] = LAYOUT_all( /* 1: fn */ | ||
30 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | ||
31 | KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
32 | KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
35 | ), | ||
36 | |||
37 | [2] = LAYOUT_all( /* 2: arrows */ | ||
38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, | ||
42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT | ||
43 | ), | ||
44 | |||
45 | [3] = LAYOUT_all( | ||
46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
50 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
51 | ), | ||
52 | |||
53 | }; | ||
diff --git a/keyboards/gh60/revc/keymaps/via/rules.mk b/keyboards/gh60/revc/keymaps/via/rules.mk new file mode 100644 index 000000000..036bd6d1c --- /dev/null +++ b/keyboards/gh60/revc/keymaps/via/rules.mk | |||
@@ -0,0 +1 @@ | |||
VIA_ENABLE = yes \ No newline at end of file | |||
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index d8c9ae9ab..8c172314a 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h | |||
@@ -20,11 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
20 | #include "config_common.h" | 20 | #include "config_common.h" |
21 | 21 | ||
22 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
23 | #define VENDOR_ID 0xFEED | 23 | #define VENDOR_ID 0x4335 |
24 | #define PRODUCT_ID 0x6060 | 24 | #define PRODUCT_ID 0x0002 |
25 | #define DEVICE_VER 0x0003 | 25 | #define DEVICE_VER 0x0003 |
26 | #define MANUFACTURER SATAN | 26 | #define MANUFACTURER SATAN |
27 | #define PRODUCT GH60 | 27 | #define PRODUCT GH60 Satan |
28 | #define DESCRIPTION 60% keyboard with backlight and WS2812 support | 28 | #define DESCRIPTION 60% keyboard with backlight and WS2812 support |
29 | 29 | ||
30 | /* key matrix size */ | 30 | /* key matrix size */ |
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 2b2e96ed1..a805c6cf9 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json | |||
@@ -1,5 +1,5 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "Satan GH60", | 2 | "keyboard_name": "GH60 Satan", |
3 | "url": "", | 3 | "url": "", |
4 | "maintainer": "qmk", | 4 | "maintainer": "qmk", |
5 | "width": 15, | 5 | "width": 15, |
diff --git a/keyboards/gh60/satan/keymaps/via/keymap.c b/keyboards/gh60/satan/keymaps/via/keymap.c new file mode 100644 index 000000000..c9c6acf68 --- /dev/null +++ b/keyboards/gh60/satan/keymaps/via/keymap.c | |||
@@ -0,0 +1,53 @@ | |||
1 | /* Copyright 2020 Diego Song | ||
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 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
20 | |||
21 | [0] = LAYOUT_all( /* 0: qwerty */ | ||
22 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, | ||
23 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | ||
24 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, | ||
25 | KC_LSFT, TG(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | ||
26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL | ||
27 | ), | ||
28 | |||
29 | [1] = LAYOUT_all( /* 1: fn */ | ||
30 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | ||
31 | KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
32 | KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
35 | ), | ||
36 | |||
37 | [2] = LAYOUT_all( /* 2: arrows */ | ||
38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, | ||
42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT | ||
43 | ), | ||
44 | |||
45 | [3] = LAYOUT_all( | ||
46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
50 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
51 | ), | ||
52 | |||
53 | }; \ No newline at end of file | ||
diff --git a/keyboards/gh60/satan/keymaps/via/rules.mk b/keyboards/gh60/satan/keymaps/via/rules.mk new file mode 100644 index 000000000..43061db1d --- /dev/null +++ b/keyboards/gh60/satan/keymaps/via/rules.mk | |||
@@ -0,0 +1,2 @@ | |||
1 | VIA_ENABLE = yes | ||
2 | LTO_ENABLE = yes \ No newline at end of file | ||