qmk_firmware

QMK firmware for my keyboards (Corne, Sweep Ferris) and trackball (Ploopy Adept)
Log | Files | Refs | Submodules | LICENSE

commit 5ce882d84e6e9fd6b138ef6701762ccd9c67e297
parent 647c2835e65995339fb9380830c53725a62f6299
Author: QMK Bot <hello@qmk.fm>
Date:   Thu, 30 Mar 2023 17:26:20 +0000

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

Diffstat:
Mkeyboards/alhenkb/macropad5x4/info.json | 10+++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json @@ -33,19 +33,19 @@ {"label": "K10 (F7,F4)", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "K11 (F7,F6)", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "K12 (F7,B1)", "matrix": [1, 2], "x": 2, "y": 1}, - {"label": "K12 (F7,B2)", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "K13 (F7,B2)", "matrix": [1, 3], "x": 3, "y": 1}, {"label": "K20 (B3,F4)", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K21 (B3,F6)", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "K22 (B3,B1)", "matrix": [2, 2], "x": 2, "y": 2}, - {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1}, + {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 2}, {"label": "K30 (B6,F4)", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K32 (B6,B2)", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "K33 (B6,B2)", "matrix": [3, 3], "x": 3, "y": 3}, {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4}, - {"label": "K42 (B5,F6)", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "K41 (B5,F6)", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4}, - {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3} + {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 4} ] }, "LAYOUT_numpad_5x4": {