From 62e96a711ade89c77bc37d9063b3f805c2ce2099 Mon Sep 17 00:00:00 2001 From: a33bis <48868985+a33bis@users.noreply.github.com> Date: Sun, 6 Aug 2023 09:55:25 -0400 Subject: [PATCH] Moved and updated Galatea files to reflect upstream changes (#515) * Moved vial keymap files to reflect upstream changes * Enabled back default features * Rev2 Vial Support * Fixed productId * Fixed duplicated UID * Deleted .md --- .../galatea/keymaps/vial/readme.md | 1 - .../galatea/{ => rev1}/keymaps/vial/config.h | 3 +- .../galatea/{ => rev1}/keymaps/vial/keymap.c | 0 .../galatea/rev1/keymaps/vial/rules.mk | 3 + .../galatea/{ => rev1}/keymaps/vial/vial.json | 0 .../galatea/rev2/keymaps/vial/config.h | 11 + .../galatea/rev2/keymaps/vial/keymap.c | 43 ++ .../galatea/{ => rev2}/keymaps/vial/rules.mk | 3 +- .../galatea/rev2/keymaps/vial/vial.json | 425 ++++++++++++++++++ 9 files changed, 485 insertions(+), 4 deletions(-) delete mode 100644 keyboards/studiokestra/galatea/keymaps/vial/readme.md rename keyboards/studiokestra/galatea/{ => rev1}/keymaps/vial/config.h (74%) rename keyboards/studiokestra/galatea/{ => rev1}/keymaps/vial/keymap.c (100%) create mode 100644 keyboards/studiokestra/galatea/rev1/keymaps/vial/rules.mk rename keyboards/studiokestra/galatea/{ => rev1}/keymaps/vial/vial.json (100%) create mode 100644 keyboards/studiokestra/galatea/rev2/keymaps/vial/config.h create mode 100644 keyboards/studiokestra/galatea/rev2/keymaps/vial/keymap.c rename keyboards/studiokestra/galatea/{ => rev2}/keymaps/vial/rules.mk (74%) create mode 100644 keyboards/studiokestra/galatea/rev2/keymaps/vial/vial.json diff --git a/keyboards/studiokestra/galatea/keymaps/vial/readme.md b/keyboards/studiokestra/galatea/keymaps/vial/readme.md deleted file mode 100644 index a54a78203e..0000000000 --- a/keyboards/studiokestra/galatea/keymaps/vial/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Studio Kestra's Galatea keymap for VIA diff --git a/keyboards/studiokestra/galatea/keymaps/vial/config.h b/keyboards/studiokestra/galatea/rev1/keymaps/vial/config.h similarity index 74% rename from keyboards/studiokestra/galatea/keymaps/vial/config.h rename to keyboards/studiokestra/galatea/rev1/keymaps/vial/config.h index 337e23d381..f7fa188416 100644 --- a/keyboards/studiokestra/galatea/keymaps/vial/config.h +++ b/keyboards/studiokestra/galatea/rev1/keymaps/vial/config.h @@ -3,7 +3,6 @@ #pragma once #define VIAL_KEYBOARD_UID {0x68, 0x03, 0x19, 0xA7, 0xF8, 0x92, 0x8B, 0x3D} -#define VIAL_KEY_OVERRIDE_ENTRIES 4 #define DYNAMIC_KEYMAP_LAYER_COUNT 2 #define VIAL_UNLOCK_COMBO_ROWS {0,6} -#define VIAL_UNLOCK_COMBO_COLS {0,6} \ No newline at end of file +#define VIAL_UNLOCK_COMBO_COLS {0,6} diff --git a/keyboards/studiokestra/galatea/keymaps/vial/keymap.c b/keyboards/studiokestra/galatea/rev1/keymaps/vial/keymap.c similarity index 100% rename from keyboards/studiokestra/galatea/keymaps/vial/keymap.c rename to keyboards/studiokestra/galatea/rev1/keymaps/vial/keymap.c diff --git a/keyboards/studiokestra/galatea/rev1/keymaps/vial/rules.mk b/keyboards/studiokestra/galatea/rev1/keymaps/vial/rules.mk new file mode 100644 index 0000000000..46f9f1360f --- /dev/null +++ b/keyboards/studiokestra/galatea/rev1/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/studiokestra/galatea/keymaps/vial/vial.json b/keyboards/studiokestra/galatea/rev1/keymaps/vial/vial.json similarity index 100% rename from keyboards/studiokestra/galatea/keymaps/vial/vial.json rename to keyboards/studiokestra/galatea/rev1/keymaps/vial/vial.json diff --git a/keyboards/studiokestra/galatea/rev2/keymaps/vial/config.h b/keyboards/studiokestra/galatea/rev2/keymaps/vial/config.h new file mode 100644 index 0000000000..4ec8795e83 --- /dev/null +++ b/keyboards/studiokestra/galatea/rev2/keymaps/vial/config.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x69, 0x99, 0x17, 0xE3, 0x75, 0xA5, 0x3B, 0x1F} +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 +#define VIAL_UNLOCK_COMBO_ROWS {0,6} +#define VIAL_UNLOCK_COMBO_COLS {0,6} + +#undef RGBLIGHT_EFFECT_CHRISTMAS +#undef RGBLIGHT_EFFECT_RGB_TEST diff --git a/keyboards/studiokestra/galatea/rev2/keymaps/vial/keymap.c b/keyboards/studiokestra/galatea/rev2/keymaps/vial/keymap.c new file mode 100644 index 0000000000..df2093c7da --- /dev/null +++ b/keyboards/studiokestra/galatea/rev2/keymaps/vial/keymap.c @@ -0,0 +1,43 @@ + /* Copyright 2021 Studio Kestra + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN1, + _FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, 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_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), + + [_FN1] = LAYOUT( + QK_BOOT, 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, 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, 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, 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, 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, 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 ), +}; diff --git a/keyboards/studiokestra/galatea/keymaps/vial/rules.mk b/keyboards/studiokestra/galatea/rev2/keymaps/vial/rules.mk similarity index 74% rename from keyboards/studiokestra/galatea/keymaps/vial/rules.mk rename to keyboards/studiokestra/galatea/rev2/keymaps/vial/rules.mk index 03622d5f64..2e8e13d712 100644 --- a/keyboards/studiokestra/galatea/keymaps/vial/rules.mk +++ b/keyboards/studiokestra/galatea/rev2/keymaps/vial/rules.mk @@ -1,5 +1,6 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes + TAP_DANCE_ENABLE = no -QMK_SETTINGS = no +KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/studiokestra/galatea/rev2/keymaps/vial/vial.json b/keyboards/studiokestra/galatea/rev2/keymaps/vial/vial.json new file mode 100644 index 0000000000..ea129e60ce --- /dev/null +++ b/keyboards/studiokestra/galatea/rev2/keymaps/vial/vial.json @@ -0,0 +1,425 @@ +{ + "name": "Galatea", + "vendorId": "0x7C10", + "productId": "0x8802", + "lighting": "qmk_rgblight", + "matrix": { + "rows": 12, + "cols": 9 + }, + "layouts": { + "labels": [ + [ + "Top Row", + "F13", + "F12" + ], + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Split Right Shift", + [ + "Bottom Row", + "6.25U", + "7U", + "7U WKL", + "10U", + "10U WKL" + ] + ], + "keymap": [ + [ + { + "x": 3.75, + "d": true + }, + "1,0\n\n\n0,1", + { + "x": -0.25 + }, + "0,1\n\n\n0,1", + "0,2\n\n\n0,1", + "1,2\n\n\n0,1", + "0,3\n\n\n0,1", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "1,3\n\n\n0,1", + "0,4\n\n\n0,1", + "1,4\n\n\n0,1", + "0,5\n\n\n0,1", + { + "x": 0.5, + "c": "#cccccc" + }, + "1,5\n\n\n0,1", + "0,6\n\n\n0,1", + "1,6\n\n\n0,1", + "0,7\n\n\n0,1" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,0\n\n\n0,0", + "0,1\n\n\n0,0", + "0,2\n\n\n0,0", + "1,2\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,3\n\n\n0,0", + "1,3\n\n\n0,0", + "0,4\n\n\n0,0", + "1,4\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,5\n\n\n0,0", + "1,5\n\n\n0,0", + "0,6\n\n\n0,0", + "1,6\n\n\n0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,7\n\n\n0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,7", + "0,8", + "1,8" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa" + }, + "2,0", + { + "c": "#cccccc" + }, + "3,0", + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "3,5", + "2,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,6\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,7", + "2,8", + "3,8", + { + "x": 1 + }, + "3,6\n\n\n1,1", + "2,7\n\n\n1,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "4,0", + { + "c": "#cccccc" + }, + "5,0", + "4,1", + "5,1", + "4,2", + "5,2", + "4,3", + "5,3", + "4,4", + "5,4", + "4,5", + "5,5", + "4,6", + { + "w": 1.5 + }, + "4,7\n\n\n2,0", + { + "x": 0.25 + }, + "5,7", + "4,8", + "5,8", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "4,7\n\n\n2,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "6,0", + { + "c": "#cccccc" + }, + "7,0", + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "c": "#777777", + "w": 2.25 + }, + "6,6\n\n\n2,0", + { + "x": 4, + "c": "#cccccc" + }, + "6,6\n\n\n2,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "8,0\n\n\n3,1", + "9,0\n\n\n3,1", + { + "x": 0.25, + "w": 2.25 + }, + "8,0\n\n\n3,0", + { + "c": "#cccccc" + }, + "8,1", + "9,1", + "8,2", + "9,2", + "8,3", + "9,3", + "8,4", + "9,4", + "8,5", + "9,5", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "8,6\n\n\n4,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "8,8", + { + "x": 1.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "8,6\n\n\n4,1", + "8,7\n\n\n4,1" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "10,0\n\n\n5,0", + { + "w": 1.25 + }, + "11,0\n\n\n5,0", + { + "w": 1.25 + }, + "10,1\n\n\n5,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "10,3\n\n\n5,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "10,5\n\n\n5,0", + { + "w": 1.25 + }, + "11,5\n\n\n5,0", + { + "w": 1.25 + }, + "10,6\n\n\n5,0", + { + "w": 1.25 + }, + "10,7\n\n\n5,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "11,7", + "10,8", + "11,8" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0\n\n\n5,1", + "11,0\n\n\n5,1", + { + "w": 1.5 + }, + "10,1\n\n\n5,1", + { + "c": "#cccccc", + "w": 7 + }, + "10,3\n\n\n5,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "11,5\n\n\n5,1", + "10,6\n\n\n5,1", + { + "w": 1.5 + }, + "10,7\n\n\n5,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "10,0\n\n\n5,2", + { + "c": "#cccccc", + "d": true + }, + "11,0\n\n\n5,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,1\n\n\n5,2", + { + "c": "#cccccc", + "w": 7 + }, + "10,3\n\n\n5,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "11,5\n\n\n5,2", + { + "c": "#cccccc", + "d": true + }, + "10,6\n\n\n5,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,7\n\n\n5,2" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "10,0\n\n\n5,3", + { + "w": 1.25 + }, + "11,0\n\n\n5,3", + { + "c": "#cccccc", + "w": 10 + }, + "10,3\n\n\n5,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "10,6\n\n\n5,3", + { + "w": 1.25 + }, + "10,7\n\n\n5,3" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "10,0\n\n\n5,4", + { + "c": "#cccccc", + "d": true + }, + "11,0\n\n\n5,4", + { + "w": 10 + }, + "10,3\n\n\n5,4", + { + "d": true + }, + "10,6\n\n\n5,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,7\n\n\n5,4" + ] + ] + } +}