Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-11-08 17:44:08 +00:00
commit 96ea277381

View file

@ -15,7 +15,7 @@
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "C3", "pin_b": "C2"} {"pin_a": "C3", "pin_b": "C2", "resolution": 2}
] ]
}, },
"processor": "atmega32a", "processor": "atmega32a",
@ -247,9 +247,7 @@
{"matrix": [0, 13], "x": 14, "y": 0}, {"matrix": [0, 13], "x": 14, "y": 0},
{"matrix": [6, 0], "x": 15.25, "y": 0}, {"matrix": [0, 14], "x": 15.5, "y": 0},
{"matrix": [0, 14], "x": 16.25, "y": 0},
{"matrix": [6, 1], "x": 17.25, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.25}, {"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25}, {"matrix": [1, 1], "x": 1, "y": 1.25},
@ -329,7 +327,9 @@
{"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5}, {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
{"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5}, {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
{"matrix": [5, 13], "x": 14.25, "y": 5.5} {"matrix": [5, 12], "x": 13.25, "y": 5.5},
{"matrix": [5, 13], "x": 14.25, "y": 5.5},
{"matrix": [5, 14], "x": 15.25, "y": 5.5}
] ]
} }
} }