Skip to content

Commit

Permalink
Merge branch 'vial-kb:vial' into vial-wireless
Browse files Browse the repository at this point in the history
  • Loading branch information
@adophoxia
adophoxia authored Feb 20, 2024
2 parents 1780ce0 + efc1f6f commit a5cdd14
Show file tree
Hide file tree
Showing 22 changed files with 1,516 additions and 158 deletions.
207 changes: 49 additions & 158 deletions keyboards/gh60/revc/keymaps/vial/vial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
"Split Backspace",
"ISO Enter",
"Split Left Shift",
["Split Right Shift", "2.75U Right Shift", "1.75U + 1U", "1U + 1.75U"],
[
"Split Right Shift",
"2.75U Right Shift",
"1.75U + 1U",
"1U + 1.75U"
],
["Bottom Row", "6.25U", "7U", "WKL", "HHKB"]
],
"keymap": [
Expand All @@ -21,14 +26,9 @@
"author": "maxmalkav"
},
[
{
"x": 2.5,
"c": "#777777"
},
{ "x": 2.5, "c": "#777777" },
"0,0",
{
"c": "#cccccc"
},
{ "c": "#cccccc" },
"0,1",
"0,2",
"0,3",
Expand All @@ -41,30 +41,17 @@
"0,10",
"0,11",
"0,12",
{
"c": "#aaaaaa",
"w": 2
},
{ "c": "#aaaaaa", "w": 2 },
"0,13\n\n\n0,0",
{
"x": 1.25,
"c": "#cccccc"
},
"0,12\n\n\n0,1",
{
"c": "#aaaaaa"
},
{ "x": 1.25, "c": "#cccccc" },
"0,13\n\n\n0,1",
{ "c": "#aaaaaa" },
"4,9\n\n\n0,1"
],
[
{
"x": 2.5,
"w": 1.5
},
{ "x": 2.5, "w": 1.5 },
"1,0",
{
"c": "#cccccc"
},
{ "c": "#cccccc" },
"1,1",
"1,2",
"1,3",
Expand All @@ -77,10 +64,7 @@
"1,10",
"1,11",
"1,12",
{
"c": "#aaaaaa",
"w": 1.5
},
{ "c": "#aaaaaa", "w": 1.5 },
"1,13\n\n\n1,0",
{
"x": 2,
Expand All @@ -94,15 +78,9 @@
"2,13\n\n\n1,1"
],
[
{
"x": 2.5,
"c": "#aaaaaa",
"w": 1.75
},
{ "x": 2.5, "c": "#aaaaaa", "w": 1.75 },
"2,0",
{
"c": "#cccccc"
},
{ "c": "#cccccc" },
"2,1",
"2,2",
"2,3",
Expand All @@ -114,36 +92,19 @@
"2,9",
"2,10",
"2,11",
{
"c": "#777777",
"w": 2.25
},
{ "c": "#777777", "w": 2.25 },
"2,13\n\n\n1,0",
{
"x": 1,
"c": "#cccccc"
},
{ "x": 1, "c": "#cccccc" },
"2,12\n\n\n1,1"
],
[
{
"c": "#aaaaaa",
"w": 1.25
},
{ "c": "#aaaaaa", "w": 1.25 },
"3,0\n\n\n2,1",
{
"c": "#cccccc"
},
{ "c": "#cccccc" },
"3,1\n\n\n2,1",
{
"x": 0.25,
"c": "#aaaaaa",
"w": 2.25
},
{ "x": 0.25, "c": "#aaaaaa", "w": 2.25 },
"3,0\n\n\n2,0",
{
"c": "#cccccc"
},
{ "c": "#cccccc" },
"3,2",
"3,3",
"3,4",
Expand All @@ -154,138 +115,68 @@
"3,9",
"3,10",
"3,11",
{
"c": "#aaaaaa",
"w": 2.75
},
{ "c": "#aaaaaa", "w": 2.75 },
"3,13\n\n\n3,0",
{
"x": 0.5,
"w": 1.75
},
{ "x": 0.5, "w": 1.75 },
"3,12\n\n\n3,1",
"3,13\n\n\n3,1"
],
[
{
"x": 2.5,
"w": 1.25
},
{ "x": 2.5, "w": 1.25 },
"4,0\n\n\n4,0",
{
"w": 1.25
},
{ "w": 1.25 },
"4,1\n\n\n4,0",
{
"w": 1.25
},
{ "w": 1.25 },
"4,2\n\n\n4,0",
{
"c": "#cccccc",
"w": 6.25
},
{ "c": "#cccccc", "w": 6.25 },
"4,5\n\n\n4,0",
{
"c": "#aaaaaa",
"w": 1.25
},
{ "c": "#aaaaaa", "w": 1.25 },
"4,10\n\n\n4,0",
{
"w": 1.25
},
{ "w": 1.25 },
"4,11\n\n\n4,0",
{
"w": 1.25
},
{ "w": 1.25 },
"4,12\n\n\n4,0",
{
"w": 1.25
},
{ "w": 1.25 },
"4,13\n\n\n4,0",
{
"x": 0.5,
"c": "#cccccc"
},
{ "x": 0.5, "c": "#cccccc" },
"3,12\n\n\n3,2",
{
"c": "#aaaaaa",
"w": 1.75
},
{ "c": "#aaaaaa", "w": 1.75 },
"3,13\n\n\n3,2"
],
[
{
"y": 0.25,
"x": 2.5,
"w": 1.5
},
{ "y": 0.25, "x": 2.5, "w": 1.5 },
"4,0\n\n\n4,1",
"4,1\n\n\n4,1",
{
"w": 1.5
},
{ "w": 1.5 },
"4,2\n\n\n4,1",
{
"c": "#cccccc",
"w": 7
},
{ "c": "#cccccc", "w": 7 },
"4,5\n\n\n4,1",
{
"c": "#aaaaaa",
"w": 1.5
},
{ "c": "#aaaaaa", "w": 1.5 },
"4,11\n\n\n4,1",
"4,12\n\n\n4,1",
{
"w": 1.5
},
{ "w": 1.5 },
"4,13\n\n\n4,1"
],
[
{
"x": 2.5,
"w": 1.5
},
{ "x": 2.5, "w": 1.5 },
"4,0\n\n\n4,2",
{
"x": 1,
"w": 1.5
},
{ "x": 1, "w": 1.5 },
"4,2\n\n\n4,2",
{
"c": "#cccccc",
"w": 7
},
{ "c": "#cccccc", "w": 7 },
"4,5\n\n\n4,2",
{
"c": "#aaaaaa",
"w": 1.5
},
{ "c": "#aaaaaa", "w": 1.5 },
"4,11\n\n\n4,2",
{
"x": 1,
"w": 1.5
},
{ "x": 1, "w": 1.5 },
"4,13\n\n\n4,2"
],
[
{
"x": 4
},
{ "x": 4 },
"4,1\n\n\n4,3",
{
"w": 1.5
},
{ "w": 1.5 },
"4,2\n\n\n4,3",
{
"c": "#cccccc",
"w": 6.25
},
{ "c": "#cccccc", "w": 6.25 },
"4,5\n\n\n4,3",
{
"c": "#aaaaaa",
"w": 1.5
},
{ "c": "#aaaaaa", "w": 1.5 },
"4,10\n\n\n4,3",
"4,11\n\n\n4,3"
]
Expand Down
68 changes: 68 additions & 0 deletions keyboards/jlw/bruce_the_keyboard/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"keyboard_name": "Bruce the Keyboard",
"manufacturer": "whydobearsexplod",
"url": "https://github.com/josh-l-wang/bruce-the-keyboard",
"maintainer": "jlw",
"usb": {
"vid": "0x1209",
"pid": "0xA459",
"device_version": "0.0.1"
},
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["B1", "B0", "A7", "A4", "A3", "B7", "B6", "B5", "B4", "B3"],
"rows": ["B11", "B9", "A5", "A6"]
},
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "h":1.75},
{"matrix": [0, 1], "x": 1, "y": 0, "h":1.5},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0, "h":1.25},
{"matrix": [0, 4], "x": 4, "y": 0, "h":1.25},
{"matrix": [0, 5], "x": 5, "y": 0, "h":1.25},
{"matrix": [0, 6], "x": 6, "y": 0, "h":1.25},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0, "h":1.5},
{"matrix": [0, 9], "x": 9, "y": 0, "h":1.75},

{"matrix": [1, 0], "x": 0, "y": 1.75},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1.25},
{"matrix": [1, 4], "x": 4, "y": 1.25},
{"matrix": [1, 5], "x": 5, "y": 1.25},
{"matrix": [1, 6], "x": 6, "y": 1.25},
{"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1.5},
{"matrix": [1, 9], "x": 9, "y": 1.75},

{"matrix": [2, 0], "x": 0, "y": 2.75, "h":1.5},
{"matrix": [2, 1], "x": 1, "y": 2.5, "h":1.75},
{"matrix": [2, 2], "x": 2, "y": 2, "h":1.25},
{"matrix": [2, 3], "x": 3, "y": 2.25},
{"matrix": [2, 4], "x": 4, "y": 2.25},
{"matrix": [2, 5], "x": 5, "y": 2.25},
{"matrix": [2, 6], "x": 6, "y": 2.25},
{"matrix": [2, 7], "x": 7, "y": 2, "h":1.25},
{"matrix": [2, 8], "x": 8, "y": 2.5, "h":1.75},
{"matrix": [2, 9], "x": 9, "y": 2.75, "h":1.5},

{"matrix": [3, 2], "x": 2, "y": 3.25},
{"matrix": [3, 3], "x": 3, "y": 3.25, "w": 2},
{"matrix": [3, 5], "x": 5, "y": 3.25, "w": 2},
{"matrix": [3, 7], "x": 7, "y": 3.25},
]
}

}
}
Loading

0 comments on commit a5cdd14

Please sign in to comment.