Merge branch 'vial' of https://github.com/vial-kb/vial-qmk into vial-…

…wireless

keyboards/fruitykeeb/fruitbar/r2/keymaps/vial/config.h

@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x9E, 0x8B, 0x40, 0x13, 0x11, 0xDC, 0x21, 0x28}
+
+#define VIAL_UNLOCK_COMBO_ROWS {0, 2}
+#define VIAL_UNLOCK_COMBO_COLS {0, 14}

keyboards/fruitykeeb/fruitbar/r2/keymaps/vial/keymap.json

@@ -0,0 +1,35 @@
+{
+   "keyboard": "fruitykeeb/fruitbar/r2",
+   "keymap": "vial",
+   "version": 1,
+   "layout": "LAYOUT_all",
+   "layers": [
+      [
+         "KC_ESC",   "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_HOME",  "KC_END",
+         "KC_TAB",   "KC_A",     "KC_S",     "KC_D",     "KC_F",     "KC_G",     "KC_H",     "KC_J",     "KC_K",     "KC_L",     "KC_SCLN",  "KC_QUOT",  "KC_NUBS",  "KC_ENT",
+         "KC_LSFT",  "KC_NUHS",  "KC_Z",     "KC_X",     "KC_C",     "KC_V",     "KC_B",     "KC_N",     "KC_M",     "KC_COMM",  "KC_DOT",   "KC_SLSH",  "KC_RSFT",  "MO(1)",    "KC_UP",
+         "KC_LCTL",  "KC_LGUI",  "KC_LALT",  "KC_SPC",   "KC_SPC",   "KC_SPC",   "KC_RALT",  "MO(1)",    "KC_RCTL",  "KC_LEFT",  "KC_DOWN",  "KC_RIGHT"
+      ],
+      [
+         "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_DEL",   "KC_PGDN",  "KC_PGUP",
+         "KC_CAPS",  "KC_F1",    "KC_F2",    "KC_F3",    "KC_F4",    "KC_F5",    "KC_F6",    "KC_F7",    "KC_F8",    "KC_F9",    "KC_F10",   "KC_F11",   "KC_TRNS",  "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",
+         "QK_BOOT",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS"
+      ]
+   ],
+   "config": {
+      "features": {
+         "encoder_map": true,
+         "via": true,
+         "vial": true
+      }
+   },
+   "encoders": [
+      [
+         { "ccw": "KC_VOLD", "cw": "KC_VOLU" }
+      ],
+      [
+         { "ccw": "KC_TRNS", "cw": "KC_TRNS" }
+      ]
+   ]
+}

keyboards/fruitykeeb/fruitbar/r2/keymaps/vial/vial.json

@@ -0,0 +1,24 @@
+{
+    "lighting": "qmk_rgblight",
+    "matrix": {
+        "rows": 4,
+        "cols": 16
+    },
+    "layouts": {
+        "labels": [
+            "Split Enter",
+            "Split Left Shift",
+            "Split Right Shift",
+            [ "Bottom Row", "6.25u", "7u", "Split" ]
+        ],
+        "keymap": [
+			[{"x":18.5,"c":"#aaaaaa"},"0,0\n\n\n\n\n\n\n\n\ne","0,1\n\n\n\n\n\n\n\n\ne"],
+            [{"x":2.5,"c":"#777777","w":1.5},"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":1.5},"0,13",{"x":0.5},"0,14","0,15"],
+            [{"x":2.5,"w":1.75},"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",{"c":"#777777","w":2.25},"1,13\n\n\n0,0",{"x":3,"c":"#cccccc"},"1,12\n\n\n0,1",{"c":"#777777","w":1.25},"1,13\n\n\n0,1"],
+            [{"c":"#aaaaaa","w":1.25},"2,0\n\n\n1,1",{"c":"#cccccc"},"2,1\n\n\n1,1",{"x":0.25,"c":"#aaaaaa","w":2.25},"2,0\n\n\n1,0",{"c":"#cccccc"},"2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11",{"c":"#aaaaaa","w":2.25},"2,12\n\n\n2,0",{"x":1,"c":"#777777"},"2,14",{"x":1.5,"c":"#aaaaaa","w":1.25},"2,12\n\n\n2,1","2,13\n\n\n2,1"],
+            [{"x":2.5,"w":1.25},"3,0\n\n\n3,0",{"w":1.25},"3,1\n\n\n3,0",{"w":1.25},"3,2\n\n\n3,0",{"c":"#cccccc","w":6.25},"3,7\n\n\n3,0",{"c":"#aaaaaa","w":1.25},"3,10\n\n\n3,0",{"w":1.25},"3,11\n\n\n3,0",{"w":1.25},"3,12\n\n\n3,0",{"x":0.75,"c":"#777777"},"3,13","3,14","3,15"],
+            [{"y":0.25,"x":2.5,"c":"#aaaaaa","w":1.5},"3,0\n\n\n3,1","3,1\n\n\n3,1",{"w":1.25},"3,2\n\n\n3,1",{"c":"#cccccc","w":7},"3,7\n\n\n3,1",{"c":"#aaaaaa","w":1.5},"3,11\n\n\n3,1",{"w":1.5},"3,12\n\n\n3,1"],
+            [{"x":2.5,"w":1.25},"3,0\n\n\n3,2",{"w":1.25},"3,1\n\n\n3,2",{"w":1.25},"3,2\n\n\n3,2",{"c":"#cccccc","w":2.75},"3,4\n\n\n3,2",{"w":2.25},"3,7\n\n\n3,2",{"c":"#aaaaaa","w":1.25},"3,9\n\n\n3,2",{"w":1.25},"3,10\n\n\n3,2",{"w":1.25},"3,11\n\n\n3,2",{"w":1.25},"3,12\n\n\n3,2"]
+        ]
+    }
+}

keyboards/ploopyco/madromys/keymaps/vial/config.h

@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x3D, 0x23, 0x68, 0xC4, 0x1F, 0x4E, 0x55, 0x8C}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 }
+#define VIAL_UNLOCK_COMBO_COLS { 3, 5 }

keyboards/ploopyco/madromys/keymaps/vial/keymap.c

@@ -0,0 +1,22 @@
+/* Copyright 2023 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <[email protected]>
+ * Copyright 2019 Sunjun Kim
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( KC_BTN4, KC_BTN5, DRAG_SCROLL, KC_BTN2, KC_BTN1, KC_BTN3 )
+};

keyboards/ploopyco/madromys/keymaps/vial/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes

keyboards/ploopyco/madromys/keymaps/vial/vial.json

@@ -0,0 +1,46 @@
+{
+  "name": "PloopyCo Trackball",
+  "vendorId": "0x5043",
+  "productId": "0x5442",
+  "lighting": "none",
+  "customKeycodes": [
+    {"name": "DPI Config", "title": "DPI Config", "shortName": "DPI"},
+    {"name": "Drag Scroll", "title": "Drag Scroll", "shortName": "Drag\nScrl"}
+  ],
+  "matrix": {"rows": 1, "cols": 6},
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "h": 1.5
+        },
+        "0,0",
+        {
+          "x": -1,
+          "y": -1.7,
+          "h": 1.5
+        },
+        "0,1",
+        {
+          "x": 0.2
+        },
+        "0,2",
+        {
+          "x": 0.2
+        },
+        "0,3",
+        {
+          "x": 0.2,
+          "h": 1.5
+        },
+        "0,4",
+        {
+          "x": -1,
+          "y": 1.7,
+          "h": 1.5
+        },
+        "0,5"
+      ]
+    ]
+  }
+}

keyboards/takayoshiotake/three_octave_sharp/info.json

@@ -0,0 +1,69 @@
+{
+    "keyboard_name": "Three Octave Sharp",
+    "maintainer": "takayoshiotake",
+    "manufacturer": "takayoshiotake",
+    "url": "https://github.com/takayoshiotake/three-octave-sharp-38-key-keyboard",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x8CAE",
+        "vid": "0x1209",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP24", "GP26", "GP27", "GP28", "GP29", "GP0", "GP1", "GP2", "GP4", "GP5"],
+        "rows": ["GP20", "GP21", "GP3", "GP25"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Tab", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "Q", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "W", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "E", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "R", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "T", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "Y", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "U", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "I", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "O", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "P", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "BS", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "Caps", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "label": "G", "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "label": "H", "matrix": [1, 6], "x": 6.25, "y": 1 },
+                { "label": "J", "matrix": [1, 7], "x": 7.25, "y": 1 },
+                { "label": "K", "matrix": [1, 8], "x": 8.25, "y": 1 },
+                { "label": "L", "matrix": [1, 9], "x": 9.25, "y": 1 },
+                { "label": "Return", "matrix": [1, 10], "w": 1.75, "x": 10.25, "y": 1 },
+                { "label": "Shift", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "X", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "C", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "V", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "B", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "N", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "M", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": ",", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "Shift", "matrix": [2, 9], "w": 2.25, "x": 9.75, "y": 2 },
+                { "label": "Ctrl", "matrix": [3, 0], "w": 1.25, "x": 0.75, "y": 3 },
+                { "label": "Cmd", "matrix": [3, 1], "w": 1.25, "x": 2, "y": 3 },
+                { "label": "Space", "matrix": [3, 2], "w": 6, "x": 3.25, "y": 3 },
+                { "label": "Opt", "matrix": [2, 10], "x": 9.25, "y": 3 },
+                { "label": "Fn", "matrix": [2, 11], "x": 10.25, "y": 3 }
+            ]
+        }
+    }
+}

keyboards/takayoshiotake/three_octave_sharp/keymaps/default/keymap.c

@@ -0,0 +1,45 @@
+#include QMK_KEYBOARD_H
+
+#define KC_JAPANESE_EISUU KC_LNG2
+#define KC_JAPANESE_KANA KC_LNG1
+
+#define KC_JEIS KC_JAPANESE_EISUU
+#define KC_JKAN KC_JAPANESE_KANA
+
+#define LT_L1ES LT(1, KC_ESC)
+#define MT_LCJE MT(MOD_LGUI, KC_JEIS)
+#define MT_RAJK MT(MOD_RALT, KC_JKAN)
+
+#define KC_MUTE KC_KB_MUTE
+#define KC_VOLM KC_KB_VOLUME_DOWN
+#define KC_VOLP KC_KB_VOLUME_UP
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		LT_L1ES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    MO(2),   MO(3),
+		KC_LCTL, MT_LCJE, KC_SPC,  MT_RAJK, KC_ROPT
+	),
+
+	[1] = LAYOUT(
+		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,
+		XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
+		_______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+		_______, _______, _______, _______, _______
+	),
+
+	[2] = LAYOUT(
+		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+		KC_CAPS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_DOWN, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_RSFT,
+		_______, _______, _______, _______, _______
+	),
+
+	[3] = LAYOUT(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+		KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  _______,
+		_______, KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLM, KC_VOLP, XXXXXXX,
+		_______, _______, _______, _______, _______
+	)
+};

keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/config.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x51, 0x11, 0x9E, 0xA8, 0x32, 0xC7, 0x1A, 0x24}
+
+#define VIAL_UNLOCK_COMBO_ROWS {1, 1}
+#define VIAL_UNLOCK_COMBO_COLS {0, 10}

keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/keymap.c

@@ -0,0 +1,45 @@
+#include QMK_KEYBOARD_H
+
+#define KC_JAPANESE_EISUU KC_LNG2
+#define KC_JAPANESE_KANA KC_LNG1
+
+#define KC_JEIS KC_JAPANESE_EISUU
+#define KC_JKAN KC_JAPANESE_KANA
+
+#define LT_L1ES LT(1, KC_ESC)
+#define MT_LCJE MT(MOD_LGUI, KC_JEIS)
+#define MT_RAJK MT(MOD_RALT, KC_JKAN)
+
+#define KC_MUTE KC_KB_MUTE
+#define KC_VOLM KC_KB_VOLUME_DOWN
+#define KC_VOLP KC_KB_VOLUME_UP
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		LT_L1ES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    MO(2),   MO(3),
+		KC_LCTL, MT_LCJE, KC_SPC,  MT_RAJK, KC_ROPT
+	),
+
+	[1] = LAYOUT(
+		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,
+		XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
+		_______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+		_______, _______, _______, _______, _______
+	),
+
+	[2] = LAYOUT(
+		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+		KC_CAPS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_DOWN, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_RSFT,
+		_______, _______, _______, _______, _______
+	),
+
+	[3] = LAYOUT(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+		KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  _______,
+		_______, KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLM, KC_VOLP, XXXXXXX,
+		_______, _______, _______, _______, _______
+	)
+};

keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes