summaryrefslogtreecommitdiff
path: root/keyboards/unison/v04
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-27 07:45:43 +1000
committerGitHub <noreply@github.com>2023-04-27 07:45:43 +1000
commit4871f651c5328cc8c16d1ec991f3e865094b24c8 (patch)
treecdcda3f68ab91319bc482f69c008396d66492c8b /keyboards/unison/v04
parent67e18c0d6bea880b989104b0a0250c85902b1a75 (diff)
Move remaining `LAYOUT_all`s to data driven (#20463)
Diffstat (limited to 'keyboards/unison/v04')
-rw-r--r--keyboards/unison/v04/info.json316
-rw-r--r--keyboards/unison/v04/v04.c2
-rw-r--r--keyboards/unison/v04/v04.h80
3 files changed, 159 insertions, 239 deletions
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
index 4b911f6096..481c07f7a9 100644
--- a/keyboards/unison/v04/info.json
+++ b/keyboards/unison/v04/info.json
@@ -33,176 +33,176 @@
"layouts": {
"LAYOUT_all": {
"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":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
- {"x":16, "y":0},
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [5, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [5, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [5, 3], "x": 6, "y": 0},
+ {"matrix": [0, 4], "x": 7, "y": 0},
+ {"matrix": [5, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [5, 6], "x": 10, "y": 0},
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [5, 7], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [5, 8], "x": 14, "y": 0},
+ {"matrix": [0, 8], "x": 15, "y": 0},
+ {"matrix": [5, 9], "x": 16, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1, "w":1.5},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1},
- {"x":14.5, "y":1},
- {"x":15.5, "y":1, "w":1.5},
+ {"matrix": [6, 0], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [6, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 5.5, "y": 1},
+ {"matrix": [6, 3], "x": 6.5, "y": 1},
+ {"matrix": [1, 4], "x": 7.5, "y": 1},
+ {"matrix": [6, 4], "x": 8.5, "y": 1},
+ {"matrix": [1, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 5], "x": 10.5, "y": 1},
+ {"matrix": [1, 6], "x": 11.5, "y": 1},
+ {"matrix": [6, 7], "x": 12.5, "y": 1},
+ {"matrix": [1, 7], "x": 13.5, "y": 1},
+ {"matrix": [6, 8], "x": 14.5, "y": 1},
+ {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2, "w":1.5},
- {"x":5.5, "y":2},
- {"x":6.5, "y":2},
- {"x":7.5, "y":2},
- {"x":8.5, "y":2},
- {"x":9.5, "y":2},
- {"x":10.5, "y":2},
- {"x":11.5, "y":2},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2},
- {"x":14.5, "y":2},
- {"x":15.5, "y":2, "w":1.5},
+ {"matrix": [7, 0], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [7, 1], "x": 2, "y": 2},
+ {"matrix": [2, 1], "x": 3, "y": 2},
+ {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [7, 3], "x": 6.5, "y": 2},
+ {"matrix": [2, 4], "x": 7.5, "y": 2},
+ {"matrix": [7, 4], "x": 8.5, "y": 2},
+ {"matrix": [2, 5], "x": 9.5, "y": 2},
+ {"matrix": [7, 5], "x": 10.5, "y": 2},
+ {"matrix": [2, 6], "x": 11.5, "y": 2},
+ {"matrix": [7, 6], "x": 12.5, "y": 2},
+ {"matrix": [2, 7], "x": 13.5, "y": 2},
+ {"matrix": [7, 8], "x": 14.5, "y": 2},
+ {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
- {"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":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
- {"x":14, "y":3},
- {"x":15, "y":3},
- {"x":16, "y":3},
+ {"matrix": [8, 0], "x": 0, "y": 3},
+ {"matrix": [3, 0], "x": 1, "y": 3},
+ {"matrix": [8, 1], "x": 2, "y": 3},
+ {"matrix": [3, 1], "x": 3, "y": 3},
+ {"matrix": [8, 2], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [8, 3], "x": 6, "y": 3},
+ {"matrix": [3, 4], "x": 7, "y": 3},
+ {"matrix": [8, 4], "x": 8, "y": 3},
+ {"matrix": [3, 5], "x": 9, "y": 3},
+ {"matrix": [8, 5], "x": 10, "y": 3},
+ {"matrix": [3, 6], "x": 11, "y": 3},
+ {"matrix": [8, 6], "x": 12, "y": 3},
+ {"matrix": [3, 7], "x": 13, "y": 3},
+ {"matrix": [8, 7], "x": 14, "y": 3},
+ {"matrix": [3, 8], "x": 15, "y": 3},
+ {"matrix": [8, 9], "x": 16, "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":7, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4},
- {"x":11, "y":4},
- {"x":12, "y":4},
- {"x":13, "y":4},
- {"x":14, "y":4},
- {"x":15, "y":4},
- {"x":16, "y":4}
+ {"matrix": [9, 0], "x": 0, "y": 4},
+ {"matrix": [4, 0], "x": 1, "y": 4},
+ {"matrix": [9, 1], "x": 2, "y": 4},
+ {"matrix": [4, 1], "x": 3, "y": 4},
+ {"matrix": [9, 2], "x": 4, "y": 4},
+ {"matrix": [4, 2], "x": 5, "y": 4},
+ {"matrix": [9, 3], "x": 6, "y": 4},
+ {"matrix": [4, 3], "x": 7, "y": 4},
+ {"matrix": [9, 4], "x": 8, "y": 4},
+ {"matrix": [4, 5], "x": 9, "y": 4},
+ {"matrix": [9, 5], "x": 10, "y": 4},
+ {"matrix": [4, 6], "x": 11, "y": 4},
+ {"matrix": [9, 6], "x": 12, "y": 4},
+ {"matrix": [4, 7], "x": 13, "y": 4},
+ {"matrix": [9, 7], "x": 14, "y": 4},
+ {"matrix": [4, 8], "x": 15, "y": 4},
+ {"matrix": [9, 8], "x": 16, "y": 4}
]
},
"LAYOUT_music": {
"layout": [
- {"x":2, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":9, "y":0},
- {"x":11, "y":0},
- {"x":13, "y":0},
- {"x":15, "y":0},
+ {"matrix": [5, 1], "x": 2, "y": 0},
+ {"matrix": [5, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [5, 3], "x": 6, "y": 0},
+ {"matrix": [0, 4], "x": 7, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [0, 8], "x": 15, "y": 0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25, "w":1.5},
- {"x":5.5, "y":1.25},
- {"x":6.5, "y":1.25},
- {"x":7.5, "y":1.25},
- {"x":8.5, "y":1.25},
- {"x":9.5, "y":1.25},
- {"x":10.5, "y":1.25},
- {"x":11.5, "y":1.25},
- {"x":12.5, "y":1.25},
- {"x":13.5, "y":1.25},
- {"x":14.5, "y":1.25},
- {"x":15.5, "y":1.25, "w":1.5},
+ {"matrix": [6, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 0], "x": 1, "y": 1.25},
+ {"matrix": [6, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 7.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 9.5, "y": 1.25},
+ {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 11.5, "y": 1.25},
+ {"matrix": [6, 7], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 13.5, "y": 1.25},
+ {"matrix": [6, 8], "x": 14.5, "y": 1.25},
+ {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
- {"x":3, "y":2.25},
- {"x":4, "y":2.25, "w":1.5},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25},
- {"x":14.5, "y":2.25},
- {"x":15.5, "y":2.25, "w":1.5},
+ {"matrix": [7, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 0], "x": 1, "y": 2.25},
+ {"matrix": [7, 1], "x": 2, "y": 2.25},
+ {"matrix": [2, 1], "x": 3, "y": 2.25},
+ {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 3], "x": 5.5, "y": 2.25},
+ {"matrix": [7, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 9.5, "y": 2.25},
+ {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 11.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 13.5, "y": 2.25},
+ {"matrix": [7, 8], "x": 14.5, "y": 2.25},
+ {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
- {"x":0, "y":3.25},
- {"x":1, "y":3.25},
- {"x":2, "y":3.25},
- {"x":3, "y":3.25},
- {"x":4, "y":3.25},
- {"x":5, "y":3.25},
- {"x":6, "y":3.25},
- {"x":7, "y":3.25},
- {"x":8, "y":3.25},
- {"x":9, "y":3.25},
- {"x":10, "y":3.25},
- {"x":11, "y":3.25},
- {"x":12, "y":3.25},
- {"x":13, "y":3.25},
- {"x":14, "y":3.25},
- {"x":15, "y":3.25},
- {"x":16, "y":3.25},
+ {"matrix": [8, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 0], "x": 1, "y": 3.25},
+ {"matrix": [8, 1], "x": 2, "y": 3.25},
+ {"matrix": [3, 1], "x": 3, "y": 3.25},
+ {"matrix": [8, 2], "x": 4, "y": 3.25},
+ {"matrix": [3, 2], "x": 5, "y": 3.25},
+ {"matrix": [8, 3], "x": 6, "y": 3.25},
+ {"matrix": [3, 4], "x": 7, "y": 3.25},
+ {"matrix": [8, 4], "x": 8, "y": 3.25},
+ {"matrix": [3, 5], "x": 9, "y": 3.25},
+ {"matrix": [8, 5], "x": 10, "y": 3.25},
+ {"matrix": [3, 6], "x": 11, "y": 3.25},
+ {"matrix": [8, 6], "x": 12, "y": 3.25},
+ {"matrix": [3, 7], "x": 13, "y": 3.25},
+ {"matrix": [8, 7], "x": 14, "y": 3.25},
+ {"matrix": [3, 8], "x": 15, "y": 3.25},
+ {"matrix": [8, 9], "x": 16, "y": 3.25},
- {"x":0, "y":4.25},
- {"x":1, "y":4.25},
- {"x":2, "y":4.25},
- {"x":3, "y":4.25},
- {"x":4, "y":4.25},
- {"x":5, "y":4.25},
- {"x":6, "y":4.25},
- {"x":7, "y":4.25},
- {"x":8, "y":4.25},
- {"x":9, "y":4.25},
- {"x":10, "y":4.25},
- {"x":11, "y":4.25},
- {"x":12, "y":4.25},
- {"x":13, "y":4.25},
- {"x":14, "y":4.25},
- {"x":15, "y":4.25},
- {"x":16, "y":4.25}
+ {"matrix": [9, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 0], "x": 1, "y": 4.25},
+ {"matrix": [9, 1], "x": 2, "y": 4.25},
+ {"matrix": [4, 1], "x": 3, "y": 4.25},
+ {"matrix": [9, 2], "x": 4, "y": 4.25},
+ {"matrix": [4, 2], "x": 5, "y": 4.25},
+ {"matrix": [9, 3], "x": 6, "y": 4.25},
+ {"matrix": [4, 3], "x": 7, "y": 4.25},
+ {"matrix": [9, 4], "x": 8, "y": 4.25},
+ {"matrix": [4, 5], "x": 9, "y": 4.25},
+ {"matrix": [9, 5], "x": 10, "y": 4.25},
+ {"matrix": [4, 6], "x": 11, "y": 4.25},
+ {"matrix": [9, 6], "x": 12, "y": 4.25},
+ {"matrix": [4, 7], "x": 13, "y": 4.25},
+ {"matrix": [9, 7], "x": 14, "y": 4.25},
+ {"matrix": [4, 8], "x": 15, "y": 4.25},
+ {"matrix": [9, 8], "x": 16, "y": 4.25}
]
}
}
diff --git a/keyboards/unison/v04/v04.c b/keyboards/unison/v04/v04.c
index 3cae408cfa..d9e8ed9e8b 100644
--- a/keyboards/unison/v04/v04.c
+++ b/keyboards/unison/v04/v04.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "v04.h"
+#include "quantum.h"
#if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_all(
diff --git a/keyboards/unison/v04/v04.h b/keyboards/unison/v04/v04.h
deleted file mode 100644
index 3d66ce1976..0000000000
--- a/keyboards/unison/v04/v04.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 Takeshi Nishio
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/*
-FULL 10x10 ROUND-ROBIN MATRIX for Reference
-{ KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, }, \
-{ k21, KC_NO, k23, k24, k25, k26, k27, k28, k29, k2a, }, \
-{ k31, k32, KC_NO, k34, k35, k36, k37, k38, k39, k3a, }, \
-{ k41, k42, k43, KC_NO, k45, k46, k47, k48, k49, k4a, }, \
-{ k51, k52, k53, k54, KC_NO, k56, k57, k58, k59, k5a, }, \
-{ k61, k62, k63, k64, k65, KC_NO, k67, k68, k69, k6a, }, \
-{ k71, k72, k73, k74, k75, k76, KC_NO, k78, k79, k7a, }, \
-{ k81, k82, k83, k84, k85, k86, k87, KC_NO, k89, k8a, }, \
-{ k91, k92, k93, k94, k95, k96, k97, k98, KC_NO, k9a, }, \
-{ ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, KC_NO, } \
-*/
-
-/* This is 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_all( \
- k61,k12,k62,k13,k63,k14,k64,k15,k65,k16,k67,k17,k68,k18,k69,k19,k6a, \
- k71, k21,k72,k23,k73,k24,k74,k25,k75,k26,k76,k27,k78,k28,k79, k7a, \
- k81, k31,k82,k32,k83,k34,k84,k35,k85,k36,k86,k37,k87,k38,k89, k8a, \
- k91,k41,k92,k42,k93,k43,k94,k45,k95,k46,k96,k47,k97,k48,k98,k49,k9a, \
- ka1,k51,ka2,k52,ka3,k53,ka4,k54,ka5,k56,ka6,k57,ka7,k58,ka8,k59,ka9 \
-) \
-{ \
- { KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, KC_NO, }, \
- { k21, KC_NO, k23, k24, k25, k26, k27, k28, KC_NO, KC_NO, }, \
- { k31, k32, KC_NO, k34, k35, k36, k37, k38, KC_NO, KC_NO, }, \
- { k41, k42, k43, KC_NO, k45, k46, k47, k48, k49, KC_NO, }, \
- { k51, k52, k53, k54, KC_NO, k56, k57, k58, k59, KC_NO, }, \
- { k61, k62, k63, k64, k65, KC_NO, k67, k68, k69, k6a, }, \
- { k71, k72, k73, k74, k75, k76, KC_NO, k78, k79, k7a, }, \
- { k81, k82, k83, k84, k85, k86, k87, KC_NO, k89, k8a, }, \
- { k91, k92, k93, k94, k95, k96, k97, k98, KC_NO, k9a, }, \
- { ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, KC_NO, } \
-}
-#define LAYOUT_music( \
- k62, k63,k14,k64,k15, k16, k17, k18, k19, \
- k71,k21,k72,k23,k73, k24,k74,k25,k75,k26,k76,k27,k78,k28,k79, k7a, \
- k81,k31,k82,k32,k83, k34,k84,k35,k85,k36,k86,k37,k87,k38,k89, k8a, \
- k91,k41,k92,k42,k93,k43,k94,k45,k95,k46,k96,k47,k97,k48,k98,k49,k9a, \
- ka1,k51,ka2,k52,ka3,k53,ka4,k54,ka5,k56,ka6,k57,ka7,k58,ka8,k59,ka9 \
-) \
-{ \
- { KC_NO, KC_NO, KC_NO, k14, k15, k16, k17, k18, k19, KC_NO, }, \
- { k21, KC_NO, k23, k24, k25, k26, k27, k28, KC_NO, KC_NO, }, \
- { k31, k32, KC_NO, k34, k35, k36, k37, k38, KC_NO, KC_NO, }, \
- { k41, k42, k43, KC_NO, k45, k46, k47, k48, k49, KC_NO, }, \
- { k51, k52, k53, k54, KC_NO, k56, k57, k58, k59, KC_NO, }, \
- { KC_NO, k62, k63, k64, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, \
- { k71, k72, k73, k74, k75, k76, KC_NO, k78, k79, k7a, }, \
- { k81, k82, k83, k84, k85, k86, k87, KC_NO, k89, k8a, }, \
- { k91, k92, k93, k94, k95, k96, k97, k98, KC_NO, k9a, }, \
- { ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, KC_NO, } \
-}