refactor: update vial keymap

keyboards/mechwild/puckbuddy/keymaps/vial/config.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-/* VIAL Specific definitions */
 #define VIAL_KEYBOARD_UID {0x5C, 0x46, 0x5D, 0x32, 0xF6, 0xD3, 0x42, 0xCA}
 #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 }
 #define VIAL_UNLOCK_COMBO_COLS { 0, 2 }
-#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_PGDN, KC_PGUP, USER01, USER00, USER04, USER03, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}

keyboards/mechwild/puckbuddy/keymaps/vial/keymap.c

@@ -1,67 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-//void keyboard_post_init_user(void) {
-  // Customise these values to desired behaviour
-  //debug_enable=true;
-  //debug_matrix=true;
-  //debug_keyboard=true;
-  //debug_mouse=true;
-//}
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN1,
-    _FN2,
-    _FN3
-};
-/*   Physical Layout:
- *   /-------------------\
- *   |ENC| 1 | 2 | 3 |ENC|
- *   |---+---'---'---+---|
- *   | 4 |           | 5 |
- *   |---|           |---|
- *   | 6 |           | 7 |
- *   |---|           |---|
- *   | 8 |           | 9 |
- *   \-----,---,---,-----/
- *     | A | B | C | D |
- *     \---'---'---'---/
- *
- *   Keymap Layout:
- *   ENC, 1, 2, 3,    ENC,
- *   4,               5,
- *   6,               7,
- *   8,   A, B, C, D, 9,
- *   
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-    KC_MUTE,  MO(_FN3), MO(_FN2), MO(_FN1),       LGUI(KC_D),
-    MO(_FN2),                                     KC_HOME,
-    MO(_FN3),                                     KC_END,
-    KC_BTN3,  KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1, DPI_FINE
-    ),
-    [_FN1] = LAYOUT(
-    RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS,          TAP_TOG,
-    DPI_UP,                                      TAP_UP,
-    DPI_DN,                                      TAP_DN,
-    KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_TRNS
-    ),
-    [_FN2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_TOG,
-    KC_TRNS,                                     RGB_MOD,
-    KC_TRNS,                                     RGB_RMOD,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RESET,
-    KC_TRNS,                                     KC_TRNS,
-    KC_TRNS,                                     KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};

keyboards/mechwild/puckbuddy/keymaps/vial/keymap.json

@@ -0,0 +1,38 @@
+{
+   "keyboard": "mechwild/puckbuddy",
+   "keymap": "vial",
+   "version": 1,
+   "layout": "LAYOUT",
+   "layers": [
+      [
+         "KC_MUTE",  "KC_TRNS", "MO(2)", "MO(1)",                "LGUI(KC_D)",
+         "MO(1)",                                                "KC_HOME",
+         "MO(2)",                                                "KC_END",
+         "KC_BTN3",  "KC_BTN1", "KC_BTN2", "KC_BTN2", "KC_BTN1", "DPI_FINE"
+      ],
+      [
+         "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS",           "TAP_TOG",
+         "DPI_UP",                                             "TAP_UP",
+         "DPI_DN",                                             "TAP_DN",
+         "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_PGDN", "KC_END", "KC_TRNS"
+      ],
+      [
+         "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "RGB_TOG",
+         "KC_TRNS",                                             "RGB_MOD",
+         "KC_TRNS",                                             "RGB_RMOD",
+         "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+      ]
+   ],
+   "config": {
+      "features": {
+         "via": true,
+         "vial": true,
+         "encoder_map": true
+      }
+   },
+   "encoders": [
+      [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGDN", "cw": "KC_PGUP"}],
+      [{"ccw": "DPI_DN", "cw": "DPI_UP"}, {"ccw": "TAP_DN", "cw": "TAP_UP"}],
+      [{"ccw": "KC_TRNS", "cw": "KC_TRNS"}, {"ccw": "KC_TRNS", "cw": "KC_TRNS"}]
+   ]
+}

keyboards/mechwild/puckbuddy/keymaps/vial/rules.mk

@@ -1,6 +0,0 @@
-# Bootloader selection
-VIA_ENABLE = yes
-VIAL_ENABLE = yes
-VIAL_ENCODERS_ENABLE = yes
-
-LTO_ENABLE = yes

keyboards/mechwild/puckbuddy/keymaps/vial/vial.json

@@ -1,54 +1,51 @@
 {
-  "name": "MechWild PuckBuddy",
-  "vendorId": "0x6D77",
-  "productId": "0x170F",
   "lighting": "qmk_rgblight",
   "matrix": { "rows": 4, "cols": 4 },
   "customKeycodes": [
   {
-    "name": "DPI+",
+    "name": "DPI_UP",
     "title": "Increase the DPI of the touchpad.",
-    "shortName": "DPI_UP"
+    "shortName": "DPI\nDown"
   },
   {
-    "name": "DPI-",
+    "name": "DPI_DN",
     "title": "Decrease the DPI of the touchpad.",
-    "shortName": "DPI_DN"
+    "shortName": "DPI\nUp"
   },
   {
-    "name": "FINE",
+    "name": "DPI_FINE",
-    "title": "Temporarily lower the DPI to minimum while held.",
+    "title": "While held, drops the DPI to minimum.",
-    "shortName": "DPI_FINE"
+    "shortName": "Sniper\nMode"
   },
   {
-    "name": "TAP+",
+    "name": "TAP_UP",
-    "title": "Increase the tapping term.",
+    "title": "Increase the tapping term. This affects mod/layer-tap timing.",
-    "shortname": "TAP_UP"
+    "shortname": "Tap Term\nUp"
   },
   {
-    "name": "TAP-",
+    "name": "TAP_DN",
-    "title": "Decrease the tapping term.",
+    "title": "Decrease the tapping term. This affects mod/layer-tap timing.",
-    "shortname": "TAP_DN"
+    "shortname": "Tap Term\nDown"
   },
   {
     "name": "TAP_ON",
-    "title": "Tap clicking on.",
+    "title": "Enable tap to click on touchpad.",
-    "shortname": "TAP_ON"
+    "shortname": "Tap-Click\nOn"
   },
   {
     "name": "TP_OFF",
-    "title": "Tap clicking off.",
+    "title": "Disable tap to click on touchpad.",
-    "shortname": "TAP_OFF"
+    "shortname": "Tap-Click\nOff"
   },
   {
-    "name": "TP_TG",
+    "name": "TAP_TOG",
-    "title": "Toggle tap clicking being on or off.",
+    "title": "Toggle touchpad tap clicking on/off.",
-    "shortname": "TAP_TOG"
+    "shortname": "Tap-Click\nToggle"
   }
   ],
   "layouts": {
     "keymap": [
-		["0,1\n\n\n\n\n\n\n\n\ne",{"x":6.5},"1,1\n\n\n\n\n\n\n\n\ne"],
+        ["0,1\n\n\n\n\n\n\n\n\ne",{"x":6.5},"1,1\n\n\n\n\n\n\n\n\ne"],
         [{"y":-0.5,"x":1.25},"0,0",{"x":0.5},"0,1","1,1","2,1",{"x":0.5},"0,2"],
         [{"y":-0.5},"0,0\n\n\n\n\n\n\n\n\ne",{"x":6.5},"1,0\n\n\n\n\n\n\n\n\ne"],
         [{"y":-0.25,"x":1.25},"1,0",{"x":4},"1,2"],