diff options
| author | Rys Sommefeldt <rys@sommefeldt.com> | 2020-02-12 04:33:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 15:33:29 +1100 |
| commit | f318d6fffcda102b9063effb5403598d4bbf1213 (patch) | |
| tree | 6c430ef8304111b9d361aeef900bf2a5dfd3a15b | |
| parent | 177666cbc8d6f9859773f8fc0232ba4b3a1f9a97 (diff) | |
| download | qmk_firmware-f318d6fffcda102b9063effb5403598d4bbf1213.tar.gz qmk_firmware-f318d6fffcda102b9063effb5403598d4bbf1213.zip | |
VIA support for the Think6.5 (#8118)
* VIA support for Think6.5
* VIA support for Think6.5 Hotswap
* VIA works better with separate layout options
* Remove the colours used to help develop it in KLE
* Pay better attention to the JSON linter
* Update Think6.5 PRODUCT and remove VIA JSON defs
6 files changed, 110 insertions, 12 deletions
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h index fc1734146..05a818a73 100644 --- a/keyboards/gray_studio/think65/hotswap/config.h +++ b/keyboards/gray_studio/think65/hotswap/config.h | |||
| @@ -20,12 +20,12 @@ 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 0x4753 |
| 24 | #define PRODUCT_ID 0x0000 | 24 | #define PRODUCT_ID 0x4001 |
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER Gray Studio | 26 | #define MANUFACTURER Graystudio |
| 27 | #define PRODUCT THINK6.5 | 27 | #define PRODUCT Think6.5° Hotswap |
| 28 | #define DESCRIPTION 65% 6.5 degree custom keyboard | 28 | #define DESCRIPTION Graystudio Think6.5 Hotswap |
| 29 | 29 | ||
| 30 | /* key matrix size */ | 30 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 5 | 31 | #define MATRIX_ROWS 5 |
| @@ -69,4 +69,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 69 | #endif | 69 | #endif |
| 70 | 70 | ||
| 71 | // generated by KBFirmware JSON to QMK Parser | 71 | // generated by KBFirmware JSON to QMK Parser |
| 72 | // https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file | 72 | // https://noroadsleft.github.io/kbf_qmk_converter/ |
diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c b/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c new file mode 100644 index 000000000..5079ca555 --- /dev/null +++ b/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | /* Copyright 2019 Rys Sommefeldt | ||
| 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 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | [0] = LAYOUT_65_ansi_blocker( | ||
| 20 | KC_GESC, 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_BSPC, KC_DEL, | ||
| 21 | 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_BSLS, KC_HOME, | ||
| 22 | 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_ENT, KC_PGUP, | ||
| 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, | ||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | ||
| 25 | ), | ||
| 26 | [1] = LAYOUT_65_ansi_blocker( | ||
| 27 | RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | ||
| 28 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, | ||
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 32 | ), | ||
| 33 | [2] = LAYOUT_65_ansi_blocker( | ||
| 34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 35 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 39 | ), | ||
| 40 | [3] = LAYOUT_65_ansi_blocker( | ||
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 46 | ), | ||
| 47 | }; | ||
diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk b/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk new file mode 100644 index 000000000..96d2d189b --- /dev/null +++ b/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | MOUSEKEY_ENABLE = no | ||
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index cc8892a11..f75635402 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/config.h | |||
| @@ -20,12 +20,12 @@ 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 0x4753 |
| 24 | #define PRODUCT_ID 0x0000 | 24 | #define PRODUCT_ID 0x4000 |
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER Gray Studio | 26 | #define MANUFACTURER Graystudio |
| 27 | #define PRODUCT THINK6.5 | 27 | #define PRODUCT Think6.5° |
| 28 | #define DESCRIPTION 65% 6.5 degree custom keyboard | 28 | #define DESCRIPTION Graystudio Think6.5 |
| 29 | 29 | ||
| 30 | /* key matrix size */ | 30 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 5 | 31 | #define MATRIX_ROWS 5 |
| @@ -70,4 +70,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 70 | #endif | 70 | #endif |
| 71 | 71 | ||
| 72 | // generated by KBFirmware JSON to QMK Parser | 72 | // generated by KBFirmware JSON to QMK Parser |
| 73 | // https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file | 73 | // https://noroadsleft.github.io/kbf_qmk_converter/ |
diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c new file mode 100644 index 000000000..0dbe44c87 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | /* Copyright 2019 Rys Sommefeldt | ||
| 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 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | [0] = LAYOUT_all( | ||
| 20 | KC_GESC, 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_BSPC, KC_BSPC, KC_DEL, | ||
| 21 | 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_BSLS, KC_HOME, | ||
| 22 | 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_ENT, KC_PGUP, | ||
| 23 | KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, | ||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | ||
| 25 | ), | ||
| 26 | [1] = LAYOUT_all( | ||
| 27 | RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, | ||
| 28 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, | ||
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 32 | ), | ||
| 33 | [2] = LAYOUT_all( | ||
| 34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 35 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 39 | ), | ||
| 40 | [3] = LAYOUT_all( | ||
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 46 | ), | ||
| 47 | }; | ||
diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk new file mode 100644 index 000000000..96d2d189b --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | MOUSEKEY_ENABLE = no | ||
