From 61577fc643bafcfe9a8d61152dbb5b6e5fd09fbb Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 3 Jun 2024 19:07:18 -0700 Subject: [PATCH] Convert `LAYOUT_left_ball` to data-driven --- keyboards/yowkees/keyball39/info.json | 43 +++++++++++++++++++++++++ keyboards/yowkees/keyball39/keyball39.h | 16 --------- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/keyboards/yowkees/keyball39/info.json b/keyboards/yowkees/keyball39/info.json index 2fd406d1341..233f2b8ea06 100644 --- a/keyboards/yowkees/keyball39/info.json +++ b/keyboards/yowkees/keyball39/info.json @@ -55,6 +55,49 @@ {"matrix": [7, 1], "x": 12, "y": 3.25}, {"matrix": [7, 0], "x": 13, "y": 3.6} ] + }, + "LAYOUT_left_ball": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [4, 4], "x": 9, "y": 0.25}, + {"matrix": [4, 3], "x": 10, "y": 0.125}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 0.6}, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.0}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [5, 4], "x": 9, "y": 1.25}, + {"matrix": [5, 3], "x": 10, "y": 1.125}, + {"matrix": [5, 2], "x": 11, "y": 1.0}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 1.6}, + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.0}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [6, 4], "x": 9, "y": 2.25}, + {"matrix": [6, 3], "x": 10, "y": 2.125}, + {"matrix": [6, 2], "x": 11, "y": 2.0}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 2.6}, + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 4], "x": 4.25, "y": 3.61}, + {"matrix": [3, 5], "x": 5.38, "y": 3.86}, + {"matrix": [7, 5], "x": 7.62, "y": 3.86}, + {"matrix": [7, 4], "x": 8.75, "y": 3.61}, + {"matrix": [7, 3], "x": 9.85, "y": 3.5}, + {"matrix": [7, 2], "x": 11, "y": 3.0}, + {"matrix": [7, 1], "x": 12, "y": 3.25}, + {"matrix": [7, 0], "x": 13, "y": 3.6} + ] } } } diff --git a/keyboards/yowkees/keyball39/keyball39.h b/keyboards/yowkees/keyball39/keyball39.h index 1247e8ddf88..e3d15baa3cf 100644 --- a/keyboards/yowkees/keyball39/keyball39.h +++ b/keyboards/yowkees/keyball39/keyball39.h @@ -40,22 +40,6 @@ along with this program. If not, see . { R30, KC_NO, KC_NO, KC_NO, R34, R35 }, \ } -#define LAYOUT_left_ball( \ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L34, L35, R35, R34, R33, R32, R31, R30 \ - ) \ - { \ - { L00, L01, L02, L03, L04, KC_NO }, \ - { L10, L11, L12, L13, L14, KC_NO }, \ - { L20, L21, L22, L23, L24, KC_NO }, \ - { L30, KC_NO, KC_NO, KC_NO, L34, L35 }, \ - { R00, R01, R02, R03, R04, KC_NO }, \ - { R10, R11, R12, R13, R14, KC_NO }, \ - { R20, R21, R22, R23, R24, KC_NO }, \ - { R30, R31, R32, R33, R34, R35 }, \ - } #define LAYOUT_dual_ball( \ L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \