From 4871f651c5328cc8c16d1ec991f3e865094b24c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:45:43 +1000 Subject: Move remaining `LAYOUT_all`s to data driven (#20463) --- keyboards/ffkeebs/puca/info.json | 173 ++++++++++++++++++++------------------- keyboards/ffkeebs/puca/puca.h | 71 ---------------- 2 files changed, 88 insertions(+), 156 deletions(-) (limited to 'keyboards/ffkeebs') diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json index cc98fed5ef..356c148d8e 100644 --- a/keyboards/ffkeebs/puca/info.json +++ b/keyboards/ffkeebs/puca/info.json @@ -29,99 +29,102 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "Rotary", "x": 0.5, "y": 0 }, - { "label": "Pg Up", "x": 2, "y": 0 }, - { "label": "Pg Dn", "x": 3, "y": 0 }, - - { "label": "Layer Toggle", "x": 0, "y": 1.25 }, - { "label": "/", "x": 1, "y": 1.25 }, - { "label": "*", "x": 2, "y": 1.25 }, - { "label": "-", "x": 3, "y": 1.25 }, - - { "label": "7", "x": 0, "y": 2.25 }, - { "label": "8", "x": 1, "y": 2.25 }, - { "label": "9", "x": 2, "y": 2.25 }, - { "label": "+", "x": 3, "y": 2.25 }, - { "label": "+", "x": 4, "y": 2.25, "h": 2 }, - - { "label": "4", "x": 0, "y": 3.25 }, - { "label": "5", "x": 1, "y": 3.25 }, - { "label": "6", "x": 2, "y": 3.25 }, - { "label": "|", "x": 3, "y": 3.25 }, - - { "label": "1", "x": 0, "y": 4.25 }, - { "label": "2", "x": 1, "y": 4.25 }, - { "label": "3", "x": 2, "y": 4.25 }, - { "label": "Enter", "x": 3, "y": 4.25 }, - { "label": "Enter", "x": 4, "y": 4.25, "h": 2 }, - - { "label": "0", "x": 0, "y": 5.25 }, - { "label": "00", "x": 1, "y": 5.25 }, - { "label": ".", "x": 2, "y": 5.25 }, - { "label": ".", "x": 3, "y": 5.25 }, - - { "label": "0", "x": 0, "y": 6.25, "w": 2 } + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + {"matrix": [4, 4], "x": 4, "y": 4.25, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25}, + + {"matrix": [5, 4], "x": 0, "y": 6.25, "w": 2} ] }, "LAYOUT_numpad": { "layout": [ - { "label": "Rotary", "x": 0.5, "y": 0 }, - { "label": "Pg Up", "x": 2, "y": 0 }, - { "label": "Pg Dn", "x": 3, "y": 0 }, - - { "label": "Layer Toggle", "x": 0, "y": 1.25 }, - { "label": "/", "x": 1, "y": 1.25 }, - { "label": "*", "x": 2, "y": 1.25 }, - { "label": "-", "x": 3, "y": 1.25 }, - - { "label": "7", "x": 0, "y": 2.25 }, - { "label": "8", "x": 1, "y": 2.25 }, - { "label": "9", "x": 2, "y": 2.25 }, - - { "label": "4", "x": 0, "y": 3.25 }, - { "label": "5", "x": 1, "y": 3.25 }, - { "label": "6", "x": 2, "y": 3.25 }, - { "label": "+", "x": 3, "y": 2.25, "h": 2 }, - - { "label": "1", "x": 0, "y": 4.25 }, - { "label": "2", "x": 1, "y": 4.25 }, - { "label": "3", "x": 2, "y": 4.25 }, - - { "label": "0", "x": 0, "y": 5.25, "w": 2 }, - { "label": ".", "x": 2, "y": 5.25 }, - { "label": "Enter", "x": 3, "y": 4.25, "h": 2 } + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 4], "x": 3, "y": 2.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + + {"matrix": [5, 4], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_ortho": { "layout": [ - { "label": "Rotary", "x": 0.5, "y": 0 }, - { "label": "Pg Up", "x": 2, "y": 0 }, - { "label": "Pg Dn", "x": 3, "y": 0 }, - - { "label": "Layer Toggle", "x": 0, "y": 1.25 }, - { "label": "/", "x": 1, "y": 1.25 }, - { "label": "*", "x": 2, "y": 1.25 }, - { "label": "-", "x": 3, "y": 1.25 }, - - { "label": "7", "x": 0, "y": 2.25 }, - { "label": "8", "x": 1, "y": 2.25 }, - { "label": "9", "x": 2, "y": 2.25 }, - { "label": "+", "x": 3, "y": 2.25 }, - - { "label": "4", "x": 0, "y": 3.25 }, - { "label": "5", "x": 1, "y": 3.25 }, - { "label": "6", "x": 2, "y": 3.25 }, - { "label": "|", "x": 3, "y": 3.25 }, - - { "label": "1", "x": 0, "y": 4.25 }, - { "label": "2", "x": 1, "y": 4.25 }, - { "label": "3", "x": 2, "y": 4.25 }, - { "label": "Enter", "x": 3, "y": 4.25 }, - - { "label": "0", "x": 0, "y": 5.25 }, - { "label": "00", "x": 1, "y": 5.25 }, - { "label": ".", "x": 2, "y": 5.25 }, - { "label": "Enter", "x": 3, "y": 5.25 } + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} ] } } diff --git a/keyboards/ffkeebs/puca/puca.h b/keyboards/ffkeebs/puca/puca.h index 5497c08057..2c09676388 100644 --- a/keyboards/ffkeebs/puca/puca.h +++ b/keyboards/ffkeebs/puca/puca.h @@ -25,74 +25,3 @@ enum keyboard_keycodes { MC_00 = QK_KB_0, }; - -#define XXX KC_NO - -/* - * ┌───┐ ┌───┬───┐ - * │00 │ │02 │03 │ - * └───┘ └───┴───┘ - * ┌───┬───┬───┬───┐ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ ┌───┐ - * │20 │21 │22 │23 │ │ │ - * ├───┼───┼───┼───┤ │24 │ 2u Plus - * │30 │31 │32 │33 │ │ │ - * ├───┼───┼───┼───┤ ├───┤ - * │40 │41 │42 │43 │ │ │ - * ├───┼───┼───┼───┤ │44 │ 2u Enter - * │50 │51 │52 │53 │ │ │ - * └───┴───┴───┴───┘ └───┘ - * ┌───────┐ - * │54 │ 2u 0 - * └───────┘ - */ - -#define LAYOUT_all( \ - K00, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, K24,\ - K30, K31, K32, K33, \ - K40, K41, K42, K43, K44,\ - K50, K51, K52, K53, \ - K54 \ -) { \ - { K00, XXX, K02, K03, XXX }, \ - { K10, K11, K12, K13, XXX }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, XXX }, \ - { K40, K41, K42, K43, K44 }, \ - { K50, K51, K52, K53, K54 }, \ -} - -#define LAYOUT_numpad( \ - K00, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K24, \ - K40, K41, K42, \ - K54, K52, K44 \ -) { \ - { K00, XXX, K02, K03, XXX }, \ - { K10, K11, K12, K13, XXX }, \ - { K20, K21, K22, XXX, K24 }, \ - { K30, K31, K32, XXX, XXX }, \ - { K40, K41, K42, XXX, K44 }, \ - { XXX, XXX, K52, XXX, K54 }, \ -} - -#define LAYOUT_ortho( \ - K00, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, XXX, K02, K03, XXX }, \ - { K10, K11, K12, K13, XXX }, \ - { K20, K21, K22, K23, XXX }, \ - { K30, K31, K32, K33, XXX }, \ - { K40, K41, K42, K43, XXX }, \ - { K50, K51, K52, K53, XXX }, \ -} -- cgit v1.2.3