From dbbf66ea0b1179ff9a116dc007fc3f9a790a2f5d Mon Sep 17 00:00:00 2001 From: tipsycod3r Date: Mon, 14 Mar 2022 14:04:16 +0800 Subject: [PATCH 1/5] added tipsytypist-vial keymap to Reviung39 --- .../keymaps/tipsytypist-vial/config.h | 31 +++ .../keymaps/tipsytypist-vial/keymap.c | 50 +++++ .../keymaps/tipsytypist-vial/rules.mk | 11 + .../keymaps/tipsytypist-vial/vial.json | 209 ++++++++++++++++++ 4 files changed, 301 insertions(+) create mode 100644 keyboards/reviung/reviung39/keymaps/tipsytypist-vial/config.h create mode 100644 keyboards/reviung/reviung39/keymaps/tipsytypist-vial/keymap.c create mode 100644 keyboards/reviung/reviung39/keymaps/tipsytypist-vial/rules.mk create mode 100644 keyboards/reviung/reviung39/keymaps/tipsytypist-vial/vial.json diff --git a/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/config.h b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/config.h new file mode 100644 index 00000000000..9fb05bb49be --- /dev/null +++ b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/config.h @@ -0,0 +1,31 @@ +/* Copyright 2019 gtips + * + * 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 . + */ + +#pragma once +#ifndef CONFIG_USER_H +#define CONFIG_USER_H +#define VIAL_KEYBOARD_UID {0xC0, 0xED, 0x8D, 0x24, 0x88, 0x5F, 0xD0, 0x9F} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 5 } + +#include "../../config.h" + +#define TAPPING_TERM 175 +#define TAPPING_TOGGLE 3 + +#endif + +// place overrides here \ No newline at end of file diff --git a/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/keymap.c b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/keymap.c new file mode 100644 index 00000000000..0bef702971f --- /dev/null +++ b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2019 gtips + * + * 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 + +enum layer_names { + _BASE, + _FNNO, + _ADJUST, +}; + +#define TAPPING_TOGGLE 3 +#define _BASE 0 +#define _FNNO 1 +#define _ADJUST 2 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_reviung39( + KC_GESC, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSPC, \ + LSFT_T(KC_TAB), KC_A, KC_S, LGUI_T(KC_H), LALT_T(KC_T), KC_G, KC_Y, RALT_T(KC_N), KC_E, KC_O, KC_I, KC_QUOT, \ + KC_LCTL, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), \ + TT(1), KC_SPC, TT(2) + ), + + [_FNNO] = LAYOUT_reviung39( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_LBRC, KC_RBRC, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ + KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_MINS, KC_EQL, RALT_T(KC_4), RGUI_T(KC_5), KC_6, KC_HOME, KC_END, \ + KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_BSLS, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS, + KC_TRNS, KC_BSPC, KC_PDOT + ), + + [_ADJUST] = LAYOUT_reviung39( + KC_GESC, KC_NLCK, KC_P7, KC_P8, KC_P9, KC_P0, KC_NO, KC_PGUP, KC_UP, KC_PGDOWN, KC_NO, KC_DEL, \ + KC_TRNS, KC_NO, KC_P4, LGUI_T(KC_P5), LALT_T(KC_P6), KC_BRIU, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, \ + KC_LCTL, KC_NO, KC_P1, KC_P2, KC_P3, KC_BRID, KC_VOLD, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, \ + KC_TRNS, KC_NO, KC_TRNS + ), +}; diff --git a/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/rules.mk b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/rules.mk new file mode 100644 index 00000000000..54e4f5ce219 --- /dev/null +++ b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/rules.mk @@ -0,0 +1,11 @@ +RGBLIGHT_ENABLE = no +OLED_DRIVER_ENABLE = yes +BOOTMAGIC_ENABLE = yes +MOUSEKEY_ENABLE = no +EXTRAKEY_ENABLE = yes +CONSOLE_ENABLE = no +COMMAND_ENABLE = yes +TAP_DANCE_ENABLE = yes +VIA_ENABLE = yes +VIAL_ENABLE = yes +EXTRAFLAGS += -flto \ No newline at end of file diff --git a/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/vial.json b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/vial.json new file mode 100644 index 00000000000..666920d7240 --- /dev/null +++ b/keyboards/reviung/reviung39/keymaps/tipsytypist-vial/vial.json @@ -0,0 +1,209 @@ +{ + "name": "Reviung39", + "vendorId": "0x03EB", + "productId": "0x2FF4", + "lighting": "none", + "matrix": { "rows": 7, "cols": 6 }, + "layouts": { + "keymap": + [ + [ + { + "x": 3 + }, + "0,3", + { + "x": 5 + }, + "3,2" + ], + [ + { + "y": -0.85, + "x": 2 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 3 + }, + "3,1", + { + "x": 1 + }, + "3,3" + ], + [ + { + "y": -0.7999999999999999, + "x": 1 + }, + "0,1", + { + "x": 3 + }, + "0,5", + { + "x": 1 + }, + "3,0", + { + "x": 3 + }, + "3,4" + ], + [ + { + "y": -0.8500000000000001, + "c": "#777777" + }, + "0,0", + { + "x": 11 + }, + "3,5" + ], + [ + { + "y": -0.5, + "x": 3, + "c": "#cccccc" + }, + "1,3", + { + "x": 5 + }, + "4,2" + ], + [ + { + "y": -0.8500000000000001, + "x": 2 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 3 + }, + "4,1", + { + "x": 1 + }, + "4,3" + ], + [ + { + "y": -0.7999999999999998, + "x": 1 + }, + "1,1", + { + "x": 3 + }, + "1,5", + { + "x": 1 + }, + "4,0", + { + "x": 3 + }, + "4,4" + ], + [ + { + "y": -0.8500000000000001, + "c": "#aaaaaa" + }, + "1,0", + { + "x": 11 + }, + "4,5" + ], + [ + { + "y": -0.5, + "x": 3, + "c": "#cccccc" + }, + "2,3", + { + "x": 5 + }, + "5,2" + ], + [ + { + "y": -0.8500000000000001, + "x": 2 + }, + "2,2", + { + "x": 1 + }, + "2,4", + { + "x": 3 + }, + "5,1", + { + "x": 1 + }, + "5,3" + ], + [ + { + "y": -0.7999999999999998, + "x": 1 + }, + "2,1", + { + "x": 3 + }, + "2,5", + { + "x": 1 + }, + "5,0", + { + "x": 3 + }, + "5,4" + ], + [ + { + "y": -0.8500000000000001, + "c": "#aaaaaa" + }, + "2,0", + { + "x": 11 + }, + "5,5" + ], + [ + { + "x": 4.25, + "w": 1.25 + }, + "6,0", + { + "w": 2 + }, + "6,1", + { + "w": 1.25 + }, + "6,2" + ] +] + + } +} \ No newline at end of file From 8dca3a5e9229728852192b262da2e6ef47bdd75b Mon Sep 17 00:00:00 2001 From: tipsycod3r <68339225+tipsycod3r@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:12:52 +0800 Subject: [PATCH 2/5] Added vial_ansi for Kikkou Ported kikkou ansi layout to vial. --- keyboards/kikkou/keymaps/vial_ansi/config.h | 7 + keyboards/kikkou/keymaps/vial_ansi/keymap.c | 54 ++++++++ keyboards/kikkou/keymaps/vial_ansi/rules.mk | 4 + keyboards/kikkou/keymaps/vial_ansi/vial.json | 134 +++++++++++++++++++ 4 files changed, 199 insertions(+) create mode 100644 keyboards/kikkou/keymaps/vial_ansi/config.h create mode 100644 keyboards/kikkou/keymaps/vial_ansi/keymap.c create mode 100644 keyboards/kikkou/keymaps/vial_ansi/rules.mk create mode 100644 keyboards/kikkou/keymaps/vial_ansi/vial.json diff --git a/keyboards/kikkou/keymaps/vial_ansi/config.h b/keyboards/kikkou/keymaps/vial_ansi/config.h new file mode 100644 index 00000000000..5891c3c66d7 --- /dev/null +++ b/keyboards/kikkou/keymaps/vial_ansi/config.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0xB1, 0x97, 0x73, 0x5C, 0x00, 0xB8, 0x2E, 0xF9} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/kikkou/keymaps/vial_ansi/keymap.c b/keyboards/kikkou/keymaps/vial_ansi/keymap.c new file mode 100644 index 00000000000..d7ac433753f --- /dev/null +++ b/keyboards/kikkou/keymaps/vial_ansi/keymap.c @@ -0,0 +1,54 @@ +/* +Copyright 2021 Matthew Dias + +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_65_ansi_blocker( + 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_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_LSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_65_ansi_blocker( + 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 + ), + + [2] = LAYOUT_65_ansi_blocker( + 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 + ), + + [3] = LAYOUT_65_ansi_blocker( + 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/kikkou/keymaps/vial_ansi/rules.mk b/keyboards/kikkou/keymaps/vial_ansi/rules.mk new file mode 100644 index 00000000000..043b69911e1 --- /dev/null +++ b/keyboards/kikkou/keymaps/vial_ansi/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/kikkou/keymaps/vial_ansi/vial.json b/keyboards/kikkou/keymaps/vial_ansi/vial.json new file mode 100644 index 00000000000..1d6ce1d80b3 --- /dev/null +++ b/keyboards/kikkou/keymaps/vial_ansi/vial.json @@ -0,0 +1,134 @@ +{ + "lighting": "none", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": ["ansi"], + "keymap": [ + [ + { + "a": 7 + }, + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "w": 2 + }, + "0,13", + "0,14" + ], + [ + { + "w": 1.5 + }, + "1,0", + "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", + "1,14" + ], + [ + { + "w": 1.75 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,13", + "2,14" + ], + [ + { + "w": 2.25 + }, + "3,0", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 1.75 + }, + "3,12", + "3,13", + "3,14" + ], + [ + { + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "w": 6.25 + }, + "4,6", + { + "w": 1.25 + }, + "4,10", + { + "w": 1.25 + }, + "4,11", + { + "x": 0.5 + }, + "4,12", + "4,13", + "4,14" + ] + ] + } +} From 0f057a1c44155c6c603ecb84595e30e2124caeec Mon Sep 17 00:00:00 2001 From: tipsycod3r <68339225+tipsycod3r@users.noreply.github.com> Date: Sun, 19 Feb 2023 04:50:26 +0800 Subject: [PATCH 3/5] Update config.h --- keyboards/sinpad20/keymaps/vial/config.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/sinpad20/keymaps/vial/config.h b/keyboards/sinpad20/keymaps/vial/config.h index b4ade2808fd..bc0d5b3ceb8 100644 --- a/keyboards/sinpad20/keymaps/vial/config.h +++ b/keyboards/sinpad20/keymaps/vial/config.h @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#define VIAL_KEYBOARD_UID {0xA6, 0x9A, 0x51, 0x3D, 0xF9, 0x02, 0x5C, 0x12} - -#define VIAL_UNLOCK_COMBO_ROWS { 5, 5 } - -#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0xA6, 0x9A, 0x51, 0x3D, 0xF9, 0x02, 0x5C, 0x12} + +#define VIAL_UNLOCK_COMBO_ROWS { 5, 5 } + +#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } From 4921c379e246cf513e1a6bf04310f3ed337a9add Mon Sep 17 00:00:00 2001 From: tipsycod3r <68339225+tipsycod3r@users.noreply.github.com> Date: Sun, 16 Jul 2023 20:52:03 +0800 Subject: [PATCH 4/5] Vial Port & Keymap Addition to YMD67 - Ported YMD67 - Added default vial keymap - Added my own keymap --- keyboards/ymdk/ymd67/config.h | 1 - .../ymdk/ymd67/keymaps/tipsy-vial/config.h | 15 +++ .../ymdk/ymd67/keymaps/tipsy-vial/keymap.c | 28 ++++ .../ymdk/ymd67/keymaps/tipsy-vial/rules.mk | 12 ++ .../ymdk/ymd67/keymaps/tipsy-vial/vial.json | 127 ++++++++++++++++++ keyboards/ymdk/ymd67/keymaps/vial/config.h | 13 ++ keyboards/ymdk/ymd67/keymaps/vial/keymap.c | 17 +++ keyboards/ymdk/ymd67/keymaps/vial/rules.mk | 11 ++ keyboards/ymdk/ymd67/keymaps/vial/vial.json | 127 ++++++++++++++++++ 9 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 keyboards/ymdk/ymd67/keymaps/tipsy-vial/config.h create mode 100644 keyboards/ymdk/ymd67/keymaps/tipsy-vial/keymap.c create mode 100644 keyboards/ymdk/ymd67/keymaps/tipsy-vial/rules.mk create mode 100644 keyboards/ymdk/ymd67/keymaps/tipsy-vial/vial.json create mode 100644 keyboards/ymdk/ymd67/keymaps/vial/config.h create mode 100644 keyboards/ymdk/ymd67/keymaps/vial/keymap.c create mode 100644 keyboards/ymdk/ymd67/keymaps/vial/rules.mk create mode 100644 keyboards/ymdk/ymd67/keymaps/vial/vial.json diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index 5b1aa59e274..f0984b7bd96 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -29,7 +29,6 @@ #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN -#define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ymdk/ymd67/keymaps/tipsy-vial/config.h b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/config.h new file mode 100644 index 00000000000..016d93f054d --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/config.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x4D, 0x8D, 0xF3, 0x75, 0xE4, 0xB6, 0xC3, 0xDE} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } +#ifndef NO_DEBUG +#define NO_DEBUG +#define TAPPING_TERM 175 +#define TAPPING_TOGGLE 3 +#endif // !NO_DEBUG +#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) +#define NO_PRINT +#endif // !NO_PRINT \ No newline at end of file diff --git a/keyboards/ymdk/ymd67/keymaps/tipsy-vial/keymap.c b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/keymap.c new file mode 100644 index 00000000000..e0bad00caad --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/keymap.c @@ -0,0 +1,28 @@ +#include QMK_KEYBOARD_H + +enum layer_names { + _BASE, + _FNNO +}; + +#define _BASE 0 +#define _FNNO 1 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT( + QK_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_GRV, 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_BSPC, + KC_LSFT, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, TT(1), KC_SPC, TT(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FNNO] = LAYOUT( + KC_ESC, 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_DEL, + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_LBRC, KC_RBRC, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_MINS, KC_EQL, KC_4, KC_5, KC_6, KC_HOME, KC_TRNS, KC_TRNS, + KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_BSLS, KC_1, KC_2, KC_3, KC_END, KC_PGUP, KC_UP, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/ymdk/ymd67/keymaps/tipsy-vial/rules.mk b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/rules.mk new file mode 100644 index 00000000000..0653f4e3e74 --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/rules.mk @@ -0,0 +1,12 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no +BLUETOOTH_ENABLE = no +AUDIO_ENABLE = no +MIDI_ENABLE = no +MOUSEKEY_ENABLE = no +POINTING_DEVICE_ENABLE = no +TERMINAL_ENABLE = no +EXTRAFLAGS += -flto +TAP_DANCE_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ymdk/ymd67/keymaps/tipsy-vial/vial.json b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/vial.json new file mode 100644 index 00000000000..c570be51755 --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/tipsy-vial/vial.json @@ -0,0 +1,127 @@ +{ + "lighting": "none", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "keymap":[ + { + "name": "YMD67" + }, + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13", + "0,14" + ], + [ + { + "w": 1.5 + }, + "1,0", + "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" + ], + [ + { + "w": 1.75 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,13" + ], + [ + { + "w": 2 + }, + "3,0", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + "3,12", + "3,13", + "3,14" + ], + [ + { + "w": 1.75 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "w": 1.25 + }, + "4,3", + { + "w": 3 + }, + "4,7", + { + "w": 1.25 + }, + "4,8", + { + "w": 1.25 + }, + "4,9", + "4,10", + "4,11", + "4,12", + "4,13" + ] + ] + } +} \ No newline at end of file diff --git a/keyboards/ymdk/ymd67/keymaps/vial/config.h b/keyboards/ymdk/ymd67/keymaps/vial/config.h new file mode 100644 index 00000000000..43fd08b0ab5 --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/vial/config.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x4D, 0x8D, 0xF3, 0x75, 0xE4, 0xB6, 0xC3, 0xDE} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } +#ifndef NO_DEBUG +#define NO_DEBUG +#endif // !NO_DEBUG +#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) +#define NO_PRINT +#endif // !NO_PRINT \ No newline at end of file diff --git a/keyboards/ymdk/ymd67/keymaps/vial/keymap.c b/keyboards/ymdk/ymd67/keymaps/vial/keymap.c new file mode 100644 index 00000000000..11cb55598e7 --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/vial/keymap.c @@ -0,0 +1,17 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [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_GRV, 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, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [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, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, 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/ymdk/ymd67/keymaps/vial/rules.mk b/keyboards/ymdk/ymd67/keymaps/vial/rules.mk new file mode 100644 index 00000000000..b8c43d8c214 --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/vial/rules.mk @@ -0,0 +1,11 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no +BLUETOOTH_ENABLE = no +AUDIO_ENABLE = no +MIDI_ENABLE = no +MOUSEKEY_ENABLE = no +POINTING_DEVICE_ENABLE = no +TERMINAL_ENABLE = no +EXTRAFLAGS += -flto \ No newline at end of file diff --git a/keyboards/ymdk/ymd67/keymaps/vial/vial.json b/keyboards/ymdk/ymd67/keymaps/vial/vial.json new file mode 100644 index 00000000000..c570be51755 --- /dev/null +++ b/keyboards/ymdk/ymd67/keymaps/vial/vial.json @@ -0,0 +1,127 @@ +{ + "lighting": "none", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "keymap":[ + { + "name": "YMD67" + }, + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13", + "0,14" + ], + [ + { + "w": 1.5 + }, + "1,0", + "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" + ], + [ + { + "w": 1.75 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,13" + ], + [ + { + "w": 2 + }, + "3,0", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + "3,12", + "3,13", + "3,14" + ], + [ + { + "w": 1.75 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "w": 1.25 + }, + "4,3", + { + "w": 3 + }, + "4,7", + { + "w": 1.25 + }, + "4,8", + { + "w": 1.25 + }, + "4,9", + "4,10", + "4,11", + "4,12", + "4,13" + ] + ] + } +} \ No newline at end of file From a348db9aa9146386e8ba7ae7bed6ff3c78a29ac0 Mon Sep 17 00:00:00 2001 From: tipsycod3r <68339225+tipsycod3r@users.noreply.github.com> Date: Tue, 18 Jul 2023 19:33:21 +0800 Subject: [PATCH 5/5] Submodule Changes --- lib/chibios | 2 +- lib/chibios-contrib | 2 +- lib/pico-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/chibios b/lib/chibios index 11edb161098..f836d24b06d 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51 +Subproject commit f836d24b06d7265696a33d1cea010bd6a931791d diff --git a/lib/chibios-contrib b/lib/chibios-contrib index a224be155ae..d03aa9cc2f7 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit a224be155ae18d38deccf33a6c1d259b9a5ad8d3 +Subproject commit d03aa9cc2f76468e431c71421015102956dd6ad7 diff --git a/lib/pico-sdk b/lib/pico-sdk index a3398d8d3a7..07edde8e498 160000 --- a/lib/pico-sdk +++ b/lib/pico-sdk @@ -1 +1 @@ -Subproject commit a3398d8d3a772f37fef44a74743a1de69770e9c2 +Subproject commit 07edde8e49890d2172bbc272aacc119f999df063