From 45c59e7f0adb0024416ee5af16b99c16cf7149c6 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sat, 4 Nov 2023 20:52:10 +0900 Subject: [PATCH] Move single LAYOUTs to data driven (qmk#20365) --- keyboards/nora/v01/info.json | 465 ++++++---------------------------- keyboards/nora/v01/v01.h | 44 ---- keyboards/nora/v03/info.json | 438 ++++++-------------------------- keyboards/nora/v03/v03.c | 2 +- keyboards/nora/v03/v03.h | 44 ---- keyboards/nora/v031/info.json | 441 ++++++-------------------------- keyboards/nora/v031/v031.c | 2 +- keyboards/nora/v031/v031.h | 46 ---- keyboards/nora/v1/info.json | 242 +++++++++++++++++- keyboards/nora/v1/v1.c | 2 +- keyboards/nora/v1/v1.h | 85 ------- 11 files changed, 477 insertions(+), 1334 deletions(-) diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json index 3efbf3fadc12..d01e152b3383 100644 --- a/keyboards/nora/v01/info.json +++ b/keyboards/nora/v01/info.json @@ -21,389 +21,88 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 7, - "y": 0 - }, - { - "label": "*", - "x": 8, - "y": 0 - }, - { - "label": "(", - "x": 9, - "y": 0 - }, - { - "label": ")", - "x": 10, - "y": 0 - }, - { - "label": "+", - "x": 11, - "y": 0 - }, - { - "label": "/", - "x": 12, - "y": 0 - }, - { - "label": "*", - "x": 13, - "y": 0 - }, - { - "label": "-", - "x": 14, - "y": 0 - }, - { - "label": "+", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "Backspace", - "x": 11.5, - "y": 1, - "w": 1.5 - }, - { - "label": "7", - "x": 13, - "y": 1 - }, - { - "label": "8", - "x": 14, - "y": 1 - }, - { - "label": "9", - "x": 15, - "y": 1 - }, - { - "label": "Ctrl", - "x": 0, - "y": 2, - "w": 1.5 - }, - { - "label": "A", - "x": 1.5, - "y": 2 - }, - { - "label": "S", - "x": 2.5, - "y": 2 - }, - { - "label": "D", - "x": 3.5, - "y": 2 - }, - { - "label": "F", - "x": 4.5, - "y": 2 - }, - { - "label": "G", - "x": 5.5, - "y": 2 - }, - { - "label": "H", - "x": 6.5, - "y": 2 - }, - { - "label": "J", - "x": 7.5, - "y": 2 - }, - { - "label": "K", - "x": 8.5, - "y": 2 - }, - { - "label": "L", - "x": 9.5, - "y": 2 - }, - { - "label": "-", - "x": 10.5, - "y": 2 - }, - { - "label": "Enter", - "x": 11.5, - "y": 2, - "w": 1.5 - }, - { - "label": "4", - "x": 13, - "y": 2 - }, - { - "label": "5", - "x": 14, - "y": 2 - }, - { - "label": "6", - "x": 15, - "y": 2 - }, - { - "label": "Shift", - "x": 0, - "y": 3 - }, - { - "label": "Z", - "x": 1, - "y": 3 - }, - { - "label": "Z", - "x": 2, - "y": 3 - }, - { - "label": "X", - "x": 3, - "y": 3 - }, - { - "label": "C", - "x": 4, - "y": 3 - }, - { - "label": "V", - "x": 5, - "y": 3 - }, - { - "label": "B", - "x": 6, - "y": 3 - }, - { - "label": "N", - "x": 7, - "y": 3 - }, - { - "label": "M", - "x": 8, - "y": 3 - }, - { - "label": "<", - "x": 9, - "y": 3 - }, - { - "label": ">", - "x": 10, - "y": 3 - }, - { - "label": "?", - "x": 11, - "y": 3 - }, - { - "label": "1", - "x": 13, - "y": 3 - }, - { - "label": "2", - "x": 14, - "y": 3 - }, - { - "label": "3", - "x": 15, - "y": 3 - }, - { - "label": "\u2191", - "x": 12, - "y": 3.25 - }, - { - "label": "Vol-", - "x": 0, - "y": 4 - }, - { - "label": "Vol+", - "x": 1, - "y": 4 - }, - { - "label": "Opt", - "x": 2, - "y": 4, - "w": 1.5 - }, - { - "label": "Cmd", - "x": 3.5, - "y": 4 - }, - { - "label": "Space", - "x": 4.5, - "y": 4, - "w": 2 - }, - { - "label": "Space", - "x": 6.5, - "y": 4, - "w": 2 - }, - { - "label": "Cmd", - "x": 8.5, - "y": 4 - }, - { - "label": "Opt", - "x": 9.5, - "y": 4, - "w": 1.5 - }, - { - "label": "0", - "x": 14, - "y": 4 - }, - { - "label": ".", - "x": 15, - "y": 4 - }, - { - "label": "\u2190", - "x": 13.25, - "y": 4.25 - }, - { - "label": "\u2193", - "x": 14.25, - "y": 4.25 - }, - { - "label": "\u2192", - "x": 15.25, - "y": 4.25 - } + + {"label": "", "matrix": [0, 0], "x":0, "y":0}, + {"label": "", "matrix": [5, 0], "x":1, "y":0}, + {"label": "", "matrix": [0, 1], "x":2, "y":0}, + {"label": "", "matrix": [5, 1], "x":3, "y":0}, + {"label": "", "matrix": [0, 2], "x":4, "y":0}, + {"label": "", "matrix": [5, 2], "x":5, "y":0}, + {"label": "", "matrix": [0, 3], "x":6, "y":0}, + {"label": "", "matrix": [5, 3], "x":7, "y":0}, + {"label": "", "matrix": [0, 4], "x":8, "y":0}, + {"label": "", "matrix": [5, 4], "x":9, "y":0}, + {"label": "", "matrix": [0, 5], "x":10, "y":0}, + {"label": "", "matrix": [5, 5], "x":11, "y":0}, + {"label": "", "matrix": [0, 6], "x":12, "y":0}, + {"label": "", "matrix": [5, 6], "x":13, "y":0}, + {"label": "", "matrix": [0, 7], "x":14, "y":0}, + {"label": "", "matrix": [5, 7], "x":15, "y":0}, + + {"label": "", "matrix": [6, 0], "x":0, "y":1, "w":1.5}, + {"label": "", "matrix": [1, 1], "x":1.5, "y":1}, + {"label": "", "matrix": [6, 1], "x":2.5, "y":1}, + {"label": "", "matrix": [1, 2], "x":3.5, "y":1}, + {"label": "", "matrix": [6, 2], "x":4.5, "y":1}, + {"label": "", "matrix": [1, 3], "x":5.5, "y":1}, + {"label": "", "matrix": [6, 3], "x":6.5, "y":1}, + {"label": "", "matrix": [1, 4], "x":7.5, "y":1}, + {"label": "", "matrix": [6, 4], "x":8.5, "y":1}, + {"label": "", "matrix": [1, 5], "x":9.5, "y":1}, + {"label": "", "matrix": [6, 5], "x":10.5, "y":1}, + {"label": "", "matrix": [1, 6], "x":11.5, "y":1}, + {"label": "", "matrix": [6, 6], "x":12.5, "y":1}, + {"label": "", "matrix": [1, 7], "x":13.5, "y":1}, + {"label": "", "matrix": [6, 7], "x":14.5, "y":1, "w":1.5}, + + {"label": "", "matrix": [7, 0], "x":0, "y":2, "w":1.5}, + {"label": "", "matrix": [2, 1], "x":1.5, "y":2}, + {"label": "", "matrix": [7, 1], "x":2.5, "y":2}, + {"label": "", "matrix": [2, 2], "x":3.5, "y":2}, + {"label": "", "matrix": [7, 2], "x":4.5, "y":2}, + {"label": "", "matrix": [2, 3], "x":5.5, "y":2}, + {"label": "", "matrix": [7, 3], "x":6.5, "y":2}, + {"label": "", "matrix": [2, 4], "x":7.5, "y":2}, + {"label": "", "matrix": [7, 4], "x":8.5, "y":2}, + {"label": "", "matrix": [2, 5], "x":9.5, "y":2}, + {"label": "", "matrix": [7, 5], "x":10.5, "y":2}, + {"label": "", "matrix": [2, 6], "x":11.5, "y":2}, + {"label": "", "matrix": [7, 6], "x":12.5, "y":2}, + {"label": "", "matrix": [2, 7], "x":13.5, "y":2}, + {"label": "", "matrix": [7, 7], "x":14.5, "y":2, "w":1.5}, + + {"label": "", "matrix": [3, 0], "x":0, "y":3}, + {"label": "", "matrix": [8, 0], "x":1, "y":3}, + {"label": "", "matrix": [3, 1], "x":2, "y":3}, + {"label": "", "matrix": [8, 1], "x":3, "y":3}, + {"label": "", "matrix": [3, 2], "x":4, "y":3}, + {"label": "", "matrix": [8, 2], "x":5, "y":3}, + {"label": "", "matrix": [3, 3], "x":6, "y":3}, + {"label": "", "matrix": [8, 3], "x":7, "y":3}, + {"label": "", "matrix": [3, 4], "x":8, "y":3}, + {"label": "", "matrix": [8, 4], "x":9, "y":3}, + {"label": "", "matrix": [3, 5], "x":10, "y":3}, + {"label": "", "matrix": [8, 5], "x":11, "y":3}, + {"label": "", "matrix": [8, 6], "x":13, "y":3}, + {"label": "", "matrix": [3, 7], "x":14, "y":3}, + {"label": "", "matrix": [8, 7], "x":15, "y":3}, + + {"label": "", "matrix": [3, 6], "x":12, "y":3.25}, + + {"label": "", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "", "matrix": [9, 0], "x": 1, "y": 4}, + {"label": "", "matrix": [4, 1], "x": 2, "y": 4, "w": 1.5}, + {"label": "", "matrix": [9, 1], "x": 3.5, "y": 4}, + {"label": "", "matrix": [9, 2], "x": 4.5, "y": 4, "w": 2}, + {"label": "", "matrix": [9, 3], "x": 6.5, "y": 4, "w": 2}, + {"label": "", "matrix": [9, 4], "x": 8.5, "y": 4}, + {"label": "", "matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.5}, + {"label": "", "matrix": [4, 7], "x": 14, "y": 4}, + {"label": "", "matrix": [9, 7], "x": 15, "y": 4}, + + {"label": "", "matrix": [9, 5], "x": 13.25, "y": 4.25}, + {"label": "", "matrix": [4, 6], "x": 14.25, "y": 4.25}, + {"label": "", "matrix": [9, 6], "x": 15.25, "y": 4.25} ] } } diff --git a/keyboards/nora/v01/v01.h b/keyboards/nora/v01/v01.h index 7657b9ed517d..04d4442ce4fa 100644 --- a/keyboards/nora/v01/v01.h +++ b/keyboards/nora/v01/v01.h @@ -17,47 +17,3 @@ #pragma once #include "quantum.h" - -/* -References: - -FULL 10x8 MATRIX -{ k00, k01, k02, k03, k04, k05, k06, k07 }, \ -{ k10, k11, k12, k13, k14, k15, k16, k17 }, \ -{ k20, k21, k22, k23, k24, k25, k26, k27 }, \ -{ k30, k31, k32, k33, k34, k35, k36, k37 }, \ -{ k40, k41, k42, k43, k44, k45, k46, k47 }, \ -{ k50, k51, k52, k53, k54, k55, k56, k57 }, \ -{ k60, k61, k62, k63, k64, k65, k66, k67 }, \ -{ k70, k71, k72, k73, k74, k75, k76, k77 }, \ -{ k80, k81, k82, k83, k84, k85, k86, k87 }, \ -{ k90, k91, k92, k93, k94, k95, k96, k97 } \ - -Merge two rows into single row to make 5x16 keyboard. -{ k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57 }, \ -{ k10, k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67 }, \ -{ k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77 }, \ -{ k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87 }, \ -{ k40, k90, k41, k91, k42, k92, k43, k93, k44, k94, k45, k95, k46, k96, k47, k97 }, \ - -*/ - -#define LAYOUT( \ - k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57, \ - k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67, \ - k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \ - k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87, \ - k40, k90, k41, k91, k92, k93, k94, k45, k95, k46, k96, k47, k97 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, k14, k15, k16, k17 }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, KC_NO, KC_NO, KC_NO, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { k90, k91, k92, k93, k94, k95, k96, k97 } \ -} diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json index 079c1a90042c..39373f976c4a 100644 --- a/keyboards/nora/v03/info.json +++ b/keyboards/nora/v03/info.json @@ -21,369 +21,81 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "/", - "x": 6, - "y": 0 - }, - { - "label": "*", - "x": 7, - "y": 0 - }, - { - "label": "-", - "x": 8, - "y": 0 - }, - { - "label": "+", - "x": 9, - "y": 0 - }, - { - "label": "^", - "x": 10, - "y": 0 - }, - { - "label": "", - "x": 11, - "y": 0 - }, - { - "label": "", - "x": 12, - "y": 0 - }, - { - "label": "", - "x": 13, - "y": 0 - }, - { - "label": "", - "x": 14, - "y": 0 - }, - { - "label": "", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "7", - "x": 6.5, - "y": 1 - }, - { - "label": "8", - "x": 7.5, - "y": 1 - }, - { - "label": "9", - "x": 8.5, - "y": 1 - }, - { - "label": "Y", - "x": 9.5, - "y": 1 - }, - { - "label": "U", - "x": 10.5, - "y": 1 - }, - { - "label": "I", - "x": 11.5, - "y": 1 - }, - { - "label": "O", - "x": 12.5, - "y": 1 - }, - { - "label": "P", - "x": 13.5, - "y": 1 - }, - { - "label": "Backspace", - "x": 14.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Ctrl", - "x": 0, - "y": 2, - "w": 1.5 - }, - { - "label": "A", - "x": 1.5, - "y": 2 - }, - { - "label": "S", - "x": 2.5, - "y": 2 - }, - { - "label": "D", - "x": 3.5, - "y": 2 - }, - { - "label": "F", - "x": 4.5, - "y": 2 - }, - { - "label": "G", - "x": 5.5, - "y": 2 - }, - { - "label": "4", - "x": 6.5, - "y": 2 - }, - { - "label": "5", - "x": 7.5, - "y": 2 - }, - { - "label": "6", - "x": 8.5, - "y": 2 - }, - { - "label": "H", - "x": 9.5, - "y": 2 - }, - { - "label": "J", - "x": 10.5, - "y": 2 - }, - { - "label": "K", - "x": 11.5, - "y": 2 - }, - { - "label": "L", - "x": 12.5, - "y": 2 - }, - { - "label": "-", - "x": 13.5, - "y": 2 - }, - { - "label": "Enter", - "x": 14.5, - "y": 2, - "w": 1.5 - }, - { - "label": "Shift", - "x": 0, - "y": 3 - }, - { - "label": "Z", - "x": 1, - "y": 3 - }, - { - "label": "Z", - "x": 2, - "y": 3 - }, - { - "label": "X", - "x": 3, - "y": 3 - }, - { - "label": "C", - "x": 4, - "y": 3 - }, - { - "label": "V", - "x": 5, - "y": 3 - }, - { - "label": "B", - "x": 6, - "y": 3 - }, - { - "label": "1", - "x": 7, - "y": 3 - }, - { - "label": "2", - "x": 8, - "y": 3 - }, - { - "label": "3", - "x": 9, - "y": 3 - }, - { - "label": "N", - "x": 10, - "y": 3 - }, - { - "label": "M", - "x": 11, - "y": 3 - }, - { - "label": "<", - "x": 12, - "y": 3 - }, - { - "label": ">", - "x": 13, - "y": 3 - }, - { - "label": "?", - "x": 14, - "y": 3 - }, - { - "label": "Shift", - "x": 15, - "y": 3 - }, - { - "label": "Opt", - "x": 2.5, - "y": 4, - "w": 1.5 - }, - { - "label": "Cmd", - "x": 4, - "y": 4 - }, - { - "label": "Space", - "x": 5, - "y": 4, - "w": 1.5 - }, - { - "label": "???", - "x": 6.5, - "y": 4 - }, - { - "label": "0", - "x": 7.5, - "y": 4 - }, - { - "label": ".", - "x": 8.5, - "y": 4 - }, - { - "label": "Space", - "x": 9.5, - "y": 4, - "w": 1.5 - }, - { - "label": "Cmd", - "x": 11, - "y": 4 - }, - { - "label": "Opt", - "x": 12, - "y": 4, - "w": 1.5 - } + {"label": "", "matrix": [0, 0], "x":0, "y":0}, + {"label": "", "matrix": [5, 0], "x":1, "y":0}, + {"label": "", "matrix": [0, 1], "x":2, "y":0}, + {"label": "", "matrix": [5, 1], "x":3, "y":0}, + {"label": "", "matrix": [0, 2], "x":4, "y":0}, + {"label": "", "matrix": [5, 2], "x":5, "y":0}, + {"label": "", "matrix": [0, 3], "x":6, "y":0}, + {"label": "", "matrix": [5, 3], "x":7, "y":0}, + {"label": "", "matrix": [0, 4], "x":8, "y":0}, + {"label": "", "matrix": [5, 4], "x":9, "y":0}, + {"label": "", "matrix": [0, 5], "x":10, "y":0}, + {"label": "", "matrix": [5, 5], "x":11, "y":0}, + {"label": "", "matrix": [0, 6], "x":12, "y":0}, + {"label": "", "matrix": [5, 6], "x":13, "y":0}, + {"label": "", "matrix": [0, 7], "x":14, "y":0}, + {"label": "", "matrix": [5, 7], "x":15, "y":0}, + + {"label": "", "matrix": [6, 0], "x":0, "y":1, "w":1.5}, + {"label": "", "matrix": [1, 1], "x":1.5, "y":1}, + {"label": "", "matrix": [6, 1], "x":2.5, "y":1}, + {"label": "", "matrix": [1, 2], "x":3.5, "y":1}, + {"label": "", "matrix": [6, 2], "x":4.5, "y":1}, + {"label": "", "matrix": [1, 3], "x":5.5, "y":1}, + {"label": "", "matrix": [6, 3], "x":6.5, "y":1}, + {"label": "", "matrix": [1, 4], "x":7.5, "y":1}, + {"label": "", "matrix": [6, 4], "x":8.5, "y":1}, + {"label": "", "matrix": [1, 5], "x":9.5, "y":1}, + {"label": "", "matrix": [6, 5], "x":10.5, "y":1}, + {"label": "", "matrix": [1, 6], "x":11.5, "y":1}, + {"label": "", "matrix": [6, 6], "x":12.5, "y":1}, + {"label": "", "matrix": [1, 7], "x":13.5, "y":1}, + {"label": "", "matrix": [6, 7], "x":14.5, "y":1, "w":1.5}, + + {"label": "", "matrix": [7, 0], "x":0, "y":2, "w":1.5}, + {"label": "", "matrix": [2, 1], "x":1.5, "y":2}, + {"label": "", "matrix": [7, 1], "x":2.5, "y":2}, + {"label": "", "matrix": [2, 2], "x":3.5, "y":2}, + {"label": "", "matrix": [7, 2], "x":4.5, "y":2}, + {"label": "", "matrix": [2, 3], "x":5.5, "y":2}, + {"label": "", "matrix": [7, 3], "x":6.5, "y":2}, + {"label": "", "matrix": [2, 4], "x":7.5, "y":2}, + {"label": "", "matrix": [7, 4], "x":8.5, "y":2}, + {"label": "", "matrix": [2, 5], "x":9.5, "y":2}, + {"label": "", "matrix": [7, 5], "x":10.5, "y":2}, + {"label": "", "matrix": [2, 6], "x":11.5, "y":2}, + {"label": "", "matrix": [7, 6], "x":12.5, "y":2}, + {"label": "", "matrix": [2, 7], "x":13.5, "y":2}, + {"label": "", "matrix": [7, 7], "x":14.5, "y":2, "w":1.5}, + + {"label": "", "matrix": [3, 0], "x":0, "y":3}, + {"label": "", "matrix": [8, 0], "x":1, "y":3}, + {"label": "", "matrix": [3, 1], "x":2, "y":3}, + {"label": "", "matrix": [8, 1], "x":3, "y":3}, + {"label": "", "matrix": [3, 2], "x":4, "y":3}, + {"label": "", "matrix": [8, 2], "x":5, "y":3}, + {"label": "", "matrix": [3, 3], "x":6, "y":3}, + {"label": "", "matrix": [8, 3], "x":7, "y":3}, + {"label": "", "matrix": [3, 4], "x":8, "y":3}, + {"label": "", "matrix": [8, 4], "x":9, "y":3}, + {"label": "", "matrix": [3, 5], "x":10, "y":3}, + {"label": "", "matrix": [8, 5], "x":11, "y":3}, + {"label": "", "matrix": [3, 6], "x":12, "y":3}, + {"label": "", "matrix": [8, 6], "x":13, "y":3}, + {"label": "", "matrix": [3, 7], "x":14, "y":3}, + {"label": "", "matrix": [8, 7], "x":15, "y":3}, + + {"label": "", "matrix": [9, 1], "x":2.25, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 2], "x":3.75, "y":4}, + {"label": "", "matrix": [9, 2], "x":4.75, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 3], "x":6.25, "y":4}, + {"label": "", "matrix": [4, 4], "x":7.25, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 4], "x":8.75, "y":4}, + {"label": "", "matrix": [4, 5], "x":9.75, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 5], "x":11.25, "y":4}, + {"label": "", "matrix": [4, 6], "x":12.25, "y":4, "w":1.5} ] } } diff --git a/keyboards/nora/v03/v03.c b/keyboards/nora/v03/v03.c index 1d3726adc687..5a877fe11811 100644 --- a/keyboards/nora/v03/v03.c +++ b/keyboards/nora/v03/v03.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "v03.h" +#include QMK_KEYBOARD_H #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/nora/v03/v03.h b/keyboards/nora/v03/v03.h index 429dd4ba9d97..04d4442ce4fa 100644 --- a/keyboards/nora/v03/v03.h +++ b/keyboards/nora/v03/v03.h @@ -17,47 +17,3 @@ #pragma once #include "quantum.h" - -/* -References: - -FULL 10x8 MATRIX -{ k00, k01, k02, k03, k04, k05, k06, k07 }, \ -{ k10, k11, k12, k13, k14, k15, k16, k17 }, \ -{ k20, k21, k22, k23, k24, k25, k26, k27 }, \ -{ k30, k31, k32, k33, k34, k35, k36, k37 }, \ -{ k40, k41, k42, k43, k44, k45, k46, k47 }, \ -{ k50, k51, k52, k53, k54, k55, k56, k57 }, \ -{ k60, k61, k62, k63, k64, k65, k66, k67 }, \ -{ k70, k71, k72, k73, k74, k75, k76, k77 }, \ -{ k80, k81, k82, k83, k84, k85, k86, k87 }, \ -{ k90, k91, k92, k93, k94, k95, k96, k97 } \ - -Merge two rows into single row to make 5x16 keyboard. -{ k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57 }, \ -{ k10, k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67 }, \ -{ k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77 }, \ -{ k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87 }, \ -{ k40, k90, k41, k91, k42, k92, k43, k93, k44, k94, k45, k95, k46, k96, k47, k97 }, \ - -*/ - -#define LAYOUT( \ - k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57, \ - k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67, \ - k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \ - k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87, \ - k91, k42, k92, k93, k44, k94, k45, k95, k46 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, k14, k15, k16, k17 }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { KC_NO, KC_NO, k42, KC_NO, k44, k45, k46, KC_NO }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { KC_NO, k91, k92, k93, k94, k95, KC_NO, KC_NO } \ -} diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json index 9e4e9a822589..b9dccb4d3574 100644 --- a/keyboards/nora/v031/info.json +++ b/keyboards/nora/v031/info.json @@ -26,369 +26,84 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "/", - "x": 6, - "y": 0 - }, - { - "label": "*", - "x": 7, - "y": 0 - }, - { - "label": "-", - "x": 8, - "y": 0 - }, - { - "label": "+", - "x": 9, - "y": 0 - }, - { - "label": "^", - "x": 10, - "y": 0 - }, - { - "label": "", - "x": 11, - "y": 0 - }, - { - "label": "", - "x": 12, - "y": 0 - }, - { - "label": "", - "x": 13, - "y": 0 - }, - { - "label": "", - "x": 14, - "y": 0 - }, - { - "label": "", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "7", - "x": 6.5, - "y": 1 - }, - { - "label": "8", - "x": 7.5, - "y": 1 - }, - { - "label": "9", - "x": 8.5, - "y": 1 - }, - { - "label": "Y", - "x": 9.5, - "y": 1 - }, - { - "label": "U", - "x": 10.5, - "y": 1 - }, - { - "label": "I", - "x": 11.5, - "y": 1 - }, - { - "label": "O", - "x": 12.5, - "y": 1 - }, - { - "label": "P", - "x": 13.5, - "y": 1 - }, - { - "label": "Backspace", - "x": 14.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Ctrl", - "x": 0, - "y": 2, - "w": 1.5 - }, - { - "label": "A", - "x": 1.5, - "y": 2 - }, - { - "label": "S", - "x": 2.5, - "y": 2 - }, - { - "label": "D", - "x": 3.5, - "y": 2 - }, - { - "label": "F", - "x": 4.5, - "y": 2 - }, - { - "label": "G", - "x": 5.5, - "y": 2 - }, - { - "label": "4", - "x": 6.5, - "y": 2 - }, - { - "label": "5", - "x": 7.5, - "y": 2 - }, - { - "label": "6", - "x": 8.5, - "y": 2 - }, - { - "label": "H", - "x": 9.5, - "y": 2 - }, - { - "label": "J", - "x": 10.5, - "y": 2 - }, - { - "label": "K", - "x": 11.5, - "y": 2 - }, - { - "label": "L", - "x": 12.5, - "y": 2 - }, - { - "label": "-", - "x": 13.5, - "y": 2 - }, - { - "label": "Enter", - "x": 14.5, - "y": 2, - "w": 1.5 - }, - { - "label": "Shift", - "x": 0, - "y": 3 - }, - { - "label": "Z", - "x": 1, - "y": 3 - }, - { - "label": "Z", - "x": 2, - "y": 3 - }, - { - "label": "X", - "x": 3, - "y": 3 - }, - { - "label": "C", - "x": 4, - "y": 3 - }, - { - "label": "V", - "x": 5, - "y": 3 - }, - { - "label": "B", - "x": 6, - "y": 3 - }, - { - "label": "1", - "x": 7, - "y": 3 - }, - { - "label": "2", - "x": 8, - "y": 3 - }, - { - "label": "3", - "x": 9, - "y": 3 - }, - { - "label": "N", - "x": 10, - "y": 3 - }, - { - "label": "M", - "x": 11, - "y": 3 - }, - { - "label": "<", - "x": 12, - "y": 3 - }, - { - "label": ">", - "x": 13, - "y": 3 - }, - { - "label": "?", - "x": 14, - "y": 3 - }, - { - "label": "Shift", - "x": 15, - "y": 3 - }, - { - "label": "Opt", - "x": 2.5, - "y": 4, - "w": 1.5 - }, - { - "label": "Cmd", - "x": 4, - "y": 4 - }, - { - "label": "Space", - "x": 5, - "y": 4, - "w": 1.5 - }, - { - "label": "???", - "x": 6.5, - "y": 4 - }, - { - "label": "0", - "x": 7.5, - "y": 4 - }, - { - "label": ".", - "x": 8.5, - "y": 4 - }, - { - "label": "Space", - "x": 9.5, - "y": 4, - "w": 1.5 - }, - { - "label": "Cmd", - "x": 11, - "y": 4 - }, - { - "label": "Opt", - "x": 12, - "y": 4, - "w": 1.5 - } + {"label": "", "matrix": [0, 0], "x":0, "y":0}, + {"label": "", "matrix": [5, 0], "x":1, "y":0}, + {"label": "", "matrix": [0, 1], "x":2, "y":0}, + {"label": "", "matrix": [5, 1], "x":3, "y":0}, + {"label": "", "matrix": [0, 2], "x":4, "y":0}, + {"label": "", "matrix": [5, 2], "x":5, "y":0}, + {"label": "", "matrix": [0, 3], "x":6, "y":0}, + {"label": "", "matrix": [5, 3], "x":7, "y":0}, + {"label": "", "matrix": [0, 4], "x":8, "y":0}, + {"label": "", "matrix": [5, 4], "x":9, "y":0}, + {"label": "", "matrix": [0, 5], "x":10, "y":0}, + {"label": "", "matrix": [5, 5], "x":11, "y":0}, + {"label": "", "matrix": [0, 6], "x":12, "y":0}, + {"label": "", "matrix": [5, 6], "x":13, "y":0}, + {"label": "", "matrix": [0, 7], "x":14, "y":0}, + {"label": "", "matrix": [5, 7], "x":15, "y":0}, + + {"label": "", "matrix": [6, 0], "x":0, "y":1, "w":1.5}, + {"label": "", "matrix": [1, 1], "x":1.5, "y":1}, + {"label": "", "matrix": [6, 1], "x":2.5, "y":1}, + {"label": "", "matrix": [1, 2], "x":3.5, "y":1}, + {"label": "", "matrix": [6, 2], "x":4.5, "y":1}, + {"label": "", "matrix": [1, 3], "x":5.5, "y":1}, + {"label": "", "matrix": [6, 3], "x":6.5, "y":1}, + {"label": "", "matrix": [1, 4], "x":7.5, "y":1}, + {"label": "", "matrix": [6, 4], "x":8.5, "y":1}, + {"label": "", "matrix": [1, 5], "x":9.5, "y":1}, + {"label": "", "matrix": [6, 5], "x":10.5, "y":1}, + {"label": "", "matrix": [1, 6], "x":11.5, "y":1}, + {"label": "", "matrix": [6, 6], "x":12.5, "y":1}, + {"label": "", "matrix": [1, 7], "x":13.5, "y":1}, + {"label": "", "matrix": [6, 7], "x":14.5, "y":1, "w":1.5}, + + {"label": "", "matrix": [7, 0], "x":0, "y":2, "w":1.5}, + {"label": "", "matrix": [2, 1], "x":1.5, "y":2}, + {"label": "", "matrix": [7, 1], "x":2.5, "y":2}, + {"label": "", "matrix": [2, 2], "x":3.5, "y":2}, + {"label": "", "matrix": [7, 2], "x":4.5, "y":2}, + {"label": "", "matrix": [2, 3], "x":5.5, "y":2}, + {"label": "", "matrix": [7, 3], "x":6.5, "y":2}, + {"label": "", "matrix": [2, 4], "x":7.5, "y":2}, + {"label": "", "matrix": [7, 4], "x":8.5, "y":2}, + {"label": "", "matrix": [2, 5], "x":9.5, "y":2}, + {"label": "", "matrix": [7, 5], "x":10.5, "y":2}, + {"label": "", "matrix": [2, 6], "x":11.5, "y":2}, + {"label": "", "matrix": [7, 6], "x":12.5, "y":2}, + {"label": "", "matrix": [2, 7], "x":13.5, "y":2}, + {"label": "", "matrix": [7, 7], "x":14.5, "y":2, "w":1.5}, + + {"label": "", "matrix": [3, 0], "x":0, "y":3}, + {"label": "", "matrix": [8, 0], "x":1, "y":3}, + {"label": "", "matrix": [3, 1], "x":2, "y":3}, + {"label": "", "matrix": [8, 1], "x":3, "y":3}, + {"label": "", "matrix": [3, 2], "x":4, "y":3}, + {"label": "", "matrix": [8, 2], "x":5, "y":3}, + {"label": "", "matrix": [3, 3], "x":6, "y":3}, + {"label": "", "matrix": [8, 3], "x":7, "y":3}, + {"label": "", "matrix": [3, 4], "x":8, "y":3}, + {"label": "", "matrix": [8, 4], "x":9, "y":3}, + {"label": "", "matrix": [3, 5], "x":10, "y":3}, + {"label": "", "matrix": [8, 5], "x":11, "y":3}, + {"label": "", "matrix": [3, 6], "x":12, "y":3}, + {"label": "", "matrix": [8, 6], "x":13, "y":3}, + {"label": "", "matrix": [3, 7], "x":14, "y":3}, + {"label": "", "matrix": [8, 7], "x":15, "y":3}, + + {"label": "", "matrix": [9, 1], "x":2.25, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 2], "x":3.75, "y":4}, + {"label": "", "matrix": [9, 2], "x":4.75, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 3], "x":6.25, "y":4}, + {"label": "", "matrix": [4, 4], "x":7.25, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 4], "x":8.75, "y":4}, + {"label": "", "matrix": [4, 5], "x":9.75, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 5], "x":11.25, "y":4}, + {"label": "", "matrix": [4, 6], "x":12.25, "y":4, "w":1.5}, + + {"label": "", "matrix": [4, 7], "x":7, "y":5}, + {"label": "", "matrix": [9, 7], "x":8, "y":5} ] } } diff --git a/keyboards/nora/v031/v031.c b/keyboards/nora/v031/v031.c index 3b6467fa2ffc..3cd1bc370fd1 100644 --- a/keyboards/nora/v031/v031.c +++ b/keyboards/nora/v031/v031.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "v031.h" +#include QMK_KEYBOARD_H #ifdef AUDIO_ENABLE const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT( diff --git a/keyboards/nora/v031/v031.h b/keyboards/nora/v031/v031.h index ac76d1d29783..c7af527ca77c 100644 --- a/keyboards/nora/v031/v031.h +++ b/keyboards/nora/v031/v031.h @@ -18,52 +18,6 @@ #include "quantum.h" -/* -References: - -FULL 10x8 MATRIX -{ k00, k01, k02, k03, k04, k05, k06, k07 }, \ -{ k10, k11, k12, k13, k14, k15, k16, k17 }, \ -{ k20, k21, k22, k23, k24, k25, k26, k27 }, \ -{ k30, k31, k32, k33, k34, k35, k36, k37 }, \ -{ k40, k41, k42, k43, k44, k45, k46, k47 }, \ -{ k50, k51, k52, k53, k54, k55, k56, k57 }, \ -{ k60, k61, k62, k63, k64, k65, k66, k67 }, \ -{ k70, k71, k72, k73, k74, k75, k76, k77 }, \ -{ k80, k81, k82, k83, k84, k85, k86, k87 }, \ -{ k90, k91, k92, k93, k94, k95, k96, k97 } \ - -Merge two rows into single row to make 5x16 keyboard. -{ k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57 }, \ -{ k10, k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67 }, \ -{ k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77 }, \ -{ k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87 }, \ -{ k40, k90, k41, k91, k42, k92, k43, k93, k44, k94, k45, k95, k46, k96, k47, k97 }, \ - -*/ - -#define LAYOUT( \ - k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57, \ - k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67, \ - k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \ - k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87, \ - k91, k42, k92, k43, k44, k94, k45, k95, k46, \ - k47, k97 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, k14, k15, k16, k17 }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { KC_NO, KC_NO, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { KC_NO, k91, k92, KC_NO, k94, k95, KC_NO, k97 } \ -} - - // Indicator LED index #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/nora/v1/info.json b/keyboards/nora/v1/info.json index 84853e2ad7af..6ffd79f25c71 100644 --- a/keyboards/nora/v1/info.json +++ b/keyboards/nora/v1/info.json @@ -25,13 +25,249 @@ }, "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":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"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, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"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, "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":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4}, {"x":7.25, "y":4, "w":1.5}, {"x":8.75, "y":4}, {"x":9.75, "y":4, "w":1.5}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.5}] + "layout": [ + {"label": "", "matrix": [0, 0], "x":0, "y":0}, + {"label": "", "matrix": [5, 0], "x":1, "y":0}, + {"label": "", "matrix": [0, 1], "x":2, "y":0}, + {"label": "", "matrix": [5, 1], "x":3, "y":0}, + {"label": "", "matrix": [0, 2], "x":4, "y":0}, + {"label": "", "matrix": [5, 2], "x":5, "y":0}, + {"label": "", "matrix": [0, 3], "x":6, "y":0}, + {"label": "", "matrix": [5, 3], "x":7, "y":0}, + {"label": "", "matrix": [0, 4], "x":8, "y":0}, + {"label": "", "matrix": [5, 4], "x":9, "y":0}, + {"label": "", "matrix": [0, 5], "x":10, "y":0}, + {"label": "", "matrix": [5, 5], "x":11, "y":0}, + {"label": "", "matrix": [0, 6], "x":12, "y":0}, + {"label": "", "matrix": [5, 6], "x":13, "y":0}, + {"label": "", "matrix": [0, 7], "x":14, "y":0}, + {"label": "", "matrix": [5, 7], "x":15, "y":0}, + + {"label": "", "matrix": [6, 0], "x":0, "y":1, "w":1.5}, + {"label": "", "matrix": [1, 1], "x":1.5, "y":1}, + {"label": "", "matrix": [6, 1], "x":2.5, "y":1}, + {"label": "", "matrix": [1, 2], "x":3.5, "y":1}, + {"label": "", "matrix": [6, 2], "x":4.5, "y":1}, + {"label": "", "matrix": [1, 3], "x":5.5, "y":1}, + {"label": "", "matrix": [6, 3], "x":6.5, "y":1}, + {"label": "", "matrix": [1, 4], "x":7.5, "y":1}, + {"label": "", "matrix": [6, 4], "x":8.5, "y":1}, + {"label": "", "matrix": [1, 5], "x":9.5, "y":1}, + {"label": "", "matrix": [6, 5], "x":10.5, "y":1}, + {"label": "", "matrix": [1, 6], "x":11.5, "y":1}, + {"label": "", "matrix": [6, 6], "x":12.5, "y":1}, + {"label": "", "matrix": [1, 7], "x":13.5, "y":1}, + {"label": "", "matrix": [6, 7], "x":14.5, "y":1, "w":1.5}, + + {"label": "", "matrix": [7, 0], "x":0, "y":2, "w":1.5}, + {"label": "", "matrix": [2, 1], "x":1.5, "y":2}, + {"label": "", "matrix": [7, 1], "x":2.5, "y":2}, + {"label": "", "matrix": [2, 2], "x":3.5, "y":2}, + {"label": "", "matrix": [7, 2], "x":4.5, "y":2}, + {"label": "", "matrix": [2, 3], "x":5.5, "y":2}, + {"label": "", "matrix": [7, 3], "x":6.5, "y":2}, + {"label": "", "matrix": [2, 4], "x":7.5, "y":2}, + {"label": "", "matrix": [7, 4], "x":8.5, "y":2}, + {"label": "", "matrix": [2, 5], "x":9.5, "y":2}, + {"label": "", "matrix": [7, 5], "x":10.5, "y":2}, + {"label": "", "matrix": [2, 6], "x":11.5, "y":2}, + {"label": "", "matrix": [7, 6], "x":12.5, "y":2}, + {"label": "", "matrix": [2, 7], "x":13.5, "y":2}, + {"label": "", "matrix": [7, 7], "x":14.5, "y":2, "w":1.5}, + + {"label": "", "matrix": [3, 0], "x":0, "y":3}, + {"label": "", "matrix": [8, 0], "x":1, "y":3}, + {"label": "", "matrix": [3, 1], "x":2, "y":3}, + {"label": "", "matrix": [8, 1], "x":3, "y":3}, + {"label": "", "matrix": [3, 2], "x":4, "y":3}, + {"label": "", "matrix": [8, 2], "x":5, "y":3}, + {"label": "", "matrix": [3, 3], "x":6, "y":3}, + {"label": "", "matrix": [8, 3], "x":7, "y":3}, + {"label": "", "matrix": [3, 4], "x":8, "y":3}, + {"label": "", "matrix": [8, 4], "x":9, "y":3}, + {"label": "", "matrix": [3, 5], "x":10, "y":3}, + {"label": "", "matrix": [8, 5], "x":11, "y":3}, + {"label": "", "matrix": [3, 6], "x":12, "y":3}, + {"label": "", "matrix": [8, 6], "x":13, "y":3}, + {"label": "", "matrix": [3, 7], "x":14, "y":3}, + {"label": "", "matrix": [8, 7], "x":15, "y":3}, + + {"label": "", "matrix": [9, 1], "x":2.25, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 2], "x":3.75, "y":4}, + {"label": "", "matrix": [9, 2], "x":4.75, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 3], "x":6.25, "y":4}, + {"label": "", "matrix": [4, 4], "x":7.25, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 4], "x":8.75, "y":4}, + {"label": "", "matrix": [4, 5], "x":9.75, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 5], "x":11.25, "y":4}, + {"label": "", "matrix": [4, 6], "x":12.25, "y":4, "w":1.5} + ] }, "LAYOUT_fw": { - "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":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":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.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, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.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, "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":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":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4}, {"x":8.75, "y":4}, {"x":9.75, "y":4, "w":1.5}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.5}] + "layout": [ + {"label": "", "matrix": [0, 0], "x":0, "y":0}, + {"label": "", "matrix": [5, 0], "x":1, "y":0}, + {"label": "", "matrix": [0, 1], "x":2, "y":0}, + {"label": "", "matrix": [5, 1], "x":3, "y":0}, + {"label": "", "matrix": [0, 2], "x":4, "y":0}, + {"label": "", "matrix": [5, 2], "x":5, "y":0}, + {"label": "", "matrix": [0, 3], "x":6, "y":0}, + + {"label": "", "matrix": [5, 4], "x":9, "y":0}, + {"label": "", "matrix": [0, 5], "x":10, "y":0}, + {"label": "", "matrix": [5, 5], "x":11, "y":0}, + {"label": "", "matrix": [0, 6], "x":12, "y":0}, + {"label": "", "matrix": [5, 6], "x":13, "y":0}, + {"label": "", "matrix": [0, 7], "x":14, "y":0}, + {"label": "", "matrix": [5, 7], "x":15, "y":0}, + + + {"label": "", "matrix": [6, 0], "x":0, "y":1, "w":1.5}, + {"label": "", "matrix": [1, 1], "x":1.5, "y":1}, + {"label": "", "matrix": [6, 1], "x":2.5, "y":1}, + {"label": "", "matrix": [1, 2], "x":3.5, "y":1}, + {"label": "", "matrix": [6, 2], "x":4.5, "y":1}, + {"label": "", "matrix": [1, 3], "x":5.5, "y":1}, + {"label": "", "matrix": [6, 3], "x":6.5, "y":1}, + + {"label": "", "matrix": [6, 4], "x":8.5, "y":1}, + {"label": "", "matrix": [1, 5], "x":9.5, "y":1}, + {"label": "", "matrix": [6, 5], "x":10.5, "y":1}, + {"label": "", "matrix": [1, 6], "x":11.5, "y":1}, + {"label": "", "matrix": [6, 6], "x":12.5, "y":1}, + {"label": "", "matrix": [1, 7], "x":13.5, "y":1}, + {"label": "", "matrix": [6, 7], "x":14.5, "y":1, "w":1.5}, + + + {"label": "", "matrix": [7, 0], "x":0, "y":2, "w":1.5}, + {"label": "", "matrix": [2, 1], "x":1.5, "y":2}, + {"label": "", "matrix": [7, 1], "x":2.5, "y":2}, + {"label": "", "matrix": [2, 2], "x":3.5, "y":2}, + {"label": "", "matrix": [7, 2], "x":4.5, "y":2}, + {"label": "", "matrix": [2, 3], "x":5.5, "y":2}, + {"label": "", "matrix": [7, 3], "x":6.5, "y":2}, + + {"label": "", "matrix": [7, 4], "x":8.5, "y":2}, + {"label": "", "matrix": [2, 5], "x":9.5, "y":2}, + {"label": "", "matrix": [7, 5], "x":10.5, "y":2}, + {"label": "", "matrix": [2, 6], "x":11.5, "y":2}, + {"label": "", "matrix": [7, 6], "x":12.5, "y":2}, + {"label": "", "matrix": [2, 7], "x":13.5, "y":2}, + {"label": "", "matrix": [7, 7], "x":14.5, "y":2, "w":1.5}, + + + {"label": "", "matrix": [3, 0], "x":0, "y":3}, + {"label": "", "matrix": [8, 0], "x":1, "y":3}, + {"label": "", "matrix": [3, 1], "x":2, "y":3}, + {"label": "", "matrix": [8, 1], "x":3, "y":3}, + {"label": "", "matrix": [3, 2], "x":4, "y":3}, + {"label": "", "matrix": [8, 2], "x":5, "y":3}, + {"label": "", "matrix": [3, 3], "x":6, "y":3}, + + {"label": "", "matrix": [8, 4], "x":9, "y":3}, + {"label": "", "matrix": [3, 5], "x":10, "y":3}, + {"label": "", "matrix": [8, 5], "x":11, "y":3}, + {"label": "", "matrix": [3, 6], "x":12, "y":3}, + {"label": "", "matrix": [8, 6], "x":13, "y":3}, + {"label": "", "matrix": [3, 7], "x":14, "y":3}, + {"label": "", "matrix": [8, 7], "x":15, "y":3}, + + + {"label": "", "matrix": [9, 1], "x":2.25, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 2], "x":3.75, "y":4}, + {"label": "", "matrix": [9, 2], "x":4.75, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 3], "x":6.25, "y":4}, + + {"label": "", "matrix": [9, 4], "x":8.75, "y":4}, + {"label": "", "matrix": [4, 5], "x":9.75, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 5], "x":11.25, "y":4}, + {"label": "", "matrix": [4, 6], "x":12.25, "y":4, "w":1.5} + ] }, "LAYOUT_re": { - "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":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":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.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, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.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, "w":1.5}, {"x":7.5, "y":2.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":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":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4}, {"x":8.75, "y":4}, {"x":9.75, "y":4, "w":1.5}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.5}, {"x":7, "y":5}, {"x":8, "y":5}] + "layout": [ + {"label": "", "matrix": [0, 0], "x":0, "y":0}, + {"label": "", "matrix": [5, 0], "x":1, "y":0}, + {"label": "", "matrix": [0, 1], "x":2, "y":0}, + {"label": "", "matrix": [5, 1], "x":3, "y":0}, + {"label": "", "matrix": [0, 2], "x":4, "y":0}, + {"label": "", "matrix": [5, 2], "x":5, "y":0}, + {"label": "", "matrix": [0, 3], "x":6, "y":0}, + + {"label": "", "matrix": [5, 4], "x":9, "y":0}, + {"label": "", "matrix": [0, 5], "x":10, "y":0}, + {"label": "", "matrix": [5, 5], "x":11, "y":0}, + {"label": "", "matrix": [0, 6], "x":12, "y":0}, + {"label": "", "matrix": [5, 6], "x":13, "y":0}, + {"label": "", "matrix": [0, 7], "x":14, "y":0}, + {"label": "", "matrix": [5, 7], "x":15, "y":0}, + + + {"label": "", "matrix": [6, 0], "x":0, "y":1, "w":1.5}, + {"label": "", "matrix": [1, 1], "x":1.5, "y":1}, + {"label": "", "matrix": [6, 1], "x":2.5, "y":1}, + {"label": "", "matrix": [1, 2], "x":3.5, "y":1}, + {"label": "", "matrix": [6, 2], "x":4.5, "y":1}, + {"label": "", "matrix": [1, 3], "x":5.5, "y":1}, + {"label": "", "matrix": [6, 3], "x":6.5, "y":1}, + + {"label": "", "matrix": [6, 4], "x":8.5, "y":1}, + {"label": "", "matrix": [1, 5], "x":9.5, "y":1}, + {"label": "", "matrix": [6, 5], "x":10.5, "y":1}, + {"label": "", "matrix": [1, 6], "x":11.5, "y":1}, + {"label": "", "matrix": [6, 6], "x":12.5, "y":1}, + {"label": "", "matrix": [1, 7], "x":13.5, "y":1}, + {"label": "", "matrix": [6, 7], "x":14.5, "y":1, "w":1.5}, + + + {"label": "", "matrix": [7, 0], "x":0, "y":2, "w":1.5}, + {"label": "", "matrix": [2, 1], "x":1.5, "y":2}, + {"label": "", "matrix": [7, 1], "x":2.5, "y":2}, + {"label": "", "matrix": [2, 2], "x":3.5, "y":2}, + {"label": "", "matrix": [7, 2], "x":4.5, "y":2}, + {"label": "", "matrix": [2, 3], "x":5.5, "y":2}, + + {"label": "", "matrix": [2, 4], "x":7.5, "y":2}, + + {"label": "", "matrix": [2, 5], "x":9.5, "y":2}, + {"label": "", "matrix": [7, 5], "x":10.5, "y":2}, + {"label": "", "matrix": [2, 6], "x":11.5, "y":2}, + {"label": "", "matrix": [7, 6], "x":12.5, "y":2}, + {"label": "", "matrix": [2, 7], "x":13.5, "y":2}, + {"label": "", "matrix": [7, 7], "x":14.5, "y":2, "w":1.5}, + + + {"label": "", "matrix": [3, 0], "x":0, "y":3}, + {"label": "", "matrix": [8, 0], "x":1, "y":3}, + {"label": "", "matrix": [3, 1], "x":2, "y":3}, + {"label": "", "matrix": [8, 1], "x":3, "y":3}, + {"label": "", "matrix": [3, 2], "x":4, "y":3}, + {"label": "", "matrix": [8, 2], "x":5, "y":3}, + {"label": "", "matrix": [3, 3], "x":6, "y":3}, + + {"label": "", "matrix": [8, 4], "x":9, "y":3}, + {"label": "", "matrix": [3, 5], "x":10, "y":3}, + {"label": "", "matrix": [8, 5], "x":11, "y":3}, + {"label": "", "matrix": [3, 6], "x":12, "y":3}, + {"label": "", "matrix": [8, 6], "x":13, "y":3}, + {"label": "", "matrix": [3, 7], "x":14, "y":3}, + {"label": "", "matrix": [8, 7], "x":15, "y":3}, + + + {"label": "", "matrix": [9, 1], "x":2.25, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 2], "x":3.75, "y":4}, + {"label": "", "matrix": [9, 2], "x":4.75, "y":4, "w":1.5}, + {"label": "", "matrix": [4, 3], "x":6.25, "y":4}, + + {"label": "", "matrix": [9, 4], "x":8.75, "y":4}, + {"label": "", "matrix": [4, 5], "x":9.75, "y":4, "w":1.5}, + {"label": "", "matrix": [9, 5], "x":11.25, "y":4}, + {"label": "", "matrix": [4, 6], "x":12.25, "y":4, "w":1.5}, + + + {"label": "", "matrix": [4, 7], "x":7, "y":5}, + {"label": "", "matrix": [9, 7], "x":8, "y":5} + ] } } } diff --git a/keyboards/nora/v1/v1.c b/keyboards/nora/v1/v1.c index 712b732bcbbc..dfb6c9852407 100644 --- a/keyboards/nora/v1/v1.c +++ b/keyboards/nora/v1/v1.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "v1.h" +#include QMK_KEYBOARD_H #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/nora/v1/v1.h b/keyboards/nora/v1/v1.h index 59022da6be3d..9122b28a58cd 100644 --- a/keyboards/nora/v1/v1.h +++ b/keyboards/nora/v1/v1.h @@ -19,91 +19,6 @@ along with this program. If not, see . #include "quantum.h" -/* -References: - -Full 10*8 matrix. -{ k00, k01, k02, k03, k04, k05, k06, k07 }, \ -{ k10, k11, k12, k13, k14, k15, k16, k17 }, \ -{ k20, k21, k22, k23, k24, k25, k26, k27 }, \ -{ k30, k31, k32, k33, k34, k35, k36, k37 }, \ -{ k40, k41, k42, k43, k44, k45, k46, k47 }, \ -{ k50, k51, k52, k53, k54, k55, k56, k57 }, \ -{ k60, k61, k62, k63, k64, k65, k66, k67 }, \ -{ k70, k71, k72, k73, k74, k75, k76, k77 }, \ -{ k80, k81, k82, k83, k84, k85, k86, k87 }, \ -{ k90, k91, k92, k93, k94, k95, k96, k97 } \ - -Merge two rows into single row to make 5*16 matrix. -{ k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57 }, \ -{ k10, k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67 }, \ -{ k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77 }, \ -{ k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87 }, \ -{ k40, k90, k41, k91, k42, k92, k43, k93, k44, k94, k45, k95, k46, k96, k47, k97 }, \ - -*/ - -#define LAYOUT_all( \ - k00, k50, k01, k51, k02, k52, k03, k53, k04, k54, k05, k55, k06, k56, k07, k57, \ - k60, k11, k61, k12, k62, k13, k63, k14, k64, k15, k65, k16, k66, k17, k67, \ - k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \ - k30, k80, k31, k81, k32, k82, k33, k83, k34, k84, k35, k85, k36, k86, k37, k87, \ - k91, k42, k92, k43, k44, k94, k45, k95, k46 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, k14, k15, k16, k17 }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { KC_NO, KC_NO, k42, k43, k44, k45, k46, KC_NO }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { KC_NO, k91, k92, KC_NO, k94, k95, KC_NO, KC_NO } \ -} - -#define LAYOUT_fw( \ - k00, k50, k01, k51, k02, k52, k03, k54, k05, k55, k06, k56, k07, k57, \ - k60, k11, k61, k12, k62, k13, k63, k64, k15, k65, k16, k66, k17, k67, \ - k70, k21, k71, k22, k72, k23, k73, k74, k25, k75, k26, k76, k27, k77, \ - k30, k80, k31, k81, k32, k82, k33, k84, k35, k85, k36, k86, k37, k87, \ - k91, k42, k92, k43, k94, k45, k95, k46 \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, KC_NO, k15, k16, k17 }, \ - { KC_NO, k21, k22, k23, KC_NO, k25, k26, k27 }, \ - { k30, k31, k32, k33, KC_NO, k35, k36, k37 }, \ - { KC_NO, KC_NO, k42, k43, KC_NO, k45, k46, KC_NO }, \ - { k50, k51, k52, KC_NO, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, KC_NO, k84, k85, k86, k87 }, \ - { KC_NO, k91, k92, KC_NO, k94, k95, KC_NO, KC_NO } \ -} - -#define LAYOUT_re( \ - k00, k50, k01, k51, k02, k52, k03, k54, k05, k55, k06, k56, k07, k57, \ - k60, k11, k61, k12, k62, k13, k63, k64, k15, k65, k16, k66, k17, k67, \ - k70, k21, k71, k22, k72, k23, k24, k25, k75, k26, k76, k27, k77, \ - k30, k80, k31, k81, k32, k82, k33, k84, k35, k85, k36, k86, k37, k87, \ - k91, k42, k92, k43, k94, k45, k95, k46, \ - k47, k97 \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, KC_NO, k15, k16, k17 }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, KC_NO, k35, k36, k37 }, \ - { KC_NO, KC_NO, k42, k43, KC_NO, k45, k46, k47 }, \ - { k50, k51, k52, KC_NO, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, KC_NO, KC_NO, k75, k76, k77 }, \ - { k80, k81, k82, KC_NO, k84, k85, k86, k87 }, \ - { KC_NO, k91, k92, KC_NO, k94, k95, KC_NO, k97 } \ -} - // Indicator LED #ifdef RGB_MATRIX_ENABLE