From f5c8eed289624946c2d7e315d59290d9c88c2fc6 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Tue, 24 Aug 2021 10:54:17 +0200 Subject: [PATCH] [Keyboard] Fix keyprez qmk configurator (#14119) --- keyboards/keyprez/bison/info.json | 64 +++++++++--------- keyboards/keyprez/rhino/info.json | 106 ++++++++++++++++-------------- 2 files changed, 89 insertions(+), 81 deletions(-) diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json index 58de9b1ae8e2..2d1670be5e58 100644 --- a/keyboards/keyprez/bison/info.json +++ b/keyboards/keyprez/bison/info.json @@ -77,14 +77,14 @@ {"label": "Home", "x": 16, "y": 3}, {"label": "End", "x": 17, "y": 3}, - {"label": "OS", "x": 1.75, "y": 4}, - {"label": "Alt", "x": 2.75, "y": 4}, - {"label": "Lower", "x": 3.75, "y": 4}, - {"label": "BS", "x": 4.75, "y": 4, "w": 1.5}, - {"label": "", "x": 7.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 9.25, "y": 4}, - {"label": "Alt", "x": 10.25, "y": 4}, - {"label": "OS", "x": 11.25, "y": 4} + {"label": "OS", "x": 3.75, "y": 4}, + {"label": "Alt", "x": 4.75, "y": 4}, + {"label": "Lower", "x": 5.75, "y": 4}, + {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, + {"label": "", "x": 9.75, "y": 4, "w": 1.5}, + {"label": "Raise", "x": 11.25, "y": 4}, + {"label": "Alt", "x": 12.25, "y": 4}, + {"label": "OS", "x": 13.25, "y": 4} ] }, @@ -152,14 +152,14 @@ {"label": "Home", "x": 16, "y": 3}, {"label": "End", "x": 17, "y": 3}, - {"label": "OS", "x": 1.75, "y": 4}, - {"label": "Alt", "x": 2.75, "y": 4}, - {"label": "Lower", "x": 3.75, "y": 4}, - {"label": "BS", "x": 4.75, "y": 4, "w": 1.5}, - {"label": "", "x": 7.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 9.25, "y": 4}, - {"label": "Alt", "x": 10.25, "y": 4}, - {"label": "OS", "x": 11.25, "y": 4} + {"label": "OS", "x": 3.75, "y": 4}, + {"label": "Alt", "x": 4.75, "y": 4}, + {"label": "Lower", "x": 5.75, "y": 4}, + {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, + {"label": "", "x": 9.75, "y": 4, "w": 1.5}, + {"label": "Raise", "x": 11.25, "y": 4}, + {"label": "Alt", "x": 12.25, "y": 4}, + {"label": "OS", "x": 13.25, "y": 4} ] }, @@ -227,14 +227,14 @@ {"label": "/", "x": 14, "y": 3}, {"label": "Enter", "x": 15, "y": 3}, - {"label": "OS", "x": 1.75, "y": 4}, - {"label": "Alt", "x": 2.75, "y": 4}, - {"label": "Lower", "x": 3.75, "y": 4}, - {"label": "BS", "x": 4.75, "y": 4, "w": 1.5}, - {"label": "", "x": 7.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 9.25, "y": 4}, - {"label": "Alt", "x": 10.25, "y": 4}, - {"label": "FN", "x": 11.25, "y": 4} + {"label": "OS", "x": 3.75, "y": 4}, + {"label": "Alt", "x": 4.75, "y": 4}, + {"label": "Lower", "x": 5.75, "y": 4}, + {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, + {"label": "", "x": 9.75, "y": 4, "w": 1.5}, + {"label": "Raise", "x": 11.25, "y": 4}, + {"label": "Alt", "x": 12.25, "y": 4}, + {"label": "FN", "x": 13.25, "y": 4} ] }, @@ -294,14 +294,14 @@ {"label": "/", "x": 14, "y": 3}, {"label": "Enter", "x": 15, "y": 3}, - {"label": "OS", "x": 1.75, "y": 4}, - {"label": "Alt", "x": 2.75, "y": 4}, - {"label": "Lower", "x": 3.75, "y": 4}, - {"label": "BS", "x": 4.75, "y": 4, "w": 1.5}, - {"label": "", "x": 7.75, "y": 4, "w": 1.5}, - {"label": "Raise", "x": 9.25, "y": 4}, - {"label": "Alt", "x": 10.25, "y": 4}, - {"label": "FN", "x": 11.25, "y": 4} + {"label": "OS", "x": 3.75, "y": 4}, + {"label": "Alt", "x": 4.75, "y": 4}, + {"label": "Lower", "x": 5.75, "y": 4}, + {"label": "BS", "x": 6.75, "y": 4, "w": 1.5}, + {"label": "", "x": 9.75, "y": 4, "w": 1.5}, + {"label": "Raise", "x": 11.25, "y": 4}, + {"label": "Alt", "x": 12.25, "y": 4}, + {"label": "FN", "x": 13.25, "y": 4} ] } } diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json index 5bf37e06b6fc..84c720ef2df8 100644 --- a/keyboards/keyprez/rhino/info.json +++ b/keyboards/keyprez/rhino/info.json @@ -2,25 +2,12 @@ "keyboard_name": "rhino", "url": "", "maintainer": "Christian Sandven", - "width": 14, - "height": 4, + "width": 15, + "height": 5, "layouts": { "LAYOUT_ortho_2x2u": { "layout": [ - {"x": 0, "y": 0, "w": 1.5}, - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0, "w": 1.5}, {"x": 0, "y": 1, "w": 1.5}, {"x": 1.5, "y": 1}, @@ -52,6 +39,21 @@ {"x": 12.5, "y": 2}, {"x": 13.5, "y": 2, "w": 1.5}, + {"x": 0, "y": 3, "w": 1.5}, + {"x": 1.5, "y": 3}, + {"x": 2.5, "y": 3}, + {"x": 3.5, "y": 3}, + {"x": 4.5, "y": 3}, + {"x": 5.5, "y": 3}, + {"x": 6.5, "y": 3}, + {"x": 7.5, "y": 3}, + {"x": 8.5, "y": 3}, + {"x": 9.5, "y": 3}, + {"x": 10.5, "y": 3}, + {"x": 11.5, "y": 3}, + {"x": 12.5, "y": 3}, + {"x": 13.5, "y": 3, "w": 1.5}, + {"x": 1.5, "y": 4}, {"x": 2.5, "y": 4}, {"x": 3.5, "y": 4}, @@ -67,20 +69,7 @@ "LAYOUT_ergo_2x2u": { "layout": [ - {"x": 0, "y": 0, "w": 1.5}, - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0, "h": 1.5}, - {"x": 7.5, "y": 0, "h": 1.5}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0, "w": 1.5}, {"x": 0, "y": 1, "w": 1.5}, {"x": 1.5, "y": 1}, @@ -88,8 +77,8 @@ {"x": 3.5, "y": 1}, {"x": 4.5, "y": 1}, {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1.5, "h": 1.5}, - {"x": 7.5, "y": 1.5, "h": 1.5}, + {"x": 6.5, "y": 1, "h": 1.5}, + {"x": 7.5, "y": 1, "h": 1.5}, {"x": 8.5, "y": 1}, {"x": 9.5, "y": 1}, {"x": 10.5, "y": 1}, @@ -103,6 +92,8 @@ {"x": 3.5, "y": 2}, {"x": 4.5, "y": 2}, {"x": 5.5, "y": 2}, + {"x": 6.5, "y": 2.5, "h": 1.5}, + {"x": 7.5, "y": 2.5, "h": 1.5}, {"x": 8.5, "y": 2}, {"x": 9.5, "y": 2}, {"x": 10.5, "y": 2}, @@ -110,6 +101,19 @@ {"x": 12.5, "y": 2}, {"x": 13.5, "y": 2, "w": 1.5}, + {"x": 0, "y": 3, "w": 1.5}, + {"x": 1.5, "y": 3}, + {"x": 2.5, "y": 3}, + {"x": 3.5, "y": 3}, + {"x": 4.5, "y": 3}, + {"x": 5.5, "y": 3}, + {"x": 8.5, "y": 3}, + {"x": 9.5, "y": 3}, + {"x": 10.5, "y": 3}, + {"x": 11.5, "y": 3}, + {"x": 12.5, "y": 3}, + {"x": 13.5, "y": 3, "w": 1.5}, + {"x": 1.5, "y": 4}, {"x": 2.5, "y": 4}, {"x": 3.5, "y": 4}, @@ -125,20 +129,7 @@ "LAYOUT_ortho_7u": { "layout": [ - {"x": 0, "y": 0, "w": 1.5}, - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0, "h": 1.5}, - {"x": 7.5, "y": 0, "h": 1.5}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0, "w": 1.5}, {"x": 0, "y": 1, "w": 1.5}, {"x": 1.5, "y": 1}, @@ -146,14 +137,14 @@ {"x": 3.5, "y": 1}, {"x": 4.5, "y": 1}, {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1.5, "h": 1.5}, - {"x": 7.5, "y": 1.5, "h": 1.5}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, {"x": 8.5, "y": 1}, {"x": 9.5, "y": 1}, {"x": 10.5, "y": 1}, {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1, "w": 1.5}, - {"x": 14, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1, "w": 1.5}, {"x": 0, "y": 2, "w": 1.5}, {"x": 1.5, "y": 2}, @@ -161,13 +152,30 @@ {"x": 3.5, "y": 2}, {"x": 4.5, "y": 2}, {"x": 5.5, "y": 2}, + {"x": 6.5, "y": 2}, + {"x": 7.5, "y": 2}, {"x": 8.5, "y": 2}, {"x": 9.5, "y": 2}, {"x": 10.5, "y": 2}, - {"x": 11.5, "y": 2, "w": 1.5}, - {"x": 13, "y": 2}, + {"x": 11.5, "y": 2}, + {"x": 12.5, "y": 2, "w": 1.5}, {"x": 14, "y": 2}, + {"x": 0, "y": 3, "w": 1.5}, + {"x": 1.5, "y": 3}, + {"x": 2.5, "y": 3}, + {"x": 3.5, "y": 3}, + {"x": 4.5, "y": 3}, + {"x": 5.5, "y": 3}, + {"x": 6.5, "y": 3}, + {"x": 7.5, "y": 3}, + {"x": 8.5, "y": 3}, + {"x": 9.5, "y": 3}, + {"x": 10.5, "y": 3}, + {"x": 11.5, "y": 3, "w": 1.5}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + {"x": 1.5, "y": 4}, {"x": 2.5, "y": 4, "w": 1.5}, {"x": 4, "y": 4, "w": 7},