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/handwired/space_oddity/info.json | 135 ++++++++++++------------ keyboards/handwired/space_oddity/space_oddity.h | 19 ---- 2 files changed, 70 insertions(+), 84 deletions(-) delete mode 100644 keyboards/handwired/space_oddity/space_oddity.h (limited to 'keyboards/handwired/space_oddity') diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json index 48fe44be74..b0e72ccabd 100644 --- a/keyboards/handwired/space_oddity/info.json +++ b/keyboards/handwired/space_oddity/info.json @@ -18,71 +18,76 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Macro 0", "x":0, "y":0, "w":2}, - {"label":"Macro 1", "x":2, "y":0, "w":2}, - {"label":"Macro 2", "x":4, "y":0, "w":2}, - {"label":"Macro 3", "x":6, "y":0, "w":2}, - {"label":"Macro 4", "x":8, "y":0, "w":2}, - {"label":"Dynamic Macro 1", "x":10, "y":0, "w":2}, - {"label":"Dynamic Macro 2", "x":12, "y":0, "w":2}, - {"label":"~", "x":0, "y":1, "w":2}, - {"label":"!", "x":2, "y":1}, - {"label":"@", "x":3, "y":1}, - {"label":"#", "x":4, "y":1}, - {"label":"$", "x":5, "y":1}, - {"label":"%", "x":6, "y":1}, - {"label":"^", "x":7, "y":1}, - {"label":"&", "x":8, "y":1}, - {"label":"*", "x":9, "y":1}, - {"label":"(", "x":10, "y":1}, - {"label":")", "x":11, "y":1}, - {"label":"Backspace", "x":12, "y":1, "w":2}, - {"label":"Tab", "x":0, "y":2, "w":2}, - {"label":"Q", "x":2, "y":2}, - {"label":"W", "x":3, "y":2}, - {"label":"E", "x":4, "y":2}, - {"label":"R", "x":5, "y":2}, - {"label":"T", "x":6, "y":2}, - {"label":"Y", "x":7, "y":2}, - {"label":"U", "x":8, "y":2}, - {"label":"I", "x":9, "y":2}, - {"label":"O", "x":10, "y":2}, - {"label":"P", "x":11, "y":2}, - {"label":"_", "x":12, "y":2, "w":2}, - {"label":"Esc (Ctrl)", "x":0, "y":3, "w":2}, - {"label":"A", "x":2, "y":3}, - {"label":"S", "x":3, "y":3}, - {"label":"D", "x":4, "y":3}, - {"label":"F", "x":5, "y":3}, - {"label":"G", "x":6, "y":3}, - {"label":"H", "x":7, "y":3}, - {"label":"J", "x":8, "y":3}, - {"label":"K", "x":9, "y":3}, - {"label":"L", "x":10, "y":3}, - {"label":":", "x":11, "y":3}, - {"label":"\"", "x":12, "y":3, "w":2}, - {"label":"Caps Lock (Shift)", "x":0.25, "y":4, "w":1.75}, - {"label":"Z", "x":2, "y":4}, - {"label":"X", "x":3, "y":4}, - {"label":"C", "x":4, "y":4}, - {"label":"V", "x":5, "y":4}, - {"label":"B", "x":6, "y":4}, - {"label":"N", "x":7, "y":4}, - {"label":"M", "x":8, "y":4}, - {"label":"<", "x":9, "y":4}, - {"label":">", "x":10, "y":4}, - {"label":"?", "x":11, "y":4}, - {"label":"Enter (Shift)", "x":12, "y":4, "w":1.75}, - {"label":"MO(2)", "x":1, "y":5}, - {"label":"MO(1)", "x":2, "y":5}, - {"label":"GUI", "x":3, "y":5}, - {"label":"Alt", "x":4, "y":5}, - {"label":"Ctrl", "x":5, "y":5, "w":2}, - {"label":"Space", "x":7, "y":5, "w":2}, - {"label":"Left (Alt)", "x":9, "y":5}, - {"label":"Right (Hyper)", "x":10, "y":5}, - {"label":"Up (MO(1))", "x":11, "y":5}, - {"label":"Down (MO(2))", "x":12, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 0, "w": 2}, + {"matrix": [0, 4], "x": 4, "y": 0, "w": 2}, + {"matrix": [0, 6], "x": 6, "y": 0, "w": 2}, + {"matrix": [0, 8], "x": 8, "y": 0, "w": 2}, + {"matrix": [0, 10], "x": 10, "y": 0, "w": 2}, + {"matrix": [0, 11], "x": 12, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 2}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3, "w": 2}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4}, + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 7], "x": 8, "y": 4}, + {"matrix": [4, 8], "x": 9, "y": 4}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4, "w": 1.75}, + + {"matrix": [5, 0], "x": 1, "y": 5}, + {"matrix": [5, 1], "x": 2, "y": 5}, + {"matrix": [5, 2], "x": 3, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5, "w": 2}, + {"matrix": [5, 7], "x": 7, "y": 5, "w": 2}, + {"matrix": [5, 8], "x": 9, "y": 5}, + {"matrix": [5, 9], "x": 10, "y": 5}, + {"matrix": [5, 10], "x": 11, "y": 5}, + {"matrix": [5, 11], "x": 12, "y": 5} ] } } diff --git a/keyboards/handwired/space_oddity/space_oddity.h b/keyboards/handwired/space_oddity/space_oddity.h deleted file mode 100644 index d35bfea587..0000000000 --- a/keyboards/handwired/space_oddity/space_oddity.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K002, K004, K006, K008, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, \ - K500, K501, K502, K503, K505, K507, K508, K509, K510, K511 \ -) { \ - { K000, KC_NO, K002, KC_NO, K004, KC_NO, K006, KC_NO, K008, KC_NO, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 }, \ - { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, K508, K509, K510, K511 } \ -} -- cgit v1.2.3