From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/mitosis/info.json | 58 ++++++++++++++++++++++++++++++++++++++++++++- keyboards/mitosis/mitosis.h | 19 --------------- 2 files changed, 57 insertions(+), 20 deletions(-) (limited to 'keyboards/mitosis') diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/info.json index a6d48c4e4e..feab60b7fb 100644 --- a/keyboards/mitosis/info.json +++ b/keyboards/mitosis/info.json @@ -12,7 +12,63 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.75}, {"x":1, "y":0.25}, {"x":2, "y":0}, {"x":3, "y":0.25}, {"x":4, "y":0.125}, {"x":7, "y":0.125}, {"x":8, "y":0.25}, {"x":9, "y":0}, {"x":10, "y":0.25}, {"x":11, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.25}, {"x":2, "y":1}, {"x":3, "y":1.25}, {"x":4, "y":1.125}, {"x":7, "y":1.125}, {"x":8, "y":1.25}, {"x":9, "y":1}, {"x":10, "y":1.25}, {"x":11, "y":1.75}, {"x":0, "y":2.75}, {"x":1, "y":2.25}, {"x":2, "y":2}, {"x":3, "y":2.25}, {"x":4, "y":2.125}, {"x":7, "y":2.125}, {"x":8, "y":2.25}, {"x":9, "y":2}, {"x":10, "y":2.25}, {"x":11, "y":2.75}, {"x":1.5, "y":3.75}, {"x":2.5, "y":3.75}, {"x":3.5, "y":3.75}, {"x":4.5, "y":3.75}, {"x":6.5, "y":3.75}, {"x":7.5, "y":3.75}, {"x":8.5, "y":3.75}, {"x":9.5, "y":3.75}, {"x":1.5, "y":4.75}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":4.75}, {"x":6.5, "y":4.75}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}, {"x":9.5, "y":4.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + + {"matrix": [0, 5], "x": 7, "y": 0.125}, + {"matrix": [0, 6], "x": 8, "y": 0.25}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0.25}, + {"matrix": [0, 9], "x": 11, "y": 0.75}, + + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + + {"matrix": [1, 5], "x": 7, "y": 1.125}, + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + + {"matrix": [2, 5], "x": 7, "y": 2.125}, + {"matrix": [2, 6], "x": 8, "y": 2.25}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2.25}, + {"matrix": [2, 9], "x": 11, "y": 2.75}, + + {"matrix": [3, 1], "x": 1.5, "y": 3.75}, + {"matrix": [3, 2], "x": 2.5, "y": 3.75}, + {"matrix": [3, 3], "x": 3.5, "y": 3.75}, + {"matrix": [3, 4], "x": 4.5, "y": 3.75}, + + {"matrix": [3, 5], "x": 6.5, "y": 3.75}, + {"matrix": [3, 6], "x": 7.5, "y": 3.75}, + {"matrix": [3, 7], "x": 8.5, "y": 3.75}, + {"matrix": [3, 8], "x": 9.5, "y": 3.75}, + + {"matrix": [4, 1], "x": 1.5, "y": 4.75}, + {"matrix": [4, 2], "x": 2.5, "y": 4.75}, + {"matrix": [4, 3], "x": 3.5, "y": 4.75}, + {"matrix": [4, 4], "x": 4.5, "y": 4.75}, + + {"matrix": [4, 5], "x": 6.5, "y": 4.75}, + {"matrix": [4, 6], "x": 7.5, "y": 4.75}, + {"matrix": [4, 7], "x": 8.5, "y": 4.75}, + {"matrix": [4, 8], "x": 9.5, "y": 4.75} + ] } } } diff --git a/keyboards/mitosis/mitosis.h b/keyboards/mitosis/mitosis.h index 4b7d3a60c4..04ef56503f 100644 --- a/keyboards/mitosis/mitosis.h +++ b/keyboards/mitosis/mitosis.h @@ -41,22 +41,3 @@ #define set_led_cyan PORTF = PORTF & ~(1<