From 99d1699b2cede73ad7cac91b36802b5cd0fffbdf Mon Sep 17 00:00:00 2001 From: SeebM <76456388+SeebM@users.noreply.github.com> Date: Tue, 7 Nov 2023 04:58:13 +0100 Subject: [PATCH] Add VIAL support for 4pplet waffling60 rev_d (#584) * Add VIAL support for 4pplet waffling60 rev_d * Update keyboards/4pplet/waffling60/rev_d/keymaps/vial/vial.json remove vendorID and productID Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Add vial support for: * 4pplet/waffling60/rev_d_ansi --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- .../waffling60/rev_d/keymaps/vial/config.h | 9 + .../waffling60/rev_d/keymaps/vial/keymap.c | 34 ++ .../waffling60/rev_d/keymaps/vial/rules.mk | 2 + .../waffling60/rev_d/keymaps/vial/vial.json | 424 ++++++++++++++++++ .../rev_d_ansi/keymaps/vial/config.h | 11 + .../rev_d_ansi/keymaps/vial/keymap.c | 34 ++ .../rev_d_ansi/keymaps/vial/rules.mk | 2 + .../rev_d_ansi/keymaps/vial/vial.json | 219 +++++++++ 8 files changed, 735 insertions(+) create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/vial/config.h create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/vial/keymap.c create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/vial/rules.mk create mode 100644 keyboards/4pplet/waffling60/rev_d/keymaps/vial/vial.json create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/config.h create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/keymap.c create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/rules.mk create mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/vial.json diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/vial/config.h b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/config.h new file mode 100644 index 0000000000..98404f0024 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/config.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x59, 0xE1, 0x24, 0x06, 0xDB, 0xB0, 0xBB, 0x48} + + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/vial/keymap.c b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/keymap.c new file mode 100644 index 0000000000..7327ba11e3 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/keymap.c @@ -0,0 +1,34 @@ +/* +Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com> + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// main layer +[0] = LAYOUT( + 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), +// basic function layer +[1] = LAYOUT( + QK_BOOT, 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, + KC_TRNS, KC_TRNS, KC_UP, 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_LEFT, KC_DOWN, KC_RIGHT, 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/4pplet/waffling60/rev_d/keymaps/vial/rules.mk b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/rules.mk new file mode 100644 index 0000000000..6bc7063adc --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes \ No newline at end of file diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/vial/vial.json b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/vial.json new file mode 100644 index 0000000000..897cbb296f --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d/keymaps/vial/vial.json @@ -0,0 +1,424 @@ +{ + "lighting": "qmk_rgblight", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + [ + "Bottom row", + "7U WK", + "7U WKL", + "7U WK Split", + "7U WKL Split", + "6.25U WK", + "6.25U WK Split", + "10U WK", + "10U WKL" + ], + "Split backspase", + "ISO Enter", + "Split Left Shift", + "Split Right Shift" + ], + "keymap": [ + [ + { + "x": 3, + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "2,13\n\n\n1,0", + { + "x": 1.5, + "c": "#cccccc" + }, + "0,13\n\n\n1,1", + { + "c": "#aaaaaa" + }, + "2,13\n\n\n1,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13\n\n\n2,0", + { + "x": 2.25, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13\n\n\n2,1" + ], + [ + { + "x": 3, + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,13\n\n\n2,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "2,12\n\n\n2,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n3,1", + "3,1\n\n\n3,1", + { + "x": 0.75, + "w": 2.25 + }, + "3,0\n\n\n3,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,12\n\n\n4,0", + { + "x": 0.75, + "w": 1.75 + }, + "3,12\n\n\n4,1", + "4,13\n\n\n4,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "4,0\n\n\n0,0", + "4,1\n\n\n0,0", + { + "w": 1.5 + }, + "4,2\n\n\n0,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n0,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n0,0", + "4,11\n\n\n0,0", + { + "w": 1.5 + }, + "4,12\n\n\n0,0" + ], + [ + { + "y": 1, + "x": 3, + "w": 1.5 + }, + "4,0\n\n\n0,1", + { + "d": true + }, + "4,1\n\n\n0,1", + { + "w": 1.5 + }, + "4,2\n\n\n0,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n0,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n0,1", + { + "d": true + }, + "4,11\n\n\n0,1", + { + "w": 1.5 + }, + "4,12\n\n\n0,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "4,0\n\n\n0,2", + "4,1\n\n\n0,2", + { + "w": 1.5 + }, + "4,2\n\n\n0,2", + { + "c": "#cccccc", + "w": 3 + }, + "4,4\n\n\n0,2", + "4,6\n\n\n0,2", + { + "w": 3 + }, + "4,8\n\n\n0,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n0,2", + "4,11\n\n\n0,2", + { + "w": 1.5 + }, + "4,12\n\n\n0,2" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "4,0\n\n\n0,3", + { + "d": true + }, + "4,1\n\n\n0,3", + { + "w": 1.5 + }, + "4,2\n\n\n0,3", + { + "c": "#cccccc", + "w": 3 + }, + "4,4\n\n\n0,3", + "4,6\n\n\n0,3", + { + "w": 3 + }, + "4,8\n\n\n0,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n0,3", + { + "d": true + }, + "4,11\n\n\n0,3", + { + "w": 1.5 + }, + "4,12\n\n\n0,3" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "4,0\n\n\n0,4", + { + "w": 1.25 + }, + "4,1\n\n\n0,4", + { + "w": 1.25 + }, + "4,2\n\n\n0,4", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n0,4", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n0,4", + { + "w": 1.25 + }, + "4,10\n\n\n0,4", + { + "w": 1.25 + }, + "4,11\n\n\n0,4", + { + "w": 1.25 + }, + "4,12\n\n\n0,4" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "4,0\n\n\n0,5", + { + "w": 1.25 + }, + "4,1\n\n\n0,5", + { + "w": 1.25 + }, + "4,2\n\n\n0,5", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,4\n\n\n0,5", + { + "w": 1.25 + }, + "4,6\n\n\n0,5", + { + "w": 2.75 + }, + "4,8\n\n\n0,5", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n0,5", + { + "w": 1.25 + }, + "4,10\n\n\n0,5", + { + "w": 1.25 + }, + "4,11\n\n\n0,5", + { + "w": 1.25 + }, + "4,12\n\n\n0,5" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "4,0\n\n\n0,6", + "4,1\n\n\n0,6", + { + "c": "#cccccc", + "w": 10 + }, + "4,6\n\n\n0,6", + { + "c": "#aaaaaa" + }, + "4,11\n\n\n0,6", + { + "w": 1.5 + }, + "4,12\n\n\n0,6" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "4,0\n\n\n0,7", + { + "d": true + }, + "4,1\n\n\n0,7", + { + "c": "#cccccc", + "w": 10 + }, + "4,6\n\n\n0,7", + { + "c": "#aaaaaa", + "d": true + }, + "4,11\n\n\n0,7", + { + "w": 1.5 + }, + "4,12\n\n\n0,7" + ] + ] + } +} diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/config.h new file mode 100644 index 0000000000..5aab2be5d9 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/config.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + + +#define VIAL_KEYBOARD_UID {0xF0, 0x01, 0x3E, 0x93, 0x0F, 0x17, 0x90, 0x69} + + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } + diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/keymap.c b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/keymap.c new file mode 100644 index 0000000000..6b4b4a7566 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/keymap.c @@ -0,0 +1,34 @@ +/* +Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com> + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// main layer +[0] = LAYOUT( + 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_BSPC, + 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_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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), +// basic function layer +[1] = LAYOUT( + QK_BOOT, 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_DEL, + KC_TRNS, KC_TRNS, KC_UP, 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_LEFT, KC_DOWN, KC_RIGHT, 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/4pplet/waffling60/rev_d_ansi/keymaps/vial/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/rules.mk new file mode 100644 index 0000000000..6bc7063adc --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes \ No newline at end of file diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/vial.json b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/vial.json new file mode 100644 index 0000000000..79141b6a09 --- /dev/null +++ b/keyboards/4pplet/waffling60/rev_d_ansi/keymaps/vial/vial.json @@ -0,0 +1,219 @@ +{ + "name": "waffling60 Rev D ANSI", + "lighting": "none", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + "Split backspase", + ["Modifiers", "WK", "WKL", "HHKB"], + ["Spacebar", "7U", "Split Space", "10U"] + ], + "keymap": [ + [ + { + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + { + "c": "#aaaaaa" + }, + "1,13\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,12" + ], + [ + { + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "2,13" + ], + [ + { + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,12", + "3,13" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n1,0", + "4,1\n\n\n1,0", + { + "w": 1.5 + }, + "4,2\n\n\n2,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n2,0", + "4,12\n\n\n1,0", + { + "w": 1.5 + }, + "4,13\n\n\n1,0" + ], + [ + { + "y": 0.5, + "x": 2.5, + "w": 1.5 + }, + "4,2\n\n\n2,1", + { + "c": "#cccccc", + "w": 3 + }, + "4,4\n\n\n2,1", + "4,6\n\n\n2,1", + { + "w": 3 + }, + "4,8\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n2,1" + ], + [ + { + "x": 2.5, + "c": "#cccccc", + "w": 10 + }, + "4,6\n\n\n2,2" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,0\n\n\n1,1", + { + "d": true + }, + "4,1\n\n\n1,1", + { + "x": 10, + "d": true + }, + "4,12\n\n\n1,1", + { + "w": 1.5 + }, + "4,13\n\n\n1,1" + ], + [ + { + "w": 1.5, + "d": true + }, + "4,0\n\n\n1,2", + "4,1\n\n\n1,2", + { + "x": 10 + }, + "4,12\n\n\n1,2", + { + "w": 1.5, + "d": true + }, + "4,13\n\n\n1,2" + ] + ] + } +}