Skip to content

Commit

Permalink
Merge branch 'the-via:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
KeychronMacro authored Aug 14, 2023
2 parents 60aff0d + 9ebc967 commit 1d47b52
Show file tree
Hide file tree
Showing 44 changed files with 7,532 additions and 927 deletions.
28 changes: 13 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/horrortroll/chinese_pcb/devil68_pro/devil68_pro.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Devil68 Pro",
"vendorId": "0x7516",
"productId": "0x6001",
"productId": "0x7001",
"lighting": {
"extends": "qmk_rgblight",
"underglowEffects": [
Expand Down
4 changes: 1 addition & 3 deletions src/jels/jels60/jels60_via.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"name": "Jels60",
"vendorId": "0x006A",
"productId": "0x0060",
"lighting": {
"extends": "none"
},
"lighting": "qmk_rgblight",
"matrix": {"rows": 5, "cols": 14},
"layouts": {
"labels": [
Expand Down
68 changes: 68 additions & 0 deletions src/mothwing/mothwing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"name": "MOTHWING",
"vendorId": "0x4D77",
"productId": "0x0001",
"matrix": {"rows": 8, "cols": 6},
"lighting": "none",
"layouts": {
"keymap": [
[
"0,0",
"0,1",
"0,2",
"0,3",
"0,4",
"0,5",
{"x": 1},
"4,5",
"4,4",
"4,3",
"4,2",
"4,1",
"4,0"
],
[
"1,0",
"1,1",
"1,2",
"1,3",
"1,4",
"1,5",
{"x": 1},
"5,5",
"5,4",
"5,3",
"5,2",
"5,1",
"5,0"
],
[
"2,0",
"2,1",
"2,2",
"2,3",
"2,4",
"2,5",
{"x": 1},
"6,5",
"6,4",
"6,3",
"6,2",
"6,1",
"6,0"
],
[
{"x": 2, "c": "#aaaaaa"},
"3,2",
"3,3",
"3,4",
"3,5",
{"x": 1},
"7,5",
"7,4",
"7,3",
"7,2"
]
]
}
}
118 changes: 118 additions & 0 deletions v3/1upkeyboards/1upOcarina/1upOcarina.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
"name": "1upocarina",
"vendorId": "0x6F75",
"productId": "0x5607",
"matrix": {"rows": 1, "cols": 5},
"keycodes": ["qmk_lighting"],
"menus": [
{
"label": "Lighting",
"content": [
{
"label": "Backlight",
"content": [
{
"label": "Brightness",
"type": "range",
"options": [0, 255],
"content": ["id_qmk_rgb_matrix_brightness", 3, 1]
},
{
"label": "Effect",
"type": "dropdown",
"content": ["id_qmk_rgb_matrix_effect", 3, 2],
"options": [
"All Off",
"Solid Color",
"Gradient Left/Right",
"Breathing",
"Band Sat.",
"Band Val.",
"Pinwheel Sat.",
"Pinwheel Val.",
"Spiral Sat.",
"Spiral Val.",
"Cycle All",
"Cycle Left/Right",
"Cycle Up/Down",
"Rainbow Moving Chevron",
"Cycle Out/In",
"Cycle Out/In Dual",
"Cycle Pinwheel",
"Cycle Spiral",
"Dual Beacon",
"Rainbow Beacon",
"Rainbow Pinwheels",
"Raindrops",
"Jellybean Raindrops",
"Hue Breathing",
"Hue Pendulum",
"Hue Wave",
"Heatmap",
"Solid Reactive Simple",
"Solid Reactive",
"Solid Reactive Wide",
"Solid Reactive Multiwide",
"Solid Reactive Cross",
"Solid Reactive Multicross",
"Solid Reactive Nexus",
"Solid Reactive Multinexus",
"Splash",
"Multisplash",
"Solid Splash",
"Solid Multisplash"
]
},
{
"showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 1 && {id_qmk_rgb_matrix_effect} != 2",
"label": "Effect Speed",
"type": "range",
"options": [0, 255],
"content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
},
{
"showIf": "{id_qmk_rgb_matrix_effect} == 2",
"label": "Gradient Range",
"type": "range",
"options": [0, 255],
"content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
},
{
"showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 23 && {id_qmk_rgb_matrix_effect} != 27 && {id_qmk_rgb_matrix_effect} != 28",
"label": "Color",
"type": "color",
"content": ["id_qmk_rgb_matrix_color", 3, 4]
}
]
}
]
}
],
"layouts": {
"labels": [
"Encoder"
],
"keymap": [
[
"0,0",
"0,1",
{
"x": 1.5
},
"0,3",
"0,4"
],
[
{
"y": -0.75,
"x": 2.25
},
"0,2\n\n\n0,0",
{
"x": 2.5
},
"0,2\n\n\n0,1\n\n\n\n\n\ne0"
]
]
}
}
Loading

0 comments on commit 1d47b52

Please sign in to comment.