From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/handwired/dactyl_manuform/6x7/6x7.h | 35 ---- keyboards/handwired/dactyl_manuform/6x7/info.json | 206 +++++++++++----------- 2 files changed, 103 insertions(+), 138 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform/6x7/6x7.h (limited to 'keyboards/handwired/dactyl_manuform/6x7') diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h deleted file mode 100644 index bd66c309fc..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x7/6x7.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_6x7( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, \ - L52, L53, R52, R53, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61, \ - L62, L63, R62, R63 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { XXX, XXX, XXX, L52, L53, L54, L55 }, \ - { XXX, XXX, XXX, L62, L63, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 }, \ - { R50, R51, R52, R53, XXX, XXX, XXX }, \ - { R60, R61, R62, R63, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index b289804d36..ea983da9c8 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -24,109 +24,109 @@ "layouts": { "LAYOUT_6x7": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - {"x": 17, "y": 0}, - {"x": 18, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - {"x": 17, "y": 2}, - {"x": 18, "y": 2}, - - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 6, "y": 3}, - - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - {"x": 17, "y": 3}, - {"x": 18, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, - {"x": 17, "y": 4}, - {"x": 18, "y": 4}, - - {"x": 3, "y": 5}, - {"x": 4, "y": 5}, - - {"x": 14, "y": 5}, - {"x": 15, "y": 5}, - - {"x": 5, "y": 6}, - {"x": 6, "y": 6}, - - {"x": 12, "y": 6}, - {"x": 13, "y": 6}, - - {"x": 7, "y": 7}, - {"x": 8, "y": 7}, - - {"x": 10, "y": 7}, - {"x": 11, "y": 7}, - - {"x": 7, "y": 8}, - {"x": 8, "y": 8}, - - {"x": 10, "y": 8}, - {"x": 11, "y": 8} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [7, 0], "x": 12, "y": 0}, + {"matrix": [7, 1], "x": 13, "y": 0}, + {"matrix": [7, 2], "x": 14, "y": 0}, + {"matrix": [7, 3], "x": 15, "y": 0}, + {"matrix": [7, 4], "x": 16, "y": 0}, + {"matrix": [7, 5], "x": 17, "y": 0}, + {"matrix": [7, 6], "x": 18, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 0], "x": 12, "y": 1}, + {"matrix": [8, 1], "x": 13, "y": 1}, + {"matrix": [8, 2], "x": 14, "y": 1}, + {"matrix": [8, 3], "x": 15, "y": 1}, + {"matrix": [8, 4], "x": 16, "y": 1}, + {"matrix": [8, 5], "x": 17, "y": 1}, + {"matrix": [8, 6], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 0], "x": 12, "y": 2}, + {"matrix": [9, 1], "x": 13, "y": 2}, + {"matrix": [9, 2], "x": 14, "y": 2}, + {"matrix": [9, 3], "x": 15, "y": 2}, + {"matrix": [9, 4], "x": 16, "y": 2}, + {"matrix": [9, 5], "x": 17, "y": 2}, + {"matrix": [9, 6], "x": 18, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + + {"matrix": [10, 0], "x": 12, "y": 3}, + {"matrix": [10, 1], "x": 13, "y": 3}, + {"matrix": [10, 2], "x": 14, "y": 3}, + {"matrix": [10, 3], "x": 15, "y": 3}, + {"matrix": [10, 4], "x": 16, "y": 3}, + {"matrix": [10, 5], "x": 17, "y": 3}, + {"matrix": [10, 6], "x": 18, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + + {"matrix": [11, 0], "x": 12, "y": 4}, + {"matrix": [11, 1], "x": 13, "y": 4}, + {"matrix": [11, 2], "x": 14, "y": 4}, + {"matrix": [11, 3], "x": 15, "y": 4}, + {"matrix": [11, 4], "x": 16, "y": 4}, + {"matrix": [11, 5], "x": 17, "y": 4}, + {"matrix": [11, 6], "x": 18, "y": 4}, + + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + + {"matrix": [12, 2], "x": 14, "y": 5}, + {"matrix": [12, 3], "x": 15, "y": 5}, + + {"matrix": [5, 5], "x": 5, "y": 6}, + {"matrix": [5, 6], "x": 6, "y": 6}, + + {"matrix": [12, 0], "x": 12, "y": 6}, + {"matrix": [12, 1], "x": 13, "y": 6}, + + {"matrix": [6, 5], "x": 7, "y": 7}, + {"matrix": [6, 6], "x": 8, "y": 7}, + + {"matrix": [13, 0], "x": 10, "y": 7}, + {"matrix": [13, 1], "x": 11, "y": 7}, + + {"matrix": [6, 3], "x": 7, "y": 8}, + {"matrix": [6, 4], "x": 8, "y": 8}, + + {"matrix": [13, 2], "x": 10, "y": 8}, + {"matrix": [13, 3], "x": 11, "y": 8} ] } } -- cgit v1.2.3