From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/ft/mars80/config.h | 6 ------ keyboards/ft/mars80/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/ft/mars80') diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h index 727718e396..116c09d6ac 100644 --- a/keyboards/ft/mars80/config.h +++ b/keyboards/ft/mars80/config.h @@ -20,12 +20,6 @@ along with this program. If not, see . #define RGBLED_NUM 20 -// 0 1 2 3 4 5 6 7 8 9 A B C D -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index ff451d8bcf..e5fb19a64d 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], + "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/ft/mars80/mars80.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/ft/mars80/mars80.c (limited to 'keyboards/ft/mars80') diff --git a/keyboards/ft/mars80/mars80.c b/keyboards/ft/mars80/mars80.c deleted file mode 100644 index 5c95d04e35..0000000000 --- a/keyboards/ft/mars80/mars80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "mars80.h" -- cgit v1.2.3 From 36ce81df592ca8e9f9fed498e513437aa1cae54f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Mar 2023 18:22:12 +1100 Subject: Move `WS2812_DRIVER` to data driven (#20248) --- keyboards/ft/mars80/info.json | 3 +++ keyboards/ft/mars80/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/ft/mars80') diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index e5fb19a64d..92429d826e 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "D4" }, + "ws2812": { + "driver": "i2c" + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk index 9a00928ea8..51df0b642e 100644 --- a/keyboards/ft/mars80/rules.mk +++ b/keyboards/ft/mars80/rules.mk @@ -8,4 +8,3 @@ CONSOLE_ENABLE = no COMMAND_ENABLE = yes BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes -WS2812_DRIVER = i2c -- cgit v1.2.3 From 8bb4cba7b04571d75674f8f3f19462adef015060 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:53:45 +1000 Subject: Move TKL layouts to data driven (#20337) --- keyboards/ft/mars80/info.json | 208 +++++++++++++++++++++++++++++++++++++++++- keyboards/ft/mars80/mars80.h | 63 ------------- 2 files changed, 205 insertions(+), 66 deletions(-) delete mode 100644 keyboards/ft/mars80/mars80.h (limited to 'keyboards/ft/mars80') diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index 92429d826e..c2d0f0a5a6 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -28,11 +28,213 @@ "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { - "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] - }, + "layout": [ + {"matrix": [1, 1], "x": 0, "y": 0}, + + {"matrix": [1, 3], "x": 2, "y": 0}, + {"matrix": [1, 4], "x": 3, "y": 0}, + {"matrix": [1, 5], "x": 4, "y": 0}, + {"matrix": [1, 6], "x": 5, "y": 0}, + + {"matrix": [1, 8], "x": 6.5, "y": 0}, + {"matrix": [1, 9], "x": 7.5, "y": 0}, + {"matrix": [1, 10], "x": 8.5, "y": 0}, + {"matrix": [1, 11], "x": 9.5, "y": 0}, + + {"matrix": [1, 12], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [1, 2], "x": 14, "y": 0}, + + {"matrix": [0, 2], "x": 15.25, "y": 0}, + {"matrix": [0, 3], "x": 16.25, "y": 0}, + {"matrix": [0, 0], "x": 17.25, "y": 0}, + + {"matrix": [2, 1], "x": 0, "y": 1.5}, + {"matrix": [2, 2], "x": 1, "y": 1.5}, + {"matrix": [2, 3], "x": 2, "y": 1.5}, + {"matrix": [2, 4], "x": 3, "y": 1.5}, + {"matrix": [2, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 6], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [2, 8], "x": 7, "y": 1.5}, + {"matrix": [2, 9], "x": 8, "y": 1.5}, + {"matrix": [2, 10], "x": 9, "y": 1.5}, + {"matrix": [2, 11], "x": 10, "y": 1.5}, + {"matrix": [2, 12], "x": 11, "y": 1.5}, + {"matrix": [2, 0], "x": 12, "y": 1.5}, + {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [0, 7], "x": 15.25, "y": 1.5}, + {"matrix": [0, 6], "x": 16.25, "y": 1.5}, + {"matrix": [0, 5], "x": 17.25, "y": 1.5}, + {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.5}, + {"matrix": [3, 3], "x": 2.5, "y": 2.5}, + {"matrix": [3, 4], "x": 3.5, "y": 2.5}, + {"matrix": [3, 5], "x": 4.5, "y": 2.5}, + {"matrix": [3, 6], "x": 5.5, "y": 2.5}, + {"matrix": [3, 7], "x": 6.5, "y": 2.5}, + {"matrix": [3, 8], "x": 7.5, "y": 2.5}, + {"matrix": [3, 9], "x": 8.5, "y": 2.5}, + {"matrix": [3, 10], "x": 9.5, "y": 2.5}, + {"matrix": [3, 11], "x": 10.5, "y": 2.5}, + {"matrix": [3, 12], "x": 11.5, "y": 2.5}, + {"matrix": [3, 0], "x": 12.5, "y": 2.5}, + {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [0, 13], "x": 15.25, "y": 2.5}, + {"matrix": [0, 9], "x": 16.25, "y": 2.5}, + {"matrix": [0, 8], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 3.5}, + {"matrix": [4, 3], "x": 2.75, "y": 3.5}, + {"matrix": [4, 4], "x": 3.75, "y": 3.5}, + {"matrix": [4, 5], "x": 4.75, "y": 3.5}, + {"matrix": [4, 6], "x": 5.75, "y": 3.5}, + {"matrix": [4, 7], "x": 6.75, "y": 3.5}, + {"matrix": [4, 8], "x": 7.75, "y": 3.5}, + {"matrix": [4, 9], "x": 8.75, "y": 3.5}, + {"matrix": [4, 10], "x": 9.75, "y": 3.5}, + {"matrix": [4, 11], "x": 10.75, "y": 3.5}, + {"matrix": [4, 12], "x": 11.75, "y": 3.5}, + {"matrix": [4, 0], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [5, 2], "x": 2.25, "y": 4.5}, + {"matrix": [5, 3], "x": 3.25, "y": 4.5}, + {"matrix": [5, 4], "x": 4.25, "y": 4.5}, + {"matrix": [5, 5], "x": 5.25, "y": 4.5}, + {"matrix": [5, 6], "x": 6.25, "y": 4.5}, + {"matrix": [5, 7], "x": 7.25, "y": 4.5}, + {"matrix": [5, 8], "x": 8.25, "y": 4.5}, + {"matrix": [5, 9], "x": 9.25, "y": 4.5}, + {"matrix": [5, 10], "x": 10.25, "y": 4.5}, + {"matrix": [5, 11], "x": 11.25, "y": 4.5}, + {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 13], "x": 16.25, "y": 4.5}, + + {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [6, 0], "x": 15.25, "y": 5.5}, + {"matrix": [6, 13], "x": 16.25, "y": 5.5}, + {"matrix": [6, 8], "x": 17.25, "y": 5.5} + ] + }, "LAYOUT_tkl_iso": { - "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] + "layout": [ + {"matrix": [1, 1], "x": 0, "y": 0}, + + {"matrix": [1, 3], "x": 2, "y": 0}, + {"matrix": [1, 4], "x": 3, "y": 0}, + {"matrix": [1, 5], "x": 4, "y": 0}, + {"matrix": [1, 6], "x": 5, "y": 0}, + + {"matrix": [1, 8], "x": 6.5, "y": 0}, + {"matrix": [1, 9], "x": 7.5, "y": 0}, + {"matrix": [1, 10], "x": 8.5, "y": 0}, + {"matrix": [1, 11], "x": 9.5, "y": 0}, + + {"matrix": [1, 12], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [1, 2], "x": 14, "y": 0}, + + {"matrix": [0, 2], "x": 15.25, "y": 0}, + {"matrix": [0, 3], "x": 16.25, "y": 0}, + {"matrix": [0, 0], "x": 17.25, "y": 0}, + + {"matrix": [2, 1], "x": 0, "y": 1.5}, + {"matrix": [2, 2], "x": 1, "y": 1.5}, + {"matrix": [2, 3], "x": 2, "y": 1.5}, + {"matrix": [2, 4], "x": 3, "y": 1.5}, + {"matrix": [2, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 6], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [2, 8], "x": 7, "y": 1.5}, + {"matrix": [2, 9], "x": 8, "y": 1.5}, + {"matrix": [2, 10], "x": 9, "y": 1.5}, + {"matrix": [2, 11], "x": 10, "y": 1.5}, + {"matrix": [2, 12], "x": 11, "y": 1.5}, + {"matrix": [2, 0], "x": 12, "y": 1.5}, + {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [0, 7], "x": 15.25, "y": 1.5}, + {"matrix": [0, 6], "x": 16.25, "y": 1.5}, + {"matrix": [0, 5], "x": 17.25, "y": 1.5}, + + {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.5}, + {"matrix": [3, 3], "x": 2.5, "y": 2.5}, + {"matrix": [3, 4], "x": 3.5, "y": 2.5}, + {"matrix": [3, 5], "x": 4.5, "y": 2.5}, + {"matrix": [3, 6], "x": 5.5, "y": 2.5}, + {"matrix": [3, 7], "x": 6.5, "y": 2.5}, + {"matrix": [3, 8], "x": 7.5, "y": 2.5}, + {"matrix": [3, 9], "x": 8.5, "y": 2.5}, + {"matrix": [3, 10], "x": 9.5, "y": 2.5}, + {"matrix": [3, 11], "x": 10.5, "y": 2.5}, + {"matrix": [3, 12], "x": 11.5, "y": 2.5}, + {"matrix": [3, 0], "x": 12.5, "y": 2.5}, + {"matrix": [0, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [0, 9], "x": 15.25, "y": 2.5}, + {"matrix": [0, 8], "x": 16.25, "y": 2.5}, + {"matrix": [4, 1], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 2], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 3], "x": 1.75, "y": 3.5}, + {"matrix": [4, 4], "x": 2.75, "y": 3.5}, + {"matrix": [4, 5], "x": 3.75, "y": 3.5}, + {"matrix": [4, 6], "x": 4.75, "y": 3.5}, + {"matrix": [4, 7], "x": 5.75, "y": 3.5}, + {"matrix": [4, 8], "x": 6.75, "y": 3.5}, + {"matrix": [4, 9], "x": 7.75, "y": 3.5}, + {"matrix": [4, 10], "x": 8.75, "y": 3.5}, + {"matrix": [4, 11], "x": 9.75, "y": 3.5}, + {"matrix": [4, 12], "x": 10.75, "y": 3.5}, + {"matrix": [3, 13], "x": 11.75, "y": 3.5}, + {"matrix": [4, 0], "x": 12.75, "y": 3.5}, + + {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 13], "x": 1.25, "y": 4.5}, + {"matrix": [5, 2], "x": 2.25, "y": 4.5}, + {"matrix": [5, 3], "x": 3.25, "y": 4.5}, + {"matrix": [5, 4], "x": 4.25, "y": 4.5}, + {"matrix": [5, 5], "x": 5.25, "y": 4.5}, + {"matrix": [5, 6], "x": 6.25, "y": 4.5}, + {"matrix": [5, 7], "x": 7.25, "y": 4.5}, + {"matrix": [5, 8], "x": 8.25, "y": 4.5}, + {"matrix": [5, 9], "x": 9.25, "y": 4.5}, + {"matrix": [5, 10], "x": 10.25, "y": 4.5}, + {"matrix": [5, 11], "x": 11.25, "y": 4.5}, + {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 13], "x": 16.25, "y": 4.5}, + + {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [6, 0], "x": 15.25, "y": 5.5}, + {"matrix": [6, 13], "x": 16.25, "y": 5.5}, + {"matrix": [6, 8], "x": 17.25, "y": 5.5} + ] } } } diff --git a/keyboards/ft/mars80/mars80.h b/keyboards/ft/mars80/mars80.h deleted file mode 100644 index fdeb4f9857..0000000000 --- a/keyboards/ft/mars80/mars80.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2019 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT_tkl_iso( \ - k11, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k10, k1D, k12, k02, k03, k00, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k20, k2D, k07, k06, k05, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k30, k0D, k09, k08, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k3D, k40, \ - k51, k4D, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, \ - k61, k62, k63, k65, k69, k6A, k6B, k6C, k60, k6D, k68 \ -) \ -{ \ - { k00, KC_NO, k02, k03, KC_NO, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, KC_NO, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \ - { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D }, \ - { k60, k61, k62, k63, KC_NO, k65, KC_NO, KC_NO, k68, k69, k6A, k6B, k6C, k6D }, \ -} - -#define LAYOUT_tkl_ansi( \ - k11, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k10, k1D, k12, k02, k03, k00, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k20, k2D, k07, k06, k05, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k30, k3D, k0D, k09, k08, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k40, \ - k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, \ - k61, k62, k63, k65, k69, k6A, k6B, k6C, k60, k6D, k68 \ -) \ -{ \ - { k00, KC_NO, k02, k03, KC_NO, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, KC_NO, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO }, \ - { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D }, \ - { k60, k61, k62, k63, KC_NO, k65, KC_NO, KC_NO, k68, k69, k6A, k6B, k6C, k6D }, \ -} -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/ft/mars80/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/ft/mars80') diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index c2d0f0a5a6..5801c63a23 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Mars 8.0", + "keyboard_name": "Mars 8.0", "manufacturer": "FT", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x20A0", "pid": "0x422D", -- cgit v1.2.3