Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/the-via/keyboards
Browse files Browse the repository at this point in the history
  • Loading branch information
wilba committed Jul 14, 2020
2 parents f1919d5 + 52b03ce commit 35d31dd
Show file tree
Hide file tree
Showing 5 changed files with 653 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/foxlab/key65_universal/key65_universal.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"c": "#aaaaaa",
"w": 2
},
"0,14\n\n\n0,0",
"0,13\n\n\n0,0",
"0,15\n\n\n1,0",
{
"x": 0.25,
Expand Down
4 changes: 2 additions & 2 deletions src/keebio/quefrency/quefrency-rev1.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,14 @@
"9,4\n\n\n1,1"
],
[
"4,3\n\n\n2,1",
"4,5\n\n\n2,1",
"4,7\n\n\n2,1",
{
"x": 0.25,
"c": "#cccccc",
"d": true
},
"4,3\n\n\n2,0",
"4,5\n\n\n2,0",
{
"d": true
},
Expand Down
328 changes: 328 additions & 0 deletions src/other/s7_elephant/s7_elephant_rev2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,328 @@
{
"name": "S7 Elephant Rev2",
"vendorId": "0xA13B",
"productId": "0x0008",
"lighting": "qmk_backlight_rgblight",
"matrix": {
"rows": 5,
"cols": 16
},
"layouts": {
"labels": [
"Split Backspace",
"Enter Key",
"Split Left Shift",
["Bottom Row", "3x1u", "2x1.25u", "2x1.5u", "2x1.5u by 2x1.5u", "1u 1.5u"]
],

"keymap": [
[
{
"x": 17.25
},
"0,13\n\n\n0,1",
"0,14\n\n\n0,1"
],
[
{
"y": 0.5,
"x": 2.75,
"c": "#aaaaaa"
},
"0,15",
{
"x": 0.5,
"c": "#777777"
},
"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": 2
},
"0,14\n\n\n0,0",
"4,14"
],
[
{
"x": 2.75
},
"1,15",
{
"x": 0.5,
"w": 1.5
},
"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",
"1,12",
{
"w": 1.5
},
"2,12\n\n\n1,0",
{
"c": "#aaaaaa"
},
"1,14",
{
"x": 1.5,
"c": "#777777",
"w": 1.25,
"h": 2,
"w2": 1.5,
"h2": 1,
"x2": -0.25
},
"1,13\n\n\n1,1"
],
[
{
"x": 2.75,
"c": "#aaaaaa"
},
"2,15",
{
"x": 0.5,
"w": 1.75
},
"2,0",
{
"c": "#cccccc"
},
"2,1",
"2,2",
"2,3",
"2,4",
"2,5",
"2,6",
"2,7",
"2,8",
"2,9",
"2,10",
"2,11",
{
"c": "#777777",
"w": 2.25
},
"1,13\n\n\n1,0",
{
"c": "#aaaaaa"
},
"2,14",
{
"x": 0.5,
"c": "#cccccc"
},
"2,12\n\n\n1,1"
],
[
{
"c": "#aaaaaa",
"w": 1.25
},
"3,0\n\n\n2,1",
{
"c": "#cccccc"
},
"3,1\n\n\n2,1",
{
"x": 0.5,
"c": "#aaaaaa"
},
"3,15",
{
"x": 0.5,
"w": 2.25
},
"3,0\n\n\n2,0",
{
"c": "#cccccc"
},
"3,2",
"3,3",
"3,4",
"3,5",
"3,6",
"3,7",
"3,8",
"3,9",
"3,10",
"3,11",
{
"c": "#aaaaaa",
"w": 1.75
},
"3,12",
"3,13",
"3,14"
],
[
{
"x": 2.75
},
"4,15",
{
"x": 0.5,
"w": 1.25
},
"4,0\n\n\n3,0",
{
"w": 1.25
},
"4,1\n\n\n3,0",
{
"w": 1.25
},
"4,2\n\n\n3,0",
{
"c": "#cccccc",
"w": 6.25
},
"4,6\n\n\n3,0",
{
"c": "#aaaaaa"
},
"4,8\n\n\n3,0",
"4,9\n\n\n3,0",
"4,10\n\n\n3,0",
"4,11",
"4,12",
"4,13"
],
[
{
"y": 0.75,
"x": 4.25,
"w": 1.25
},
"4,0\n\n\n3,1",
{
"w": 1.25
},
"4,1\n\n\n3,1",
{
"w": 1.25
},
"4,2\n\n\n3,1",
{
"c": "#cccccc",
"w": 6.25
},
"4,6\n\n\n3,1",
{
"c": "#aaaaaa",
"w": 1.25
},
"4,8\n\n\n3,1",
{
"w": 1.25
},
"4,9\n\n\n3,1"
],
[
{
"x": 4.25,
"w": 1.25
},
"4,0\n\n\n3,2",
{
"w": 1.25
},
"4,1\n\n\n3,2",
{
"w": 1.25
},
"4,2\n\n\n3,2",
{
"c": "#cccccc",
"w": 6.25
},
"4,6\n\n\n3,2",
{
"c": "#aaaaaa",
"w": 1.5
},
"4,8\n\n\n3,2",
{
"w": 1.5
},
"4,9\n\n\n3,2"
],
[
{
"x": 4.25,
"w": 1.5
},
"4,0\n\n\n3,3",
{
"w": 1.5
},
"4,1\n\n\n3,3",
{
"c": "#cccccc",
"w": 7
},
"4,6\n\n\n3,3",
{
"c": "#aaaaaa",
"w": 1.5
},
"4,8\n\n\n3,3",
{
"w": 1.5
},
"4,9\n\n\n3,3"
],
[
{
"x": 4.25,
"w": 1.5
},
"4,0\n\n\n3,4",
{
"w": 1.5
},
"4,1\n\n\n3,4",
{
"c": "#cccccc",
"w": 7
},
"4,6\n\n\n3,4",
{
"c": "#aaaaaa"
},
"4,8\n\n\n3,4",
{
"w": 1.5
},
"4,9\n\n\n3,4"
]
]
}
}
Loading

0 comments on commit 35d31dd

Please sign in to comment.