From 39bc566d89302db0fa519abe90abecf97352905f Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Thu, 23 Nov 2023 14:55:47 -0500 Subject: [PATCH 1/8] fix: move d45v1 keymap to correct folder --- keyboards/kbdfans/d45/{ => v1}/keymaps/vial/config.h | 0 keyboards/kbdfans/d45/{ => v1}/keymaps/vial/keymap.c | 0 keyboards/kbdfans/d45/{ => v1}/keymaps/vial/rules.mk | 0 keyboards/kbdfans/d45/{ => v1}/keymaps/vial/vial.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/kbdfans/d45/{ => v1}/keymaps/vial/config.h (100%) rename keyboards/kbdfans/d45/{ => v1}/keymaps/vial/keymap.c (100%) rename keyboards/kbdfans/d45/{ => v1}/keymaps/vial/rules.mk (100%) rename keyboards/kbdfans/d45/{ => v1}/keymaps/vial/vial.json (100%) diff --git a/keyboards/kbdfans/d45/keymaps/vial/config.h b/keyboards/kbdfans/d45/v1/keymaps/vial/config.h similarity index 100% rename from keyboards/kbdfans/d45/keymaps/vial/config.h rename to keyboards/kbdfans/d45/v1/keymaps/vial/config.h diff --git a/keyboards/kbdfans/d45/keymaps/vial/keymap.c b/keyboards/kbdfans/d45/v1/keymaps/vial/keymap.c similarity index 100% rename from keyboards/kbdfans/d45/keymaps/vial/keymap.c rename to keyboards/kbdfans/d45/v1/keymaps/vial/keymap.c diff --git a/keyboards/kbdfans/d45/keymaps/vial/rules.mk b/keyboards/kbdfans/d45/v1/keymaps/vial/rules.mk similarity index 100% rename from keyboards/kbdfans/d45/keymaps/vial/rules.mk rename to keyboards/kbdfans/d45/v1/keymaps/vial/rules.mk diff --git a/keyboards/kbdfans/d45/keymaps/vial/vial.json b/keyboards/kbdfans/d45/v1/keymaps/vial/vial.json similarity index 100% rename from keyboards/kbdfans/d45/keymaps/vial/vial.json rename to keyboards/kbdfans/d45/v1/keymaps/vial/vial.json From 72afe7c9841fbd2356fed3c76486a47c02636071 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Sun, 26 Nov 2023 16:36:23 -0500 Subject: [PATCH 2/8] fix(mechwild/sugarglider): correct custom keycode shortNames --- keyboards/mechwild/puckbuddy/keymaps/vial/vial.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mechwild/puckbuddy/keymaps/vial/vial.json b/keyboards/mechwild/puckbuddy/keymaps/vial/vial.json index 984bf9ab4af..4a29b3cfdd6 100644 --- a/keyboards/mechwild/puckbuddy/keymaps/vial/vial.json +++ b/keyboards/mechwild/puckbuddy/keymaps/vial/vial.json @@ -5,12 +5,12 @@ { "name": "DPI_UP", "title": "Increase the DPI of the touchpad.", - "shortName": "DPI\nDown" + "shortName": "DPI\nUp" }, { "name": "DPI_DN", "title": "Decrease the DPI of the touchpad.", - "shortName": "DPI\nUp" + "shortName": "DPI\nDown" }, { "name": "DPI_FINE", From 646f54ca390eac8d3ade95f4a27e019298cd9b21 Mon Sep 17 00:00:00 2001 From: supjj <128263666+supjj@users.noreply.github.com> Date: Sat, 2 Dec 2023 20:42:33 -0800 Subject: [PATCH 3/8] fix split spacebar YD60mq vial.json (#604) fixed split spacebar layout added option for left 2.75u split spacebar variant spelling --- keyboards/ymdk/yd60mq/keymaps/vial/vial.json | 52 ++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/keyboards/ymdk/yd60mq/keymaps/vial/vial.json b/keyboards/ymdk/yd60mq/keymaps/vial/vial.json index 36bb6a846ea..65dfec170ed 100644 --- a/keyboards/ymdk/yd60mq/keymaps/vial/vial.json +++ b/keyboards/ymdk/yd60mq/keymaps/vial/vial.json @@ -499,7 +499,7 @@ { "w": 1.25 }, - "4,10\n\n\n4,4", + "4,10\n\n\n4,5", { "w": 1.25 }, @@ -508,14 +508,60 @@ "w": 1.25 }, "4,13\n\n\n4,5" + ], + [ + { + "y": 0.25, + "x": 24.75, + "w": 1.25 + }, + "4,0\n\n\n4,6", + { + "w": 1.25 + }, + "4,1\n\n\n4,6", + { + "w": 1.25 + }, + "4,2\n\n\n4,6", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,3\n\n\n4,6", + { + "w": 1.25 + }, + "4,7\n\n\n4,6", + { + "w": 2.25 + }, + "4,8\n\n\n4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,9\n\n\n4,6", + { + "w": 1.25 + }, + "4,10\n\n\n4,6", + { + "w": 1.25 + }, + "4,12\n\n\n4,6", + { + "w": 1.25 + }, + "4,13\n\n\n4,6" ] ], "labels": [ "Split Backspace", "Stepped Caps Lock", "ISO Enter", - ["ZXC ROW / R4", "ANSI Standard", "ANSI Split Right Shift", "ANSI Big Question Mark Arrow Keys", "ISO Standart", "ISO Split Right Shift", "ISO Big Question Mark Arrow Keys", "2u Left Shift Arrow keys"], - ["Bottom Row", "ANSI", "Tsangan", "HHKB", "Arrow Keys", "Japanese", "Split Spacebar"] + ["ZXC ROW / R4", "ANSI Standard", "ANSI Split Right Shift", "ANSI Big Question Mark Arrow Keys", "ISO Standard", "ISO Split Right Shift", "ISO Big Question Mark Arrow Keys", "2u Left Shift Arrow keys"], + ["Bottom Row", "ANSI", "Tsangan", "HHKB", "Arrow Keys", "Japanese", "Split Spacebar 2.75u Right", "Split Spacebar 2.75u Left"] ] } } From a85f0b417d539f2c916ea653598a029d3c495e4f Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sat, 2 Dec 2023 20:43:23 -0800 Subject: [PATCH 4/8] Port Drop Alt v2 to VIAL (#607) --- keyboards/drop/alt/keymaps/vial/config.h | 10 ++ keyboards/drop/alt/keymaps/vial/keymap.c | 20 +++ keyboards/drop/alt/keymaps/vial/rules.mk | 3 + keyboards/drop/alt/keymaps/vial/vial.json | 166 ++++++++++++++++++++++ 4 files changed, 199 insertions(+) create mode 100644 keyboards/drop/alt/keymaps/vial/config.h create mode 100644 keyboards/drop/alt/keymaps/vial/keymap.c create mode 100644 keyboards/drop/alt/keymaps/vial/rules.mk create mode 100644 keyboards/drop/alt/keymaps/vial/vial.json diff --git a/keyboards/drop/alt/keymaps/vial/config.h b/keyboards/drop/alt/keymaps/vial/config.h new file mode 100644 index 00000000000..0b4a6a45cfb --- /dev/null +++ b/keyboards/drop/alt/keymaps/vial/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Massdrop, Inc. +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 + +#define VIAL_KEYBOARD_UID {0x5E, 0x5A, 0x93, 0x8B, 0x56, 0x11, 0xB7, 0x99} + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/drop/alt/keymaps/vial/keymap.c b/keyboards/drop/alt/keymaps/vial/keymap.c new file mode 100644 index 00000000000..28d7232bcfc --- /dev/null +++ b/keyboards/drop/alt/keymaps/vial/keymap.c @@ -0,0 +1,20 @@ +// Copyright 2023 Massdrop, Inc. +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_65_ansi_blocker( + 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_BSPC, KC_DEL, + 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, + 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, + 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, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_ansi_blocker( + KC_GRV, 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_MUTE, + _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, + _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, KC_VOLD, + _______, _______, _______, EE_CLR, KC_APP, _______, KC_HOME, KC_PGDN, KC_END + ) +}; diff --git a/keyboards/drop/alt/keymaps/vial/rules.mk b/keyboards/drop/alt/keymaps/vial/rules.mk new file mode 100644 index 00000000000..31bb6d699f9 --- /dev/null +++ b/keyboards/drop/alt/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes \ No newline at end of file diff --git a/keyboards/drop/alt/keymaps/vial/vial.json b/keyboards/drop/alt/keymaps/vial/vial.json new file mode 100644 index 00000000000..45e581eb841 --- /dev/null +++ b/keyboards/drop/alt/keymaps/vial/vial.json @@ -0,0 +1,166 @@ +{ + "name": "Drop ALT V2", + "vendorId": "0x359B", + "productId": "0x0006", + "lighting": "vialrgb", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "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 + }, + "0,13", + "0,14" + ], + [ + { + "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", + { + "w": 1.5 + }, + "1,13", + { + "c": "#aaaaaa" + }, + "1,14" + ], + [ + { + "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": "#777777", + "w": 2.25 + }, + "2,13", + { + "c": "#aaaaaa" + }, + "2,14" + ], + [ + { + "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", + { + "c": "#777777" + }, + "3,13", + { + "c": "#aaaaaa" + }, + "3,14" + ], + [ + { + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10", + { + "w": 1.25 + }, + "4,11", + { + "x": 0.5, + "c": "#777777" + }, + "4,12", + "4,13", + "4,14" + ] + ] + } +} From e6b508e488837312f4926a197799e6243d47a4be Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sat, 2 Dec 2023 20:43:40 -0800 Subject: [PATCH 5/8] Port Drop Ctrl v2 to VIAL (#608) --- keyboards/drop/ctrl/keymaps/vial/config.h | 10 + keyboards/drop/ctrl/keymaps/vial/keymap.c | 22 +++ keyboards/drop/ctrl/keymaps/vial/rules.mk | 3 + keyboards/drop/ctrl/keymaps/vial/vial.json | 210 +++++++++++++++++++++ 4 files changed, 245 insertions(+) create mode 100644 keyboards/drop/ctrl/keymaps/vial/config.h create mode 100644 keyboards/drop/ctrl/keymaps/vial/keymap.c create mode 100644 keyboards/drop/ctrl/keymaps/vial/rules.mk create mode 100644 keyboards/drop/ctrl/keymaps/vial/vial.json diff --git a/keyboards/drop/ctrl/keymaps/vial/config.h b/keyboards/drop/ctrl/keymaps/vial/config.h new file mode 100644 index 00000000000..77ee3ed79d7 --- /dev/null +++ b/keyboards/drop/ctrl/keymaps/vial/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Massdrop, Inc. +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 + +#define VIAL_KEYBOARD_UID {0xAB, 0x41, 0x47, 0xE5, 0x46, 0xD6, 0xB8, 0xC2} + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/drop/ctrl/keymaps/vial/keymap.c b/keyboards/drop/ctrl/keymaps/vial/keymap.c new file mode 100644 index 00000000000..82b10889217 --- /dev/null +++ b/keyboards/drop/ctrl/keymaps/vial/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2023 Massdrop, Inc. +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_ansi( + 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_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_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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_tkl_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU, + _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, + _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/drop/ctrl/keymaps/vial/rules.mk b/keyboards/drop/ctrl/keymaps/vial/rules.mk new file mode 100644 index 00000000000..31bb6d699f9 --- /dev/null +++ b/keyboards/drop/ctrl/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes \ No newline at end of file diff --git a/keyboards/drop/ctrl/keymaps/vial/vial.json b/keyboards/drop/ctrl/keymaps/vial/vial.json new file mode 100644 index 00000000000..2fd5c28e8f8 --- /dev/null +++ b/keyboards/drop/ctrl/keymaps/vial/vial.json @@ -0,0 +1,210 @@ +{ + "name": "Drop CTRL V2", + "vendorId": "0x359B", + "productId": "0x0009", + "lighting": "vialrgb", + "matrix": { + "rows": 11, + "cols": 8 + }, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.5 + }, + "0,5", + "0,6", + "0,7", + "6,0", + { + "x": 0.5 + }, + "6,1", + "6,2", + "6,3", + "6,4", + { + "x": 0.25 + }, + "6,5", + "6,6", + "6,7" + ], + [ + { + "y": 0.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + { + "c": "#aaaaaa", + "w": 2 + }, + "7,5", + { + "x": 0.25, + "c": "#cccccc" + }, + "7,6", + "7,7", + "9,7" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "8,0", + "8,1", + "8,2", + "8,3", + "8,4", + { + "w": 1.5 + }, + "8,5", + { + "x": 0.25 + }, + "8,6", + "8,7", + "9,6" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "9,0", + "9,1", + "9,2", + "9,3", + { + "c": "#777777", + "w": 2.25 + }, + "9,4" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "10,0", + "10,1", + "10,2", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "10,3", + { + "x": 1.25, + "c": "#777777" + }, + "9,5" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,3", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,4", + { + "w": 1.25 + }, + "5,5", + { + "w": 1.25 + }, + "5,6", + { + "w": 1.25 + }, + "5,7", + { + "x": 0.25, + "c": "#777777" + }, + "10,4", + "10,5", + "10,6" + ] + ] + } +} From a83d1ef4fc386fbf9e7a375a8abad909151b6d93 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sat, 2 Dec 2023 20:43:56 -0800 Subject: [PATCH 6/8] Port Drop Shift v2 to VIAL (#609) --- keyboards/drop/shift/keymaps/vial/config.h | 10 + keyboards/drop/shift/keymaps/vial/keymap.c | 22 ++ keyboards/drop/shift/keymaps/vial/rules.mk | 3 + keyboards/drop/shift/keymaps/vial/vial.json | 243 ++++++++++++++++++++ 4 files changed, 278 insertions(+) create mode 100644 keyboards/drop/shift/keymaps/vial/config.h create mode 100644 keyboards/drop/shift/keymaps/vial/keymap.c create mode 100644 keyboards/drop/shift/keymaps/vial/rules.mk create mode 100644 keyboards/drop/shift/keymaps/vial/vial.json diff --git a/keyboards/drop/shift/keymaps/vial/config.h b/keyboards/drop/shift/keymaps/vial/config.h new file mode 100644 index 00000000000..0d9c78f4b3a --- /dev/null +++ b/keyboards/drop/shift/keymaps/vial/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Massdrop, Inc. +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 + +#define VIAL_KEYBOARD_UID {0xDA, 0xBD, 0x37, 0xCF, 0x26, 0xD1, 0x13, 0x7A} + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/drop/shift/keymaps/vial/keymap.c b/keyboards/drop/shift/keymaps/vial/keymap.c new file mode 100644 index 00000000000..371908bb482 --- /dev/null +++ b/keyboards/drop/shift/keymaps/vial/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2023 Massdrop, Inc. +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1800_ansi( + 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_DEL, KC_HOME, KC_END, KC_PGUP, KC_PGDN, + 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_NUM, KC_PSLS, KC_PAST, KC_PSCR, + 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_P7, KC_P8, KC_P9, KC_PMNS, + 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_P4, KC_P5, KC_P6, KC_PPLS, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + [1] = LAYOUT_1800_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_MPLY, KC_MSTP, KC_VOLU, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_SCRL, + _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, EE_CLR, KC_APP, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/drop/shift/keymaps/vial/rules.mk b/keyboards/drop/shift/keymaps/vial/rules.mk new file mode 100644 index 00000000000..31bb6d699f9 --- /dev/null +++ b/keyboards/drop/shift/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes \ No newline at end of file diff --git a/keyboards/drop/shift/keymaps/vial/vial.json b/keyboards/drop/shift/keymaps/vial/vial.json new file mode 100644 index 00000000000..61d7dfc647d --- /dev/null +++ b/keyboards/drop/shift/keymaps/vial/vial.json @@ -0,0 +1,243 @@ +{ + "name": "Drop SHIFT V2", + "vendorId": "0x359B", + "productId": "0x000C", + "lighting": "vialrgb", + "matrix": { + "rows": 8, + "cols": 13 + }, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "1,2", + "0,3", + { + "x": 0.25 + }, + "0,4", + "0,5", + "0,6", + "1,6", + { + "x": 0.25 + }, + "0,7", + "1,7", + "0,8", + "1,8", + { + "x": 0.25 + }, + "1,9", + { + "x": 0.5 + }, + "0,10", + "1,10", + "0,11", + "1,11" + ], + [ + { + "y": 0.25 + }, + "1,0", + "1,1", + "2,1", + "2,2", + "3,2", + "1,3", + "2,3", + "1,4", + "1,5", + "2,5", + "2,6", + "3,6", + "2,7", + { + "c": "#aaaaaa", + "w": 2 + }, + "2,8", + { + "x": 0.5 + }, + "2,9", + "2,10", + "2,11", + "2,12" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "3,1", + "4,1", + "4,2", + "3,3", + "4,3", + "2,4", + "3,4", + "3,5", + "4,5", + "4,6", + "3,7", + "3,8", + { + "w": 1.5 + }, + "4,8", + { + "x": 0.5 + }, + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa" + }, + "3,12" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "5,1", + "6,1", + "5,2", + "5,3", + "6,3", + "4,4", + "5,4", + "5,5", + "5,6", + "4,7", + "5,8", + { + "c": "#777777", + "w": 2.25 + }, + "6,8", + { + "x": 0.5, + "c": "#cccccc" + }, + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa" + }, + "4,12" + ], + [ + { + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "7,1", + "6,2", + "7,2", + "7,3", + "6,4", + "7,5", + "6,5", + "6,6", + "5,7", + "6,7", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "7,8", + { + "x": 1.5, + "c": "#cccccc" + }, + "5,9", + "5,10", + "5,11", + { + "c": "#777777", + "h": 2 + }, + "5,12" + ], + [ + { + "y": -0.75, + "x": 14.25 + }, + "6,9" + ], + [ + { + "y": -0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "6,0", + { + "w": 1.25 + }, + "7,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "7,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "7,6", + { + "w": 1.5 + }, + "7,7", + { + "x": 3.5, + "c": "#cccccc" + }, + "6,11", + "6,12" + ], + [ + { + "y": -0.75, + "x": 13.25, + "c": "#777777" + }, + "7,9", + "7,10", + "6,10" + ] + ] + } +} From 91fb55983a8513fd982f972d228804f2a4846a5c Mon Sep 17 00:00:00 2001 From: josh-l-wang <22173775+josh-l-wang@users.noreply.github.com> Date: Sun, 3 Dec 2023 00:28:31 -0500 Subject: [PATCH 7/8] add Vault35 katana (#605) * added qaz fold * added vault35 katana * added chiffre 32 * Update keyboards/le_chiffre_32/keymaps/vial/rules.mk make secure Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Delete keyboards/le_chiffre_32 directory * Delete keyboards/tominabox1/qazfold directory * Create rules.mk * Apply suggestions from code review Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * change rgb.c to vault35_katana.c * moved LED matrix to info.json * Apply suggestions from code review Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --------- Co-authored-by: avshockeyw Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/jlw/vault35_katana/config.h | 9 + keyboards/jlw/vault35_katana/info.json | 363 ++++++++++++++++++ .../vault35_katana/keymaps/default/keymap.c | 37 ++ .../vault35_katana/keymaps/default/rules.mk | 1 + .../jlw/vault35_katana/keymaps/vial/config.h | 12 + .../jlw/vault35_katana/keymaps/vial/keymap.c | 47 +++ .../jlw/vault35_katana/keymaps/vial/rules.mk | 4 + .../jlw/vault35_katana/keymaps/vial/vial.json | 213 ++++++++++ keyboards/jlw/vault35_katana/readme.md | 7 + keyboards/jlw/vault35_katana/rules.mk | 1 + 10 files changed, 694 insertions(+) create mode 100644 keyboards/jlw/vault35_katana/config.h create mode 100644 keyboards/jlw/vault35_katana/info.json create mode 100644 keyboards/jlw/vault35_katana/keymaps/default/keymap.c create mode 100644 keyboards/jlw/vault35_katana/keymaps/default/rules.mk create mode 100644 keyboards/jlw/vault35_katana/keymaps/vial/config.h create mode 100644 keyboards/jlw/vault35_katana/keymaps/vial/keymap.c create mode 100644 keyboards/jlw/vault35_katana/keymaps/vial/rules.mk create mode 100644 keyboards/jlw/vault35_katana/keymaps/vial/vial.json create mode 100644 keyboards/jlw/vault35_katana/readme.md create mode 100644 keyboards/jlw/vault35_katana/rules.mk diff --git a/keyboards/jlw/vault35_katana/config.h b/keyboards/jlw/vault35_katana/config.h new file mode 100644 index 00000000000..d894454989a --- /dev/null +++ b/keyboards/jlw/vault35_katana/config.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#pragma once + +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_TRIGGER_ON_KEYDOWN +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL +#define RGB_MATRIX_DEFAULT_VAL 32 +#define RGB_MATRIX_DEFAULT_SPD 32 diff --git a/keyboards/jlw/vault35_katana/info.json b/keyboards/jlw/vault35_katana/info.json new file mode 100644 index 00000000000..076b86d6021 --- /dev/null +++ b/keyboards/jlw/vault35_katana/info.json @@ -0,0 +1,363 @@ +{ + "keyboard_name": "vault 35 katana", + "manufacturer": "jlw", + "url": "https://github.com/josh-l-wang/vault35-katana", + "maintainer": "jlw", + "usb": { + "vid": "0x1209", + "pid": "0xA455", + "device_version": "0.0.1" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["B0", "A7", "A6", "A5", "A4", "A3", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B11", "B10", "B2", "B1"] + }, + "encoder": { + "rotary": [ + {"pin_a": "A1", "pin_b": "A2"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "layout": [ + {"matrix": [0, 6], "x": 132, "y": 16, "flags": 2}, + {"matrix": [0, 9], "x": 172, "y": 16, "flags": 2}, + {"matrix": [0, 10], "x": 216, "y": 16, "flags": 2}, + {"matrix": [2, 10], "x": 216, "y": 32, "flags": 2}, + {"matrix": [2, 9], "x": 173, "y": 44, "flags": 2}, + {"matrix": [2, 6], "x": 132, "y": 44, "flags": 2}, + {"matrix": [2, 4], "x": 91, "y": 44, "flags": 2}, + {"matrix": [2, 2], "x": 50, "y": 44, "flags": 2}, + {"matrix": [2, 0], "x": 8, "y": 32, "flags": 2}, + {"matrix": [0, 0], "x": 8, "y": 16, "flags": 2}, + {"matrix": [0, 2], "x": 51, "y": 16, "flags": 2}, + {"matrix": [0, 4], "x": 91, "y": 16, "flags": 2} + ], + "driver": "ws2812", + "hue_steps": 4, + "max_brightness": 69, + "sat_steps": 4, + "val_steps": 4 + }, + "ws2812": { + "pin": "B15" + }, + "layouts": { + "LAYOUT_split_6bars": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w":1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w":1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 8.5, "y": 3} + ] + }, + "LAYOUT_split_5bars": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w":1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w":1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3, "w":1.5}, + {"matrix": [3, 2], "x": 3, "y": 3, "w": 1.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3,"w": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 1.5}, + {"matrix": [3, 8], "x": 9, "y": 3, "w":1.5} + ] + }, + "LAYOUT_split_4bars": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w":1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w":1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3}, + {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3} + ] + }, + "LAYOUT_6u_space": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w":1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w":1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6}, + {"matrix": [3, 8], "x": 8.5, "y": 3} + ] + }, + "LAYOUT_split_all_ortho": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w":1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w":1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3} + ] + }, + "LAYOUT_split_middle_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w":1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w":1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.5}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3} + ] + } + } +} diff --git a/keyboards/jlw/vault35_katana/keymaps/default/keymap.c b/keyboards/jlw/vault35_katana/keymaps/default/keymap.c new file mode 100644 index 00000000000..58040419e6c --- /dev/null +++ b/keyboards/jlw/vault35_katana/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +// Copyright 2023 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +// Just something for quick testing, not meant to be used +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_6bars( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, + KC_Z, KC_X, KC_C, KC_V, KC_B, RGB_TOG, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_ESC, MO(1), KC_ENT, KC_SPC, MO(2), KC_BSPC + ), + + [1] = LAYOUT_split_6bars( + _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, + _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, KC_1, KC_2, KC_3, _______, + _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_split_6bars( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_LEFT, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif + diff --git a/keyboards/jlw/vault35_katana/keymaps/default/rules.mk b/keyboards/jlw/vault35_katana/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/jlw/vault35_katana/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/jlw/vault35_katana/keymaps/vial/config.h b/keyboards/jlw/vault35_katana/keymaps/vial/config.h new file mode 100644 index 00000000000..606e8dd0b09 --- /dev/null +++ b/keyboards/jlw/vault35_katana/keymaps/vial/config.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0xB1, 0xE9, 0x64, 0x04, 0x6D, 0x6B, 0x15, 0x87} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 10 } + +#define VIAL_COMBO_ENTRIES 69 +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 +#define TAPPING_TERM 250 + diff --git a/keyboards/jlw/vault35_katana/keymaps/vial/keymap.c b/keyboards/jlw/vault35_katana/keymaps/vial/keymap.c new file mode 100644 index 00000000000..3efb896a040 --- /dev/null +++ b/keyboards/jlw/vault35_katana/keymaps/vial/keymap.c @@ -0,0 +1,47 @@ +// Copyright 2023 sporkus +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +#define HM_A LSFT_T(KC_A) +#define HM_S LALT_T(KC_S) +#define HM_D LGUI_T(KC_D) +#define HM_F LCTL_T(KC_F) +#define HM_J RCTL_T(KC_J) +#define HM_K RGUI_T(KC_K) +#define HM_L RALT_T(KC_L) +#define HM_Z LSFT_T(KC_Z) +#define HM_SLSH LSFT_T(KC_SLSH) +#define HM_QUOT RSFT_T(KC_QUOT) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_6bars( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, + KC_Z, KC_X, KC_C, KC_V, KC_B, RGB_TOG, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_ESC, MO(1), KC_ENT, KC_SPC, MO(2), KC_BSPC + ), + + [1] = LAYOUT_split_6bars( + _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, + _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, KC_1, KC_2, KC_3, _______, + _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_split_6bars( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_LEFT, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(_______, _______) }, + [2] = { ENCODER_CCW_CW(_______, _______) } +}; +#endif diff --git a/keyboards/jlw/vault35_katana/keymaps/vial/rules.mk b/keyboards/jlw/vault35_katana/keymaps/vial/rules.mk new file mode 100644 index 00000000000..6dc6b266cb1 --- /dev/null +++ b/keyboards/jlw/vault35_katana/keymaps/vial/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/jlw/vault35_katana/keymaps/vial/vial.json b/keyboards/jlw/vault35_katana/keymaps/vial/vial.json new file mode 100644 index 00000000000..8a23843053d --- /dev/null +++ b/keyboards/jlw/vault35_katana/keymaps/vial/vial.json @@ -0,0 +1,213 @@ +{ + "lighting": "vialrgb", + "matrix": { + "rows": 4, + "cols": 11 + }, + "layouts": { + "labels":[ + "ISO Enter", + [ + "Bottom Row", + "Cain bars", + "2u x2", + "3u x2", + "3u x1", + "6u", + "all 1u", + "1.5/1/1.5" + ] + ], + "keymap": [ + [ + { + "x": 4.5 + }, + "0,0\n\n\n\n\n\n\n\n\ne", + "0,1\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "y": 0.25, + "w": 1.5 + }, + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,6", + "0,7", + "0,8", + "0,9", + { + "w": 1.5 + }, + "0,10\n\n\n0,0", + { + "x": 0.25, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "0,10\n\n\n0,1" + ], + [ + { + "w": 1.25 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + { + "x": 0.5 + }, + "1,6", + "1,7", + "1,8", + "1,9", + { + "w": 1.25 + }, + "1,10\n\n\n0,0" + ], + [ + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10" + ], + [ + { + "x": 1.5 + }, + "3,1\n\n\n1,0", + { + "w": 1.25 + }, + "3,2\n\n\n1,0", + { + "w": 1.75 + }, + "3,3\n\n\n1,0", + { + "w": 1.75 + }, + "3,5\n\n\n1,0", + { + "w": 1.25 + }, + "3,7\n\n\n1,0", + "3,8\n\n\n1,0" + ], + [ + { + "x": 1.5 + }, + "3,1\n\n\n1,1", + "3,2\n\n\n1,1", + { + "w": 2 + }, + "3,3\n\n\n1,1", + { + "w": 2 + }, + "3,5\n\n\n1,1", + "3,7\n\n\n1,1", + "3,8\n\n\n1,1" + ], + [ + { + "x": 1.5 + }, + "3,1\n\n\n1,2", + { + "w": 3 + }, + "3,3\n\n\n1,2", + { + "w": 3 + }, + "3,6\n\n\n1,2", + "3,8\n\n\n1,2" + ], + [ + { + "x": 1.5, + "w": 1.25 + }, + "3,1\n\n\n1,3", + { + "w": 1.25 + }, + "3,2\n\n\n1,3", + { + "w": 3 + }, + "3,4\n\n\n1,3", + { + "w": 1.25 + }, + "3,7\n\n\n1,3", + { + "w": 1.25 + }, + "3,8\n\n\n1,3" + ], + [ + { + "x": 1.5 + }, + "3,1\n\n\n1,4", + { + "w": 6 + }, + "3,4\n\n\n1,4", + "3,8\n\n\n1,4" + ], + [ + { + "x": 1.5 + }, + "3,1\n\n\n1,5", + "3,2\n\n\n1,5", + "3,3\n\n\n1,5", + "3,4\n\n\n1,5", + "3,5\n\n\n1,5", + "3,6\n\n\n1,5", + "3,7\n\n\n1,5", + "3,8\n\n\n1,5" + ], + [ + { + "x": 1.5 + }, + "3,1\n\n\n1,6", + "3,2\n\n\n1,6", + { + "w": 1.5 + }, + "3,3\n\n\n1,6", + "3,4\n\n\n1,6", + { + "w": 1.5 + }, + "3,6\n\n\n1,6", + "3,7\n\n\n1,6", + "3,8\n\n\n1,6" + ] +] + } +} diff --git a/keyboards/jlw/vault35_katana/readme.md b/keyboards/jlw/vault35_katana/readme.md new file mode 100644 index 00000000000..b319db6363c --- /dev/null +++ b/keyboards/jlw/vault35_katana/readme.md @@ -0,0 +1,7 @@ +![Vault35 Katana Layout Image]() + +# Vault35 Katana Stagger + +Katana stagger version of Cain's Vault35 keyboard. +Check out the original product and other awesome projects of Cain at https://mechvault.net/. + diff --git a/keyboards/jlw/vault35_katana/rules.mk b/keyboards/jlw/vault35_katana/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/jlw/vault35_katana/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 2ab0d7ff95c93bb3722160b224c4126bf80ae6ae Mon Sep 17 00:00:00 2001 From: Greg Werbin Date: Sun, 3 Dec 2023 00:28:40 -0500 Subject: [PATCH 8/8] Add keyboard: KBDFans KBDPad MkII (#611) --- .../kbdfans/kbdpad/mk2/keymaps/vial/config.h | 10 +++ .../kbdfans/kbdpad/mk2/keymaps/vial/keymap.c | 28 ++++++ .../kbdfans/kbdpad/mk2/keymaps/vial/rules.mk | 9 ++ .../kbdfans/kbdpad/mk2/keymaps/vial/vial.json | 88 +++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 keyboards/kbdfans/kbdpad/mk2/keymaps/vial/config.h create mode 100644 keyboards/kbdfans/kbdpad/mk2/keymaps/vial/keymap.c create mode 100644 keyboards/kbdfans/kbdpad/mk2/keymaps/vial/rules.mk create mode 100644 keyboards/kbdfans/kbdpad/mk2/keymaps/vial/vial.json diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/config.h b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/config.h new file mode 100644 index 00000000000..fe44d6e2637 --- /dev/null +++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/config.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0xE7, 0x00, 0xAF, 0x2D, 0x29, 0x0C, 0x4C, 0xA0} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 0 } + +// Reduce firmware size +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/keymap.c new file mode 100644 index 00000000000..442f61c77b8 --- /dev/null +++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2019 Ryota Goto + * + * 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] = { + [0] = LAYOUT_ortho_6x4( /* Base */ + KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_P0, KC_PDOT, KC_PENT + ), +}; diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/rules.mk new file mode 100644 index 00000000000..0dfc44a94d1 --- /dev/null +++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/rules.mk @@ -0,0 +1,9 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes + +# Reduce firmware size +QMK_SETTINGS = no +TAP_DANCE_ENABLE = no +COMBO_ENABLE = no +KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/vial.json b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/vial.json new file mode 100644 index 00000000000..9017021b4a4 --- /dev/null +++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/vial/vial.json @@ -0,0 +1,88 @@ +{ + "lighting": "qmk_backlight_rgblight", + "matrix": { + "rows": 6, + "cols": 4 + }, + "layouts": { + "labels": [ + "Split Plus", + "Split Enter", + "Split Zero" + ], + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3" + ], + [ + { + "y": 0.25 + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + "2,0", + "2,1", + "2,2", + { + "h": 2 + }, + "3,3\n\n\n0,0", + { + "x": 0.25 + }, + "2,3\n\n\n0,1" + ], + [ + "3,0", + "3,1", + { + "x": -1 + }, + "3,1", + "3,2", + { + "x": 1.25 + }, + "3,3\n\n\n0,1" + ], + [ + "4,0", + "4,1", + "4,2", + { + "h": 2 + }, + "5,3\n\n\n1,0", + { + "x": 0.25 + }, + "4,3\n\n\n1,1" + ], + [ + { + "w": 2 + }, + "5,0\n\n\n2,0", + "5,2", + { + "x": 1.25 + }, + "5,3\n\n\n1,1" + ], + [ + { + "y": 0.25 + }, + "5,0\n\n\n2,1", + "5,1\n\n\n2,1" + ] + ] + } +}