From 4ed04d923277b37930a40e8e81b75a3b497084be Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Sun, 4 Jun 2023 22:36:06 -0400 Subject: [PATCH] refactor: all vial keymaps now named 'vial' (#477) --- keyboards/cx60/keymaps/vial/keymap.c | 77 +++++++++--- keyboards/cx60/keymaps/vial/readme.md | 2 +- keyboards/cx60/keymaps/vial/vial.json | 7 ++ keyboards/cx60/keymaps/vial_caps/config.h | 26 ---- keyboards/cx60/keymaps/vial_caps/keymap.c | 66 ---------- keyboards/cx60/keymaps/vial_caps/readme.md | 1 - keyboards/cx60/keymaps/vial_caps/rules.mk | 5 - keyboards/cx60/keymaps/vial_caps/vial.json | 115 ------------------ .../doio/kb04/keymaps/vial-inverted/config.h | 22 ---- .../doio/kb04/keymaps/vial-inverted/keymap.c | 58 --------- .../doio/kb04/keymaps/vial-inverted/rules.mk | 5 - .../doio/kb04/keymaps/vial-inverted/vial.json | 13 -- keyboards/doio/kb04/keymaps/vial/vial.json | 12 +- .../keymaps/{vial_v2 => vial}/config.h | 0 .../keymaps/{vial_v2 => vial}/keymap.c | 17 +-- .../keymaps/{vial_v2 => vial}/rules.mk | 0 .../keymaps/{vial_v2 => vial}/vial.json | 0 17 files changed, 78 insertions(+), 348 deletions(-) delete mode 100644 keyboards/cx60/keymaps/vial_caps/config.h delete mode 100644 keyboards/cx60/keymaps/vial_caps/keymap.c delete mode 100644 keyboards/cx60/keymaps/vial_caps/readme.md delete mode 100644 keyboards/cx60/keymaps/vial_caps/rules.mk delete mode 100644 keyboards/cx60/keymaps/vial_caps/vial.json delete mode 100644 keyboards/doio/kb04/keymaps/vial-inverted/config.h delete mode 100644 keyboards/doio/kb04/keymaps/vial-inverted/keymap.c delete mode 100644 keyboards/doio/kb04/keymaps/vial-inverted/rules.mk delete mode 100644 keyboards/doio/kb04/keymaps/vial-inverted/vial.json rename keyboards/dztech/dz60rgb/keymaps/{vial_v2 => vial}/config.h (100%) rename keyboards/dztech/dz60rgb/keymaps/{vial_v2 => vial}/keymap.c (68%) rename keyboards/dztech/dz60rgb/keymaps/{vial_v2 => vial}/rules.mk (100%) rename keyboards/dztech/dz60rgb/keymaps/{vial_v2 => vial}/vial.json (100%) diff --git a/keyboards/cx60/keymaps/vial/keymap.c b/keyboards/cx60/keymaps/vial/keymap.c index fc8f2b444e..ba15564b69 100644 --- a/keyboards/cx60/keymaps/vial/keymap.c +++ b/keyboards/cx60/keymaps/vial/keymap.c @@ -14,6 +14,19 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H +typedef union { + uint32_t raw; + struct { + bool caps_indicator :1; + }; +} user_config_t; + +user_config_t user_config; + +enum custom_keycodes { + CX_TOG = QK_KB_0 +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 0: Base Layer */ LAYOUT_all( @@ -25,25 +38,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 1: Function Layer */ LAYOUT_all( - 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, + 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI,RGB_VAI, RGB_HUD, - RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_MOD), - - /* 2: Function Layer 2 */ - LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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: Function Layer 3 */ - LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_VAI, RGB_HUD, + RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_MOD) }; + +/* rgb underglow capslock indicator; by Dominic Lee/MYMKB; */ +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( {0, 14, HSV_RED} ); +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( my_capslock_layer ); + +bool led_update_user(led_t led_state) { + if (user_config.caps_indicator) { + rgblight_set_layer_state(0, led_state.caps_lock); + }; + return true; +} + +void eeconfig_init_user(void) { + user_config.raw = 0; + user_config.caps_indicator = 1; + eeconfig_update_user(user_config.raw); +} + +void keyboard_post_init_user(void) { + /* Enable the LED layers */ + rgblight_layers = my_rgb_layers; + + user_config.raw = eeconfig_read_user(); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case CX_TOG: + if (record->event.pressed) { + // Toggle whether the caps indicator should be enabled. + user_config.caps_indicator ^= 1; + // Save indicator toggle status. + eeconfig_update_user(user_config.raw); + // Force update check. + led_update_user(host_keyboard_led_state()); + } + return false; + default: + return true; + } +} +/* rgb underglow capslock indicator; end; */ diff --git a/keyboards/cx60/keymaps/vial/readme.md b/keyboards/cx60/keymaps/vial/readme.md index 123168d4ad..02ee094c4b 100644 --- a/keyboards/cx60/keymaps/vial/readme.md +++ b/keyboards/cx60/keymaps/vial/readme.md @@ -1 +1 @@ -# The CX60 Vial default layout +# The CX60 Vial default layout, with Capslock RGB underglow indicator diff --git a/keyboards/cx60/keymaps/vial/vial.json b/keyboards/cx60/keymaps/vial/vial.json index 4ef4eb9aa5..b3449774fe 100644 --- a/keyboards/cx60/keymaps/vial/vial.json +++ b/keyboards/cx60/keymaps/vial/vial.json @@ -4,6 +4,13 @@ "productId": "0x3630", "lighting": "qmk_backlight_rgblight", "matrix": { "rows": 5, "cols": 14 }, + "customKeycodes": [ + { + "name": "Toggle ind.", + "title": "Enable/Disable the caps lock indicator LED.", + "shortName": "CX_TOG" + } + ], "layouts": { "keymap": [ [ diff --git a/keyboards/cx60/keymaps/vial_caps/config.h b/keyboards/cx60/keymaps/vial_caps/config.h deleted file mode 100644 index f2e3de495c..0000000000 --- a/keyboards/cx60/keymaps/vial_caps/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 Horns Lyn - -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 - -/* this is for rgb underglow capslock indicator */ -#define RGBLIGHT_LAYERS -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF - -/* Vial setup */ -#define VIAL_KEYBOARD_UID {0xB2, 0x57, 0x48, 0xED, 0x67, 0x80, 0x12, 0x18} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } diff --git a/keyboards/cx60/keymaps/vial_caps/keymap.c b/keyboards/cx60/keymaps/vial_caps/keymap.c deleted file mode 100644 index 065752e910..0000000000 --- a/keyboards/cx60/keymaps/vial_caps/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2021 Horns Lyn - -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: Base Layer */ - LAYOUT_all( - 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_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, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), - - /* 1: Function Layer */ - LAYOUT_all( - 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, 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_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI,RGB_VAI, RGB_HUD, - RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_MOD), - - /* 2: Function Layer 2 */ - LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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: Function Layer 3 */ - LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -}; - -/* rgb underglow capslock indicator; by Dominic Lee/MYMKB; */ -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( {0, 14, HSV_RED} ); - -bool led_update_user(led_t led_state) { - rgblight_set_layer_state(0, led_state.caps_lock); - return true; -} - -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( my_capslock_layer ); - -void keyboard_post_init_user(void) { - /* Enable the LED layers */ - rgblight_layers = my_rgb_layers; -} -/* rgb underglow capslock indicator; end; */ - diff --git a/keyboards/cx60/keymaps/vial_caps/readme.md b/keyboards/cx60/keymaps/vial_caps/readme.md deleted file mode 100644 index 02ee094c4b..0000000000 --- a/keyboards/cx60/keymaps/vial_caps/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The CX60 Vial default layout, with Capslock RGB underglow indicator diff --git a/keyboards/cx60/keymaps/vial_caps/rules.mk b/keyboards/cx60/keymaps/vial_caps/rules.mk deleted file mode 100644 index 2742175b12..0000000000 --- a/keyboards/cx60/keymaps/vial_caps/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -LTO_ENABLE = yes -VIA_ENABLE = yes -VIAL_ENABLE = yes -QMK_SETTINGS = no -KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/cx60/keymaps/vial_caps/vial.json b/keyboards/cx60/keymaps/vial_caps/vial.json deleted file mode 100644 index 4ef4eb9aa5..0000000000 --- a/keyboards/cx60/keymaps/vial_caps/vial.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "name": "CX60", - "vendorId": "0x4358", - "productId": "0x3630", - "lighting": "qmk_backlight_rgblight", - "matrix": { "rows": 5, "cols": 14 }, - "layouts": { - "keymap": [ - [ - "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" - ], - [ - { - "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,12" - ], - [ - { - "w": 2 - }, - "3,0", - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,12", - "3,13" - ], - [ - { - "w": 1.25 - }, - "4,0", - { - "w": 1.25 - }, - "4,1", - { - "w": 1.25 - }, - "4,2", - { - "w": 6.25 - }, - "4,5", - "4,9", - "4,10", - "4,11", - "4,12", - "4,13" - ] - ] - } -} diff --git a/keyboards/doio/kb04/keymaps/vial-inverted/config.h b/keyboards/doio/kb04/keymaps/vial-inverted/config.h deleted file mode 100644 index 2a2cbba017..0000000000 --- a/keyboards/doio/kb04/keymaps/vial-inverted/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 filmstarr - * - * 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 - -#define VIAL_KEYBOARD_UID {0x11, 0x10, 0xF5, 0xD0, 0x98, 0x20, 0xE9, 0xF6} - -#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } \ No newline at end of file diff --git a/keyboards/doio/kb04/keymaps/vial-inverted/keymap.c b/keyboards/doio/kb04/keymaps/vial-inverted/keymap.c deleted file mode 100644 index 29f5061825..0000000000 --- a/keyboards/doio/kb04/keymaps/vial-inverted/keymap.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2022 filmstarr - * - * 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 { - _LAY0, - _LAY1, - _LAY2, - _LAY3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* - L0: - ┌───┬───┬───┬───┐ ┌───┐ - │Nxt│Ply│Prv│MO1│ │Mut│ - └───┴───┴───┴───┘ └───┘ - L1: - ┌───┬───┬───┬───┐ ┌───┐ - │Hud│Tog│Mod│ │ │ │ - └───┴───┴───┴───┘ └───┘ -*/ - [_LAY0] = LAYOUT( - KC_MNXT, KC_MPLY, KC_MPRV, MO(_LAY1), KC_MUTE - ), - [_LAY1] = LAYOUT( - RGB_MOD, RGB_TOG, RGB_HUD, KC_TRNS, KC_TRNS - ), - [_LAY2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_LAY3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), -}; - -#ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [_LAY2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -}; -#endif \ No newline at end of file diff --git a/keyboards/doio/kb04/keymaps/vial-inverted/rules.mk b/keyboards/doio/kb04/keymaps/vial-inverted/rules.mk deleted file mode 100644 index ae96a4ffd9..0000000000 --- a/keyboards/doio/kb04/keymaps/vial-inverted/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes - -# Encoder enabled -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/doio/kb04/keymaps/vial-inverted/vial.json b/keyboards/doio/kb04/keymaps/vial-inverted/vial.json deleted file mode 100644 index db35a9501e..0000000000 --- a/keyboards/doio/kb04/keymaps/vial-inverted/vial.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "KB04-01", - "vendorId": "0xD010", - "productId": "0x0401", - "lighting": "qmk_rgblight", - "matrix": { "rows": 1, "cols": 8 }, - "layouts": { - "keymap":[ - [ { "x": 0.5 }, "0,0\n\n\n\n\n\n\n\n\ne", "0,4" , "0,1\n\n\n\n\n\n\n\n\ne" ], - [ { "y": 0.25 }, "0,3", "0,2", "0,1", "0,0" ] - ] - } - } \ No newline at end of file diff --git a/keyboards/doio/kb04/keymaps/vial/vial.json b/keyboards/doio/kb04/keymaps/vial/vial.json index d311d051f1..217aec711b 100644 --- a/keyboards/doio/kb04/keymaps/vial/vial.json +++ b/keyboards/doio/kb04/keymaps/vial/vial.json @@ -5,9 +5,11 @@ "lighting": "qmk_rgblight", "matrix": { "rows": 1, "cols": 8 }, "layouts": { - "keymap":[ - [ "0,0", "0,1", "0,2", "0,3" ], - [ { "y": 0.25, "x": 0.5 }, "0,0\n\n\n\n\n\n\n\n\ne", "0,4" , "0,1\n\n\n\n\n\n\n\n\ne" ] - ] + "labels": [ "Inverted" ], + "keymap": [ + ["0,0\n\n\n0,0","0,1\n\n\n0,0","0,2\n\n\n0,0","0,3\n\n\n0,0"], + [{"y":0.25,"x":0.5},"0,0\n\n\n0,0\n\n\n\n\n\ne","0,4\n\n\n0,0","0,1\n\n\n0,0\n\n\n\n\n\ne"], + [{"x":0.5},"0,1\n\n\n0,1\n\n\n\n\n\ne","0,4\n\n\n0,1","0,0\n\n\n0,1\n\n\n\n\n\ne"], + [{"y":0.25},"0,3\n\n\n0,1","0,2\n\n\n0,1","0,1\n\n\n0,1","0,0\n\n\n0,1"]] } - } \ No newline at end of file +} diff --git a/keyboards/dztech/dz60rgb/keymaps/vial_v2/config.h b/keyboards/dztech/dz60rgb/keymaps/vial/config.h similarity index 100% rename from keyboards/dztech/dz60rgb/keymaps/vial_v2/config.h rename to keyboards/dztech/dz60rgb/keymaps/vial/config.h diff --git a/keyboards/dztech/dz60rgb/keymaps/vial_v2/keymap.c b/keyboards/dztech/dz60rgb/keymaps/vial/keymap.c similarity index 68% rename from keyboards/dztech/dz60rgb/keymaps/vial_v2/keymap.c rename to keyboards/dztech/dz60rgb/keymaps/vial/keymap.c index cd58713fae..b8a125c601 100644 --- a/keyboards/dztech/dz60rgb/keymaps/vial_v2/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/vial/keymap.c @@ -2,7 +2,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + 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_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, CTL_T(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, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), @@ -10,30 +10,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( TO(3), 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_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, + _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EE_CLR, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, _______, _______, _______, TO(4), _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), [2] = LAYOUT( _______, 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, _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, - _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EEP_RST, + _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT( - KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, TO(0), _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_PENT, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, _______, _______, _______ - ), - [4] = LAYOUT( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_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, - CTL_T(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, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RGHT ) }; diff --git a/keyboards/dztech/dz60rgb/keymaps/vial_v2/rules.mk b/keyboards/dztech/dz60rgb/keymaps/vial/rules.mk similarity index 100% rename from keyboards/dztech/dz60rgb/keymaps/vial_v2/rules.mk rename to keyboards/dztech/dz60rgb/keymaps/vial/rules.mk diff --git a/keyboards/dztech/dz60rgb/keymaps/vial_v2/vial.json b/keyboards/dztech/dz60rgb/keymaps/vial/vial.json similarity index 100% rename from keyboards/dztech/dz60rgb/keymaps/vial_v2/vial.json rename to keyboards/dztech/dz60rgb/keymaps/vial/vial.json