Skip to content

Commit

Permalink
Fixing krado66 and promenade after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@Feags
Feags committed Jul 8, 2023
1 parent 4a5c654 commit 1ffc9a8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 325 deletions.
319 changes: 1 addition & 318 deletions v3/kradoindustries/krado66/krado66.json
View file
Original file line number Diff line number Diff line change
@@ -1,319 +1,3 @@
<<<<<<< HEAD
{
"name": "Krado66",
"vendorId": "0x4B72",
"productId": "0x6664",
"matrix": {
"rows": 10,
"cols": 8
},
"keycodes": ["qmk_lighting"],
"menus": ["qmk_rgblight"],
"layouts": {
"labels": [
"Top Left Encoder",
"Unsplit Backspace Left",
"Split Backspace Right",
"Pipe/Bslash Swap",
"Enter Swap",
"2.75u Right Shift ",
"Right Side Encoder",
"Lower Left Encoder",
["Spacebar", "6.25u", "1.25u-2.25u-2.75u", "2.75u-1.25u-2.25u", "2.75u-Encoder-2.25u"],
["Right Modifiers", "Three 1u", "Two 1.25u", "1.25u - 1u", "Two 1u and Encoder"]
],

"keymap": [
[
{
"c": "#777777"
},
"0,0\n\n\n0,1\n\n\n\n\n\ne0",
{
"x": 0.25
},
"0,0\n\n\n0,0",
{
"c": "#aaaaaa"
},
"1,0",
{
"c": "#cccccc"
},
"0,1",
"1,1",
"0,2",
"1,2",
"0,3",
"1,3",
"0,4",
"1,4",
"0,5",
"1,5",
"0,6\n\n\n1,0",
"1,6\n\n\n1,0",
{
"c": "#aaaaaa",
"w": 2
},
"0,7\n\n\n2,0",
{
"x": 0.25,
"w": 2
},
"0,6\n\n\n1,1",
{
"c": "#cccccc"
},
"0,7\n\n\n2,1",
"1,7\n\n\n2,1"
],
[
{
"x": 1.75,
"c": "#aaaaaa",
"w": 1.5
},
"3,0",
{
"c": "#cccccc"
},
"2,1",
"3,1",
"2,2",
"3,2",
"2,3",
"3,3",
"2,4",
"3,4",
"2,5",
"3,5",
"2,6\n\n\n3,0",
"3,6\n\n\n3,0",
{
"c": "#aaaaaa",
"w": 1.5
},
"2,7\n\n\n3,0",
{
"x": 0.75,
"w": 1.5
},
"2,6\n\n\n3,1",
{
"c": "#cccccc"
},
"3,6\n\n\n3,1",
"2,7\n\n\n3,1"
],
[
{
"x": 1.5,
"c": "#aaaaaa",
"w": 1.75
},
"5,0",
{
"c": "#cccccc"
},
"4,1",
"5,1",
"4,2",
"5,2",
"4,3",
"5,3",
"4,4",
"5,4",
"4,5",
"5,5",
"4,6\n\n\n4,0",
{
"c": "#aaaaaa",
"w": 2.25
},
"5,6\n\n\n4,0",
{
"x": 1,
"w": 2.25
},
"4,6\n\n\n4,1",
{
"c": "#cccccc"
},
"5,6\n\n\n4,1"
],
[
{
"x": 1,
"c": "#aaaaaa",
"w": 2.25
},
"7,0",
{
"c": "#cccccc"
},
"6,1",
"7,1",
"6,2",
"7,2",
"6,3",
"7,3",
"6,4",
"7,4",
"6,5",
"7,5",
{
"c": "#aaaaaa",
"w": 1.75
},
"6,6\n\n\n5,0",
{
"c": "#777777"
},
"6,7\n\n\n5,0",
{
"c": "#aaaaaa"
},
"7,7\n\n\n6,0",
{
"x": 0.5,
"w": 2.75
},
"6,6\n\n\n5,1",
{
"c": "#777777"
},
"7,7\n\n\n6,1\n\n\n\n\n\ne1"
],
[
{
"x": 1,
"c": "#aaaaaa",
"w": 1.25
},
"8,0\n\n\n7,0",
{
"w": 1.25
},
"9,0",
{
"w": 1.25
},
"8,1",
{
"c": "#cccccc",
"w": 6.25
},
"8,3\n\n\n8,0",
{
"c": "#aaaaaa"
},
"8,5\n\n\n9,0",
"9,5\n\n\n9,0",
"8,6\n\n\n9,0",
{
"c": "#777777"
},
"9,6",
"8,7",
"9,7"
],
[
{
"x": 1,
"w": 1.25
},
"8,0\n\n\n7,1\n\n\n\n\n\ne2",
{
"x": 2.5,
"c": "#cccccc",
"w": 1.25
},
"9,2\n\n\n8,1",
{
"w": 2.25
},
"8,3\n\n\n8,1",
{
"w": 2.75
},
"9,4\n\n\n8,1",
{
"c": "#aaaaaa",
"w": 1.25
},
"8,5\n\n\n9,1",
{
"w": 1.25
},
"9,5\n\n\n9,1",
{
"c": "#cccccc",
"w": 0.5,
"d": true
},
"\n\n\n9,1"
],
[
{
"x": 4.75,
"w": 2.75
},
"9,2\n\n\n8,2",
{
"w": 1.25
},
"8,3\n\n\n8,2",
{
"w": 2.25
},
"9,4\n\n\n8,2",
{
"c": "#aaaaaa",
"w": 1.25
},
"8,5\n\n\n9,2",
{
"c": "#cccccc",
"w": 0.75,
"d": true
},
"\n\n\n9,2",
{
"c": "#aaaaaa"
},
"8,6\n\n\n9,2"
],
[
{
"x": 4.75,
"c": "#cccccc",
"w": 2.75
},
"9,2\n\n\n8,3",
{
"c": "#777777",
"w": 1.25
},
"8,3\n\n\n8,3\n\n\n\n\n\ne2",
{
"c": "#cccccc",
"w": 2.25
},
"9,4\n\n\n8,3",
{
"c": "#aaaaaa"
},
"8,5\n\n\n9,3",
"9,5\n\n\n9,3",
{
"c": "#777777"
},
"8,6\n\n\n9,3\n\n\n\n\n\ne1"
]
]
}
=======
{
"name": "Krado66",
"vendorId": "0x4B72",
Expand Down Expand Up @@ -631,5 +315,4 @@
]
]
}
>>>>>>> 4cc9b3ac (Changed 1.25u spacekeys to mod color)
}
}
Loading

0 comments on commit 1ffc9a8

Please sign in to comment.