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/omkbd/ergodash/mini/config.h | 8 -------- keyboards/omkbd/ergodash/mini/info.json | 5 +++++ keyboards/omkbd/ergodash/rev1/config.h | 8 -------- keyboards/omkbd/ergodash/rev1/info.json | 5 +++++ keyboards/omkbd/runner3680/3x6/config.h | 7 ------- keyboards/omkbd/runner3680/3x6/info.json | 5 +++++ keyboards/omkbd/runner3680/3x7/config.h | 7 ------- keyboards/omkbd/runner3680/3x7/info.json | 5 +++++ keyboards/omkbd/runner3680/3x8/config.h | 7 ------- keyboards/omkbd/runner3680/3x8/info.json | 5 +++++ keyboards/omkbd/runner3680/4x6/config.h | 7 ------- keyboards/omkbd/runner3680/4x6/info.json | 5 +++++ keyboards/omkbd/runner3680/4x7/config.h | 7 ------- keyboards/omkbd/runner3680/4x7/info.json | 5 +++++ keyboards/omkbd/runner3680/4x8/config.h | 7 ------- keyboards/omkbd/runner3680/4x8/info.json | 5 +++++ keyboards/omkbd/runner3680/5x6/config.h | 7 ------- keyboards/omkbd/runner3680/5x6/info.json | 5 +++++ keyboards/omkbd/runner3680/5x6_5x8/config.h | 7 ------- keyboards/omkbd/runner3680/5x6_5x8/info.json | 5 +++++ keyboards/omkbd/runner3680/5x7/config.h | 7 ------- keyboards/omkbd/runner3680/5x7/info.json | 5 +++++ keyboards/omkbd/runner3680/5x8/config.h | 7 ------- keyboards/omkbd/runner3680/5x8/info.json | 5 +++++ 24 files changed, 60 insertions(+), 86 deletions(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index 6adcf7253c..c5772b4124 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 4b5bd3bb70..9a5910bc69 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7 diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 21bd3d4f7b..2f3532bbb4 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -18,14 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index d11b84b733..35b6084d5a 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7 diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index 094caf7e7c..fefd4840a8 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index 966b9018c6..ebd7e4d2c2 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index 45b8ea2c5e..9fa7ef6ecb 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index 8e3e715c67..c55fb295a7 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index 3c2903c8d1..1640c1ae10 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index 1954b6daec..c04f891b76 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index 27c831a8c8..1640c1ae10 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index 9e3afe60f3..f4edd551ba 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index db7591bc1b..85cc2719f7 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index 1e543d9527..df40623eb3 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index 27ffd994bc..aa4a29d56d 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index 3ddd4e5791..bb1478a47d 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index 71d98be2c8..1d77295725 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index be646896fb..8881bef9ab 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 30ef01e8cd..658f0bf059 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index 1e8bd452f3..16641e8a53 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -8,6 +8,11 @@ "pid": "0x5658", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index 839bb063a8..688e0f7520 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index 8eaccb2643..a74e20eea6 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index 3d7110b306..421ceefab9 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -16,13 +16,6 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - /* define tapping term */ #define TAPPING_TERM 120 diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index 4ffa9576a5..f852ca2b52 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, -- cgit v1.2.3 From 20dca46924866851a42861529ede8247c35c52e4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 03:00:30 +1100 Subject: Remove pointless `USE_I2C` blocks in keyboard headers (#20084) --- keyboards/omkbd/ergodash/mini/mini.h | 8 -------- keyboards/omkbd/ergodash/rev1/rev1.h | 8 -------- 2 files changed, 16 deletions(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h index 4aca15775b..e56cfb17a6 100644 --- a/keyboards/omkbd/ergodash/mini/mini.h +++ b/keyboards/omkbd/ergodash/mini/mini.h @@ -4,14 +4,6 @@ #include "quantum.h" -#ifdef USE_I2C -#include -#ifdef __AVR__ - #include - #include -#endif -#endif - #ifndef FLIP_HALF // Standard Keymap // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h index 7f094534cc..206c0c9bb9 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.h +++ b/keyboards/omkbd/ergodash/rev1/rev1.h @@ -4,14 +4,6 @@ #include "quantum.h" -#ifdef USE_I2C -#include -#ifdef __AVR__ - #include - #include -#endif -#endif - #define XXX KC_NO #ifndef FLIP_HALF -- cgit v1.2.3 From 9e2ef5078a9eb532f492d7d9a15d35f9c1d48744 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 13 Mar 2023 22:22:20 +1100 Subject: Adjust offset for some layouts (#20075) --- keyboards/omkbd/ergodash/mini/info.json | 118 +++-- keyboards/omkbd/ergodash/rev1/info.json | 746 +++++++++++++++++--------------- 2 files changed, 497 insertions(+), 367 deletions(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 9a5910bc69..5d53117b14 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -1,28 +1,96 @@ { - "keyboard_name": "ErgoDash Mini", - "manufacturer": "Omkbd", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFEED", - "pid": "0x6060", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], - "rows": ["D7", "E6", "B4", "B5"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "B6", - "levels": 7 - }, - "split": { - "soft_serial_pin": "D0" - }, - "layouts": { - "LAYOUT": { - "layout": [{"label":"L00", "x":0, "y":1.375}, {"label":"L01", "x":1, "y":1.375}, {"label":"L02", "x":2, "y":1.125}, {"label":"L03", "x":3, "y":1}, {"label":"L04", "x":4, "y":1.125}, {"label":"L05", "x":5, "y":1.25}, {"label":"L06", "x":6, "y":1.75}, {"label":"R00", "x":11, "y":1.75}, {"label":"R01", "x":12, "y":1.25}, {"label":"R02", "x":13, "y":1.125}, {"label":"R03", "x":14, "y":1}, {"label":"R04", "x":15, "y":1.125}, {"label":"R05", "x":16, "y":1.375}, {"label":"R06", "x":17, "y":1.375}, {"label":"L10", "x":0, "y":2.375}, {"label":"L11", "x":1, "y":2.375}, {"label":"L12", "x":2, "y":2.125}, {"label":"L13", "x":3, "y":2}, {"label":"L14", "x":4, "y":2.125}, {"label":"L15", "x":5, "y":2.25}, {"label":"L16", "x":6, "y":2.75}, {"label":"R10", "x":11, "y":2.75}, {"label":"R11", "x":12, "y":2.25}, {"label":"R12", "x":13, "y":2.125}, {"label":"R13", "x":14, "y":2}, {"label":"R14", "x":15, "y":2.125}, {"label":"R15", "x":16, "y":2.375}, {"label":"R16", "x":17, "y":2.375}, {"label":"L20", "x":0, "y":3.375}, {"label":"L21", "x":1, "y":3.375}, {"label":"L22", "x":2, "y":3.125}, {"label":"L23", "x":3, "y":3}, {"label":"L24", "x":4, "y":3.125}, {"label":"L25", "x":5, "y":3.25}, {"label":"L26", "x":6.5, "y":4.25}, {"label":"R20", "x":10.5, "y":4.25}, {"label":"R21", "x":12, "y":3.25}, {"label":"R22", "x":13, "y":3.125}, {"label":"R23", "x":14, "y":3}, {"label":"R24", "x":15, "y":3.125}, {"label":"R25", "x":16, "y":3.375}, {"label":"R26", "x":17, "y":3.375}, {"label":"L30", "x":0, "y":4.375}, {"label":"L31", "x":1, "y":4.375}, {"label":"L32", "x":2, "y":4.125}, {"label":"L33", "x":3, "y":4}, {"label":"L34", "x":5.5, "y":5.25}, {"label":"L35", "x":6.5, "y":5.25}, {"label":"L36", "x":7.5, "y":4.25, "h":2}, {"label":"R30", "x":9.5, "y":4.25, "h":2}, {"label":"R31", "x":10.5, "y":5.25}, {"label":"R32", "x":11.5, "y":5.25}, {"label":"R33", "x":14, "y":4}, {"label":"R34", "x":15, "y":4.125}, {"label":"R35", "x":16, "y":4.375}, {"label":"R36", "x":17, "y":4.375}] + "keyboard_name": "ErgoDash Mini", + "manufacturer": "Omkbd", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "B6", + "levels": 7 + }, + "split": { + "soft_serial_pin": "D0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0.375}, + {"x":1, "y":0.375}, + {"x":2, "y":0.125}, + {"x":3, "y":0}, + {"x":4, "y":0.125}, + {"x":5, "y":0.25}, + {"x":6, "y":0.75}, + + {"x":11, "y":0.75}, + {"x":12, "y":0.25}, + {"x":13, "y":0.125}, + {"x":14, "y":0}, + {"x":15, "y":0.125}, + {"x":16, "y":0.375}, + {"x":17, "y":0.375}, + + {"x":0, "y":1.375}, + {"x":1, "y":1.375}, + {"x":2, "y":1.125}, + {"x":3, "y":1}, + {"x":4, "y":1.125}, + {"x":5, "y":1.25}, + {"x":6, "y":1.75}, + + {"x":11, "y":1.75}, + {"x":12, "y":1.25}, + {"x":13, "y":1.125}, + {"x":14, "y":1}, + {"x":15, "y":1.125}, + {"x":16, "y":1.375}, + {"x":17, "y":1.375}, + + {"x":0, "y":2.375}, + {"x":1, "y":2.375}, + {"x":2, "y":2.125}, + {"x":3, "y":2}, + {"x":4, "y":2.125}, + {"x":5, "y":2.25}, + + {"x":6.5, "y":3.25}, + + {"x":10.5, "y":3.25}, + + {"x":12, "y":2.25}, + {"x":13, "y":2.125}, + {"x":14, "y":2}, + {"x":15, "y":2.125}, + {"x":16, "y":2.375}, + {"x":17, "y":2.375}, + + {"x":0, "y":3.375}, + {"x":1, "y":3.375}, + {"x":2, "y":3.125}, + {"x":3, "y":3}, + + {"x":5.5, "y":4.25}, + {"x":6.5, "y":4.25}, + {"x":7.5, "y":3.25, "h":2}, + + {"x":9.5, "y":3.25, "h":2}, + {"x":10.5, "y":4.25}, + {"x":11.5, "y":4.25}, + + {"x":14, "y":3}, + {"x":15, "y":3.125}, + {"x":16, "y":3.375}, + {"x":17, "y":3.375} + ] + } } - } } diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index 35b6084d5a..a5f7e38b5b 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -23,360 +23,422 @@ "layouts": { "LAYOUT_4key": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 6.5, "label": "L36"}, - {"y": 4, "x": 12, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"y": 5, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, - {"h": 2, "y": 4, "x": 11, "label": "R40"}, - {"y": 5, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + {"x": 6, "y": 4}, + + {"x": 11.5, "y": 4}, + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 5}, + {"x": 7, "y": 4, "h": 2}, + + {"x": 10.5, "y": 4, "h": 2}, + {"x": 11.5, "y": 5}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_4key_2u_inner": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 7.5, "label": "L36"}, - {"y": 4, "x": 11, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"y": 5, "x": 7.5, "label": "L46"}, - {"y": 5, "x": 11, "label": "R40"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + + {"x": 7, "y": 4}, + + {"x": 10.5, "y": 4}, + + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 4, "h": 2}, + {"x": 7, "y": 5}, + + {"x": 10.5, "y": 5}, + {"x": 11.5, "y": 4, "h": 2}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_3key_2us": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, - {"h": 2, "y": 4, "x": 11, "label": "R40"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 4, "h": 2}, + {"x": 7, "y": 4, "h": 2}, + + {"x": 10.5, "y": 4, "h": 2}, + {"x": 11.5, "y": 4, "h": 2}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_3key_1us": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 6.5, "label": "L36"}, - {"y": 4, "x": 12, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"y": 5, "x": 6.5, "label": "L45"}, - {"y": 5, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + {"x": 6, "y": 4}, + + {"x": 11.5, "y": 4}, + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 5}, + + {"x": 11.5, "y": 5}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] }, "LAYOUT_2key": { "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.75}, + + {"x": 11.5, "y": 0.75}, + {"x": 12.5, "y": 0.25}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0}, + {"x": 15.5, "y": 0.125}, + {"x": 16.5, "y": 0.375}, + {"x": 17.5, "y": 0.375}, + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.75}, + + {"x": 11.5, "y": 1.75}, + {"x": 12.5, "y": 1.25}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1}, + {"x": 15.5, "y": 1.125}, + {"x": 16.5, "y": 1.375}, + {"x": 17.5, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.75}, + + {"x": 11.5, "y": 2.75}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2}, + {"x": 15.5, "y": 2.125}, + {"x": 16.5, "y": 2.375}, + {"x": 17.5, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + + {"x": 12.5, "y": 3.25}, + {"x": 13.5, "y": 3.125}, + {"x": 14.5, "y": 3}, + {"x": 15.5, "y": 3.125}, + {"x": 16.5, "y": 3.375}, + {"x": 17.5, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.125}, + {"x": 3, "y": 4}, + + {"x": 5, "y": 5}, + {"x": 6, "y": 4, "h": 2}, + + {"x": 11.5, "y": 4, "h": 2}, + {"x": 12.5, "y": 5}, + + {"x": 14.5, "y": 4}, + {"x": 15.5, "y": 4.125}, + {"x": 16.5, "y": 4.375}, + {"x": 17.5, "y": 4.375} + ] } } } -- cgit v1.2.3 From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 Mar 2023 20:18:33 +1100 Subject: Remove useless "ifdef KEYBOARD_*" (#20078) Co-authored-by: Nick Brassel --- keyboards/omkbd/ergodash/ergodash.c | 1 - keyboards/omkbd/ergodash/ergodash.h | 11 ------- keyboards/omkbd/ergodash/mini/mini.c | 2 +- keyboards/omkbd/ergodash/mini/mini.h | 2 -- keyboards/omkbd/ergodash/rev1/rev1.c | 2 +- keyboards/omkbd/ergodash/rev1/rev1.h | 2 -- keyboards/omkbd/runner3680/3x6/3x6.c | 1 - keyboards/omkbd/runner3680/3x6/3x6.h | 2 -- keyboards/omkbd/runner3680/3x7/3x7.c | 1 - keyboards/omkbd/runner3680/3x7/3x7.h | 2 -- keyboards/omkbd/runner3680/3x8/3x8.c | 1 - keyboards/omkbd/runner3680/3x8/3x8.h | 2 -- keyboards/omkbd/runner3680/4x6/4x6.c | 1 - keyboards/omkbd/runner3680/4x6/4x6.h | 2 -- keyboards/omkbd/runner3680/4x7/4x7.c | 1 - keyboards/omkbd/runner3680/4x7/4x7.h | 2 -- keyboards/omkbd/runner3680/4x8/4x8.c | 1 - keyboards/omkbd/runner3680/4x8/4x8.h | 2 -- keyboards/omkbd/runner3680/5x6/5x6.c | 1 - keyboards/omkbd/runner3680/5x6/5x6.h | 2 -- keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h | 2 -- keyboards/omkbd/runner3680/5x7/5x7.c | 1 - keyboards/omkbd/runner3680/5x7/5x7.h | 2 -- keyboards/omkbd/runner3680/5x8/5x8.c | 1 - keyboards/omkbd/runner3680/5x8/5x8.h | 2 -- keyboards/omkbd/runner3680/runner3680.c | 1 - keyboards/omkbd/runner3680/runner3680.h | 43 ---------------------------- 27 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 keyboards/omkbd/ergodash/ergodash.c delete mode 100644 keyboards/omkbd/ergodash/ergodash.h delete mode 100644 keyboards/omkbd/runner3680/3x6/3x6.c delete mode 100644 keyboards/omkbd/runner3680/3x7/3x7.c delete mode 100644 keyboards/omkbd/runner3680/3x8/3x8.c delete mode 100644 keyboards/omkbd/runner3680/4x6/4x6.c delete mode 100644 keyboards/omkbd/runner3680/4x7/4x7.c delete mode 100644 keyboards/omkbd/runner3680/4x8/4x8.c delete mode 100644 keyboards/omkbd/runner3680/5x6/5x6.c delete mode 100644 keyboards/omkbd/runner3680/5x7/5x7.c delete mode 100644 keyboards/omkbd/runner3680/5x8/5x8.c delete mode 100644 keyboards/omkbd/runner3680/runner3680.c delete mode 100644 keyboards/omkbd/runner3680/runner3680.h (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/ergodash.c b/keyboards/omkbd/ergodash/ergodash.c deleted file mode 100644 index 51e6dbf08f..0000000000 --- a/keyboards/omkbd/ergodash/ergodash.c +++ /dev/null @@ -1 +0,0 @@ -#include "ergodash.h" diff --git a/keyboards/omkbd/ergodash/ergodash.h b/keyboards/omkbd/ergodash/ergodash.h deleted file mode 100644 index 8c8bd3cdc3..0000000000 --- a/keyboards/omkbd/ergodash/ergodash.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_omkbd_ergodash_rev1 - #include "rev1.h" -#endif // #ifdef KEYBOARD_ergodash_rev1 - -#ifdef KEYBOARD_omkbd_ergodash_mini - #include "mini.h" -#endif diff --git a/keyboards/omkbd/ergodash/mini/mini.c b/keyboards/omkbd/ergodash/mini/mini.c index 3aa9e74cce..e4a1c429f8 100644 --- a/keyboards/omkbd/ergodash/mini/mini.c +++ b/keyboards/omkbd/ergodash/mini/mini.c @@ -1,4 +1,4 @@ -#include "ergodash.h" +#include "mini.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h index e56cfb17a6..be69cce49b 100644 --- a/keyboards/omkbd/ergodash/mini/mini.h +++ b/keyboards/omkbd/ergodash/mini/mini.h @@ -1,7 +1,5 @@ #pragma once -#include "ergodash.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c index 00f81cae11..eb794f9ac7 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.c +++ b/keyboards/omkbd/ergodash/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "ergodash.h" +#include "rev1.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h index 206c0c9bb9..4a1ee020e7 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.h +++ b/keyboards/omkbd/ergodash/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "ergodash.h" - #include "quantum.h" #define XXX KC_NO diff --git a/keyboards/omkbd/runner3680/3x6/3x6.c b/keyboards/omkbd/runner3680/3x6/3x6.c deleted file mode 100644 index 1f375c3ecb..0000000000 --- a/keyboards/omkbd/runner3680/3x6/3x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "3x6.h" diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h index c197c6de2c..3d9fd779d8 100644 --- a/keyboards/omkbd/runner3680/3x6/3x6.h +++ b/keyboards/omkbd/runner3680/3x6/3x6.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/3x7/3x7.c b/keyboards/omkbd/runner3680/3x7/3x7.c deleted file mode 100644 index 5246953b58..0000000000 --- a/keyboards/omkbd/runner3680/3x7/3x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "3x7.h" diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h index 2e07bc3b35..db11b19c52 100644 --- a/keyboards/omkbd/runner3680/3x7/3x7.h +++ b/keyboards/omkbd/runner3680/3x7/3x7.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/3x8/3x8.c b/keyboards/omkbd/runner3680/3x8/3x8.c deleted file mode 100644 index 8ea77001c5..0000000000 --- a/keyboards/omkbd/runner3680/3x8/3x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "3x8.h" diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h index c5856d0034..cd3b81d973 100644 --- a/keyboards/omkbd/runner3680/3x8/3x8.h +++ b/keyboards/omkbd/runner3680/3x8/3x8.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/4x6/4x6.c b/keyboards/omkbd/runner3680/4x6/4x6.c deleted file mode 100644 index 5e68c1a9fa..0000000000 --- a/keyboards/omkbd/runner3680/4x6/4x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x6.h" diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h index dfc3a977b7..26bcca6de5 100644 --- a/keyboards/omkbd/runner3680/4x6/4x6.h +++ b/keyboards/omkbd/runner3680/4x6/4x6.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/4x7/4x7.c b/keyboards/omkbd/runner3680/4x7/4x7.c deleted file mode 100644 index 568fc2dacd..0000000000 --- a/keyboards/omkbd/runner3680/4x7/4x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x7.h" diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h index 7bd43e1114..50fbe3a5ce 100644 --- a/keyboards/omkbd/runner3680/4x7/4x7.h +++ b/keyboards/omkbd/runner3680/4x7/4x7.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/4x8/4x8.c b/keyboards/omkbd/runner3680/4x8/4x8.c deleted file mode 100644 index 2667548078..0000000000 --- a/keyboards/omkbd/runner3680/4x8/4x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x8.h" diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h index bc95b439b0..08fed12164 100644 --- a/keyboards/omkbd/runner3680/4x8/4x8.h +++ b/keyboards/omkbd/runner3680/4x8/4x8.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x6/5x6.c b/keyboards/omkbd/runner3680/5x6/5x6.c deleted file mode 100644 index 0e9d5481c4..0000000000 --- a/keyboards/omkbd/runner3680/5x6/5x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6.h" diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h index 5a6e70c209..8047894606 100644 --- a/keyboards/omkbd/runner3680/5x6/5x6.h +++ b/keyboards/omkbd/runner3680/5x6/5x6.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h index afceac0a89..756f90db4b 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h @@ -16,8 +16,6 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x7/5x7.c b/keyboards/omkbd/runner3680/5x7/5x7.c deleted file mode 100644 index aae28e450c..0000000000 --- a/keyboards/omkbd/runner3680/5x7/5x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x7.h" diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h index 451ecf6cd4..1fe3397c97 100644 --- a/keyboards/omkbd/runner3680/5x7/5x7.h +++ b/keyboards/omkbd/runner3680/5x7/5x7.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x8/5x8.c b/keyboards/omkbd/runner3680/5x8/5x8.c deleted file mode 100644 index 3958702572..0000000000 --- a/keyboards/omkbd/runner3680/5x8/5x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x8.h" diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h index de53a0eb29..b21b14259d 100644 --- a/keyboards/omkbd/runner3680/5x8/5x8.h +++ b/keyboards/omkbd/runner3680/5x8/5x8.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/runner3680.c b/keyboards/omkbd/runner3680/runner3680.c deleted file mode 100644 index 7d8362363b..0000000000 --- a/keyboards/omkbd/runner3680/runner3680.c +++ /dev/null @@ -1 +0,0 @@ -#include "runner3680.h" diff --git a/keyboards/omkbd/runner3680/runner3680.h b/keyboards/omkbd/runner3680/runner3680.h deleted file mode 100644 index 59afecfcfa..0000000000 --- a/keyboards/omkbd/runner3680/runner3680.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_omkbd_runner3680_5x8 - #include "5x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_5x7 - #include "5x7.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_5x6 - #include "5x6.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_5x6_5x8 - #include "5x6_5x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_4x8 - #include "4x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_4x7 - #include "4x7.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_4x6 - #include "4x6.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_3x8 - #include "3x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_3x7 - #include "3x7.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_3x6 - #include "3x6.h" -#endif -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/omkbd/ergodash/mini/config.h | 1 - keyboards/omkbd/ergodash/mini/info.json | 3 +++ keyboards/omkbd/ergodash/rev1/config.h | 1 - keyboards/omkbd/ergodash/rev1/info.json | 3 +++ keyboards/omkbd/runner3680/3x6/config.h | 1 - keyboards/omkbd/runner3680/3x6/info.json | 3 +++ keyboards/omkbd/runner3680/3x7/config.h | 1 - keyboards/omkbd/runner3680/3x7/info.json | 3 +++ keyboards/omkbd/runner3680/3x8/config.h | 1 - keyboards/omkbd/runner3680/3x8/info.json | 3 +++ keyboards/omkbd/runner3680/4x6/config.h | 1 - keyboards/omkbd/runner3680/4x6/info.json | 3 +++ keyboards/omkbd/runner3680/4x7/config.h | 1 - keyboards/omkbd/runner3680/4x7/info.json | 3 +++ keyboards/omkbd/runner3680/4x8/config.h | 1 - keyboards/omkbd/runner3680/4x8/info.json | 3 +++ keyboards/omkbd/runner3680/5x6/config.h | 1 - keyboards/omkbd/runner3680/5x6/info.json | 3 +++ keyboards/omkbd/runner3680/5x6_5x8/config.h | 1 - keyboards/omkbd/runner3680/5x6_5x8/info.json | 3 +++ keyboards/omkbd/runner3680/5x7/config.h | 1 - keyboards/omkbd/runner3680/5x7/info.json | 3 +++ keyboards/omkbd/runner3680/5x8/config.h | 1 - keyboards/omkbd/runner3680/5x8/info.json | 3 +++ 24 files changed, 36 insertions(+), 12 deletions(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index c5772b4124..c66f9ef044 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 5d53117b14..8020aec580 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -20,6 +20,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 2f3532bbb4..03eea39fd6 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index a5f7e38b5b..8e357b326b 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -20,6 +20,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT_4key": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index fefd4840a8..b54416a389 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index ebd7e4d2c2..4cd318a2ef 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index 9fa7ef6ecb..c70baa156f 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index c55fb295a7..aec7fbcbef 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index 1640c1ae10..41740c62e4 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index c04f891b76..ccf59c180b 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index 1640c1ae10..41740c62e4 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index f4edd551ba..f2433c99b6 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index 85cc2719f7..03b4919378 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index df40623eb3..17af0b601e 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index aa4a29d56d..d3f8800e34 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index bb1478a47d..f8fb9fa02c 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index 1d77295725..8dbc8175aa 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index 8881bef9ab..dc9aa6f7f9 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 658f0bf059..6c1d08fe32 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index 16641e8a53..605bef904a 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index 688e0f7520..f7457e18b4 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index a74e20eea6..c7cc414c5d 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index 421ceefab9..193767245e 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index f852ca2b52..5b4f3ad5cd 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3 From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/omkbd/runner3680/5x6_5x8/info.json | 3 +++ keyboards/omkbd/runner3680/5x6_5x8/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index 605bef904a..fa4f30bd7e 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -8,6 +8,9 @@ "pid": "0x5658", "device_version": "0.0.5" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk index 32afd21635..e69de29bb2 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk +++ b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_DRIVER = WS2812 -- cgit v1.2.3 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/omkbd/runner3680/3x6/3x6.h | 17 --- keyboards/omkbd/runner3680/3x6/info.json | 77 +++++++------ keyboards/omkbd/runner3680/3x7/3x7.h | 17 --- keyboards/omkbd/runner3680/3x7/info.json | 87 +++++++------- keyboards/omkbd/runner3680/3x8/3x8.h | 17 --- keyboards/omkbd/runner3680/3x8/info.json | 99 ++++++++-------- keyboards/omkbd/runner3680/4x6/4x6.h | 20 ---- keyboards/omkbd/runner3680/4x6/info.json | 100 ++++++++-------- keyboards/omkbd/runner3680/4x7/4x7.h | 20 ---- keyboards/omkbd/runner3680/4x7/info.json | 116 ++++++++++--------- keyboards/omkbd/runner3680/4x8/4x8.h | 20 ---- keyboards/omkbd/runner3680/4x8/info.json | 132 ++++++++++----------- keyboards/omkbd/runner3680/5x6/5x6.h | 23 ---- keyboards/omkbd/runner3680/5x6/info.json | 125 ++++++++++---------- keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c | 2 +- keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h | 39 ------- keyboards/omkbd/runner3680/5x6_5x8/info.json | 145 +++++++++++------------ keyboards/omkbd/runner3680/5x7/5x7.h | 23 ---- keyboards/omkbd/runner3680/5x7/info.json | 145 +++++++++++------------ keyboards/omkbd/runner3680/5x8/5x8.h | 23 ---- keyboards/omkbd/runner3680/5x8/info.json | 165 ++++++++++++++------------- 21 files changed, 617 insertions(+), 795 deletions(-) delete mode 100644 keyboards/omkbd/runner3680/3x6/3x6.h delete mode 100644 keyboards/omkbd/runner3680/3x7/3x7.h delete mode 100644 keyboards/omkbd/runner3680/3x8/3x8.h delete mode 100644 keyboards/omkbd/runner3680/4x6/4x6.h delete mode 100644 keyboards/omkbd/runner3680/4x7/4x7.h delete mode 100644 keyboards/omkbd/runner3680/4x8/4x8.h delete mode 100644 keyboards/omkbd/runner3680/5x6/5x6.h delete mode 100644 keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h delete mode 100644 keyboards/omkbd/runner3680/5x7/5x7.h delete mode 100644 keyboards/omkbd/runner3680/5x8/5x8.h (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h deleted file mode 100644 index 3d9fd779d8..0000000000 --- a/keyboards/omkbd/runner3680/3x6/3x6.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index 4cd318a2ef..9cb57ec106 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -19,47 +19,50 @@ "ws2812": { "pin": "D3" }, - "layouts": { + "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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}, - {"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":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [3, 5], "x": 7, "y": 0}, + {"matrix": [3, 4], "x": 8, "y": 0}, + {"matrix": [3, 3], "x": 9, "y": 0}, + {"matrix": [3, 2], "x": 10, "y": 0}, + {"matrix": [3, 1], "x": 11, "y": 0}, + {"matrix": [3, 0], "x": 12, "y": 0}, - {"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":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2} + {"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": [4, 5], "x": 7, "y": 1}, + {"matrix": [4, 4], "x": 8, "y": 1}, + {"matrix": [4, 3], "x": 9, "y": 1}, + {"matrix": [4, 2], "x": 10, "y": 1}, + {"matrix": [4, 1], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [5, 3], "x": 9, "y": 2}, + {"matrix": [5, 2], "x": 10, "y": 2}, + {"matrix": [5, 1], "x": 11, "y": 2}, + {"matrix": [5, 0], "x": 12, "y": 2} ] } } diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h deleted file mode 100644 index db11b19c52..0000000000 --- a/keyboards/omkbd/runner3680/3x7/3x7.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - 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 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index aec7fbcbef..a3cde77a45 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -22,50 +22,53 @@ "layouts": { "LAYOUT": { "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":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}, + {"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}, - {"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":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [3, 6], "x": 8, "y": 0}, + {"matrix": [3, 5], "x": 9, "y": 0}, + {"matrix": [3, 4], "x": 10, "y": 0}, + {"matrix": [3, 3], "x": 11, "y": 0}, + {"matrix": [3, 2], "x": 12, "y": 0}, + {"matrix": [3, 1], "x": 13, "y": 0}, + {"matrix": [3, 0], "x": 14, "y": 0}, - {"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":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2} + {"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": [4, 6], "x": 8, "y": 1}, + {"matrix": [4, 5], "x": 9, "y": 1}, + {"matrix": [4, 4], "x": 10, "y": 1}, + {"matrix": [4, 3], "x": 11, "y": 1}, + {"matrix": [4, 2], "x": 12, "y": 1}, + {"matrix": [4, 1], "x": 13, "y": 1}, + {"matrix": [4, 0], "x": 14, "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": [5, 6], "x": 8, "y": 2}, + {"matrix": [5, 5], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 3], "x": 11, "y": 2}, + {"matrix": [5, 2], "x": 12, "y": 2}, + {"matrix": [5, 1], "x": 13, "y": 2}, + {"matrix": [5, 0], "x": 14, "y": 2} ] } } diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h deleted file mode 100644 index cd3b81d973..0000000000 --- a/keyboards/omkbd/runner3680/3x8/3x8.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index ccf59c180b..4c816a400c 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -22,56 +22,59 @@ "layouts": { "LAYOUT": { "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":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": [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": [0, 7], "x": 7, "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":7, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [3, 7], "x": 9, "y": 0}, + {"matrix": [3, 6], "x": 10, "y": 0}, + {"matrix": [3, 5], "x": 11, "y": 0}, + {"matrix": [3, 4], "x": 12, "y": 0}, + {"matrix": [3, 3], "x": 13, "y": 0}, + {"matrix": [3, 2], "x": 14, "y": 0}, + {"matrix": [3, 1], "x": 15, "y": 0}, + {"matrix": [3, 0], "x": 16, "y": 0}, - {"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":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2} + {"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": [1, 7], "x": 7, "y": 1}, + + {"matrix": [4, 7], "x": 9, "y": 1}, + {"matrix": [4, 6], "x": 10, "y": 1}, + {"matrix": [4, 5], "x": 11, "y": 1}, + {"matrix": [4, 4], "x": 12, "y": 1}, + {"matrix": [4, 3], "x": 13, "y": 1}, + {"matrix": [4, 2], "x": 14, "y": 1}, + {"matrix": [4, 1], "x": 15, "y": 1}, + {"matrix": [4, 0], "x": 16, "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": [2, 7], "x": 7, "y": 2}, + + {"matrix": [5, 7], "x": 9, "y": 2}, + {"matrix": [5, 6], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [5, 4], "x": 12, "y": 2}, + {"matrix": [5, 3], "x": 13, "y": 2}, + {"matrix": [5, 2], "x": 14, "y": 2}, + {"matrix": [5, 1], "x": 15, "y": 2}, + {"matrix": [5, 0], "x": 16, "y": 2} ] } } diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h deleted file mode 100644 index 26bcca6de5..0000000000 --- a/keyboards/omkbd/runner3680/4x6/4x6.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index f2433c99b6..05785c52dd 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -22,57 +22,61 @@ "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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}, - {"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":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [4, 5], "x": 7, "y": 0}, + {"matrix": [4, 4], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 12, "y": 0}, - {"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":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"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}, - {"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":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3} + {"matrix": [5, 5], "x": 7, "y": 1}, + {"matrix": [5, 4], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2}, + {"matrix": [6, 4], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3}, + {"matrix": [7, 4], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 12, "y": 3} ] } } diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h deleted file mode 100644 index 50fbe3a5ce..0000000000 --- a/keyboards/omkbd/runner3680/4x7/4x7.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - 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 \ - ) \ - { \ - { 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 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index 17af0b601e..548cb8752f 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -22,65 +22,69 @@ "layouts": { "LAYOUT": { "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":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}, + {"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}, - {"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":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [4, 6], "x": 8, "y": 0}, + {"matrix": [4, 5], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 1], "x": 13, "y": 0}, + {"matrix": [4, 0], "x": 14, "y": 0}, - {"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":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"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}, - {"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":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} + {"matrix": [5, 6], "x": 8, "y": 1}, + {"matrix": [5, 5], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 1], "x": 13, "y": 1}, + {"matrix": [5, 0], "x": 14, "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": [6, 6], "x": 8, "y": 2}, + {"matrix": [6, 5], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 1], "x": 13, "y": 2}, + {"matrix": [6, 0], "x": 14, "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": [7, 6], "x": 8, "y": 3}, + {"matrix": [7, 5], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 3], "x": 11, "y": 3}, + {"matrix": [7, 2], "x": 12, "y": 3}, + {"matrix": [7, 1], "x": 13, "y": 3}, + {"matrix": [7, 0], "x": 14, "y": 3} ] } } diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h deleted file mode 100644 index 08fed12164..0000000000 --- a/keyboards/omkbd/runner3680/4x8/4x8.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index f8fb9fa02c..e492360e6a 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -22,73 +22,77 @@ "layouts": { "LAYOUT": { "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":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": [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": [0, 7], "x": 7, "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":7, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [4, 7], "x": 9, "y": 0}, + {"matrix": [4, 6], "x": 10, "y": 0}, + {"matrix": [4, 5], "x": 11, "y": 0}, + {"matrix": [4, 4], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0}, + {"matrix": [4, 2], "x": 14, "y": 0}, + {"matrix": [4, 1], "x": 15, "y": 0}, + {"matrix": [4, 0], "x": 16, "y": 0}, - {"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":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, + {"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": [1, 7], "x": 7, "y": 1}, - {"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":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": [5, 7], "x": 9, "y": 1}, + {"matrix": [5, 6], "x": 10, "y": 1}, + {"matrix": [5, 5], "x": 11, "y": 1}, + {"matrix": [5, 4], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1}, + {"matrix": [5, 2], "x": 14, "y": 1}, + {"matrix": [5, 1], "x": 15, "y": 1}, + {"matrix": [5, 0], "x": 16, "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": [2, 7], "x": 7, "y": 2}, + + {"matrix": [6, 7], "x": 9, "y": 2}, + {"matrix": [6, 6], "x": 10, "y": 2}, + {"matrix": [6, 5], "x": 11, "y": 2}, + {"matrix": [6, 4], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2}, + {"matrix": [6, 2], "x": 14, "y": 2}, + {"matrix": [6, 1], "x": 15, "y": 2}, + {"matrix": [6, 0], "x": 16, "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": [3, 7], "x": 7, "y": 3}, + + {"matrix": [7, 7], "x": 9, "y": 3}, + {"matrix": [7, 6], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [7, 4], "x": 12, "y": 3}, + {"matrix": [7, 3], "x": 13, "y": 3}, + {"matrix": [7, 2], "x": 14, "y": 3}, + {"matrix": [7, 1], "x": 15, "y": 3}, + {"matrix": [7, 0], "x": 16, "y": 3} ] } } diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h deleted file mode 100644 index 8047894606..0000000000 --- a/keyboards/omkbd/runner3680/5x6/5x6.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index dc9aa6f7f9..2ed37dd414 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -22,70 +22,75 @@ "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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}, - {"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":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [5, 5], "x": 7, "y": 0}, + {"matrix": [5, 4], "x": 8, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 0], "x": 12, "y": 0}, - {"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":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"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}, - {"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":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, + {"matrix": [6, 5], "x": 7, "y": 1}, + {"matrix": [6, 4], "x": 8, "y": 1}, + {"matrix": [6, 3], "x": 9, "y": 1}, + {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 0], "x": 12, "y": 1}, - {"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":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4} + {"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": [7, 5], "x": 7, "y": 2}, + {"matrix": [7, 4], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2}, + {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3}, + {"matrix": [8, 4], "x": 8, "y": 3}, + {"matrix": [8, 3], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 1], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 12, "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": [9, 5], "x": 7, "y": 4}, + {"matrix": [9, 4], "x": 8, "y": 4}, + {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 0], "x": 12, "y": 4} ] } } diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c index 62597d0060..3fda310364 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c +++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "5x6_5x8.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h deleted file mode 100644 index 756f90db4b..0000000000 --- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 omkbd - * - * 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" - -#define LAYOUT( \ - L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \ - ) \ - { \ - { KC_NO, KC_NO, L02, L03, L04, L05, L06, L07 }, \ - { KC_NO, KC_NO, L12, L13, L14, L15, L16, L17 }, \ - { KC_NO, KC_NO, L22, L23, L24, L25, L26, L27 }, \ - { KC_NO, KC_NO, L32, L33, L34, L35, L36, L37 }, \ - { KC_NO, KC_NO, L42, L43, L44, L45, L46, L47 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { R47, R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index fa4f30bd7e..b597d80a12 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -25,80 +25,85 @@ "layouts": { "LAYOUT": { "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":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}, + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 5], "x": 3, "y": 0}, + {"matrix": [0, 6], "x": 4, "y": 0}, + {"matrix": [0, 7], "x": 5, "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":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 6], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, - {"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":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"matrix": [1, 2], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 5], "x": 3, "y": 1}, + {"matrix": [1, 6], "x": 4, "y": 1}, + {"matrix": [1, 7], "x": 5, "y": 1}, - {"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":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}, + {"matrix": [6, 7], "x": 7, "y": 1}, + {"matrix": [6, 6], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, - {"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":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} + {"matrix": [2, 2], "x": 0, "y": 2}, + {"matrix": [2, 3], "x": 1, "y": 2}, + {"matrix": [2, 4], "x": 2, "y": 2}, + {"matrix": [2, 5], "x": 3, "y": 2}, + {"matrix": [2, 6], "x": 4, "y": 2}, + {"matrix": [2, 7], "x": 5, "y": 2}, + + {"matrix": [7, 7], "x": 7, "y": 2}, + {"matrix": [7, 6], "x": 8, "y": 2}, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 2], "x": 0, "y": 3}, + {"matrix": [3, 3], "x": 1, "y": 3}, + {"matrix": [3, 4], "x": 2, "y": 3}, + {"matrix": [3, 5], "x": 3, "y": 3}, + {"matrix": [3, 6], "x": 4, "y": 3}, + {"matrix": [3, 7], "x": 5, "y": 3}, + + {"matrix": [8, 7], "x": 7, "y": 3}, + {"matrix": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 2], "x": 0, "y": 4}, + {"matrix": [4, 3], "x": 1, "y": 4}, + {"matrix": [4, 4], "x": 2, "y": 4}, + {"matrix": [4, 5], "x": 3, "y": 4}, + {"matrix": [4, 6], "x": 4, "y": 4}, + {"matrix": [4, 7], "x": 5, "y": 4}, + + {"matrix": [9, 7], "x": 7, "y": 4}, + {"matrix": [9, 6], "x": 8, "y": 4}, + {"matrix": [9, 5], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h deleted file mode 100644 index 1fe3397c97..0000000000 --- a/keyboards/omkbd/runner3680/5x7/5x7.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - 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 \ - ) \ - { \ - { 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 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index c7cc414c5d..e9460d7d18 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -22,80 +22,85 @@ "layouts": { "LAYOUT": { "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":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}, + {"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}, - {"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":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [5, 6], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, - {"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":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"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}, - {"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":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}, + {"matrix": [6, 6], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, - {"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":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} + {"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": [7, 6], "x": 8, "y": 2}, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "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": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "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": [9, 6], "x": 8, "y": 4}, + {"matrix": [9, 5], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h deleted file mode 100644 index b21b14259d..0000000000 --- a/keyboards/omkbd/runner3680/5x8/5x8.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { R47, R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index 5b4f3ad5cd..e851ec39b4 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -22,90 +22,95 @@ "layouts": { "LAYOUT": { "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":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": [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": [0, 7], "x": 7, "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":7, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [5, 7], "x": 9, "y": 0}, + {"matrix": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, - {"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":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, + {"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": [1, 7], "x": 7, "y": 1}, - {"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":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": [6, 7], "x": 9, "y": 1}, + {"matrix": [6, 6], "x": 10, "y": 1}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, - {"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":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": [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": [2, 7], "x": 7, "y": 2}, + + {"matrix": [7, 7], "x": 9, "y": 2}, + {"matrix": [7, 6], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "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": [3, 7], "x": 7, "y": 3}, + + {"matrix": [8, 7], "x": 9, "y": 3}, + {"matrix": [8, 6], "x": 10, "y": 3}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "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": [4, 7], "x": 7, "y": 4}, + + {"matrix": [9, 7], "x": 9, "y": 4}, + {"matrix": [9, 6], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [9, 4], "x": 12, "y": 4}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} ] } } -- cgit v1.2.3 From 998a4d744e60d7d769ddabad1bc8653314f02b02 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 30 Apr 2023 01:51:45 +1000 Subject: Remove `FLIP_HALF` layouts and move to data driven (#20588) --- keyboards/omkbd/ergodash/mini/info.json | 116 +++-- keyboards/omkbd/ergodash/mini/mini.c | 2 +- keyboards/omkbd/ergodash/mini/mini.h | 41 -- keyboards/omkbd/ergodash/rev1/info.json | 789 ++++++++++++++++---------------- keyboards/omkbd/ergodash/rev1/rev1.c | 2 +- keyboards/omkbd/ergodash/rev1/rev1.h | 129 ------ 6 files changed, 448 insertions(+), 631 deletions(-) delete mode 100644 keyboards/omkbd/ergodash/mini/mini.h delete mode 100644 keyboards/omkbd/ergodash/rev1/rev1.h (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 8020aec580..0c62ef58fd 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -26,73 +26,69 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":6, "y":0.75}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.75}, - {"x":11, "y":0.75}, - {"x":12, "y":0.25}, - {"x":13, "y":0.125}, - {"x":14, "y":0}, - {"x":15, "y":0.125}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, + {"matrix": [4, 6], "x": 11, "y": 0.75}, + {"matrix": [4, 5], "x": 12, "y": 0.25}, + {"matrix": [4, 4], "x": 13, "y": 0.125}, + {"matrix": [4, 3], "x": 14, "y": 0}, + {"matrix": [4, 2], "x": 15, "y": 0.125}, + {"matrix": [4, 1], "x": 16, "y": 0.375}, + {"matrix": [4, 0], "x": 17, "y": 0.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":6, "y":1.75}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.75}, - {"x":11, "y":1.75}, - {"x":12, "y":1.25}, - {"x":13, "y":1.125}, - {"x":14, "y":1}, - {"x":15, "y":1.125}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, + {"matrix": [5, 6], "x": 11, "y": 1.75}, + {"matrix": [5, 5], "x": 12, "y": 1.25}, + {"matrix": [5, 4], "x": 13, "y": 1.125}, + {"matrix": [5, 3], "x": 14, "y": 1}, + {"matrix": [5, 2], "x": 15, "y": 1.125}, + {"matrix": [5, 1], "x": 16, "y": 1.375}, + {"matrix": [5, 0], "x": 17, "y": 1.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 3.25}, - {"x":6.5, "y":3.25}, + {"matrix": [6, 6], "x": 10.5, "y": 3.25}, + {"matrix": [6, 5], "x": 12, "y": 2.25}, + {"matrix": [6, 4], "x": 13, "y": 2.125}, + {"matrix": [6, 3], "x": 14, "y": 2}, + {"matrix": [6, 2], "x": 15, "y": 2.125}, + {"matrix": [6, 1], "x": 16, "y": 2.375}, + {"matrix": [6, 0], "x": 17, "y": 2.375}, - {"x":10.5, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 4.25}, + {"matrix": [3, 5], "x": 6.5, "y": 4.25}, + {"matrix": [3, 6], "x": 7.5, "y": 3.25, "h": 2}, - {"x":12, "y":2.25}, - {"x":13, "y":2.125}, - {"x":14, "y":2}, - {"x":15, "y":2.125}, - {"x":16, "y":2.375}, - {"x":17, "y":2.375}, - - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - - {"x":5.5, "y":4.25}, - {"x":6.5, "y":4.25}, - {"x":7.5, "y":3.25, "h":2}, - - {"x":9.5, "y":3.25, "h":2}, - {"x":10.5, "y":4.25}, - {"x":11.5, "y":4.25}, - - {"x":14, "y":3}, - {"x":15, "y":3.125}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375} + {"matrix": [7, 6], "x": 9.5, "y": 3.25, "h": 2}, + {"matrix": [7, 5], "x": 10.5, "y": 4.25}, + {"matrix": [7, 4], "x": 11.5, "y": 4.25}, + {"matrix": [7, 3], "x": 14, "y": 3}, + {"matrix": [7, 2], "x": 15, "y": 3.125}, + {"matrix": [7, 1], "x": 16, "y": 3.375}, + {"matrix": [7, 0], "x": 17, "y": 3.375} ] } } diff --git a/keyboards/omkbd/ergodash/mini/mini.c b/keyboards/omkbd/ergodash/mini/mini.c index e4a1c429f8..8fc54d7b5b 100644 --- a/keyboards/omkbd/ergodash/mini/mini.c +++ b/keyboards/omkbd/ergodash/mini/mini.c @@ -1,4 +1,4 @@ -#include "mini.h" +#include "quantum.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h deleted file mode 100644 index be69cce49b..0000000000 --- a/keyboards/omkbd/ergodash/mini/mini.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifndef FLIP_HALF -// Standard Keymap -// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -# define LAYOUT( \ - 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 \ -) { \ - { 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 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 } \ -} -#else -// Keymap with right side flipped -// (TRRS jack on both halves are to the right) -# define LAYOUT( \ - 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 \ -) { \ - { 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 }, \ - { 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 } \ -} -#endif diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index 8e357b326b..1ec059bd82 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -23,424 +23,415 @@ "ws2812": { "pin": "D3" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_4key" + }, "layouts": { "LAYOUT_4key": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.125}, - {"x": 5, "y": 0.25}, - {"x": 6, "y": 0.75}, - - {"x": 11.5, "y": 0.75}, - {"x": 12.5, "y": 0.25}, - {"x": 13.5, "y": 0.125}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0.125}, - {"x": 16.5, "y": 0.375}, - {"x": 17.5, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.125}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.75}, - - {"x": 11.5, "y": 1.75}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.125}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1.125}, - {"x": 16.5, "y": 1.375}, - {"x": 17.5, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.125}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.75}, - - {"x": 11.5, "y": 2.75}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.125}, - {"x": 14.5, "y": 2}, - {"x": 15.5, "y": 2.125}, - {"x": 16.5, "y": 2.375}, - {"x": 17.5, "y": 2.375}, - - {"x": 0, "y": 3.375}, - {"x": 1, "y": 3.375}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.125}, - {"x": 5, "y": 3.25}, - {"x": 6, "y": 4}, - - {"x": 11.5, "y": 4}, - {"x": 12.5, "y": 3.25}, - {"x": 13.5, "y": 3.125}, - {"x": 14.5, "y": 3}, - {"x": 15.5, "y": 3.125}, - {"x": 16.5, "y": 3.375}, - {"x": 17.5, "y": 3.375}, - - {"x": 0, "y": 4.375}, - {"x": 1, "y": 4.375}, - {"x": 2, "y": 4.125}, - {"x": 3, "y": 4}, - - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, - {"x": 7, "y": 4, "h": 2}, - - {"x": 10.5, "y": 4, "h": 2}, - {"x": 11.5, "y": 5}, - {"x": 12.5, "y": 5}, - - {"x": 14.5, "y": 4}, - {"x": 15.5, "y": 4.125}, - {"x": 16.5, "y": 4.375}, - {"x": 17.5, "y": 4.375} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.75}, + + {"matrix": [5, 6], "x": 11.5, "y": 0.75}, + {"matrix": [5, 5], "x": 12.5, "y": 0.25}, + {"matrix": [5, 4], "x": 13.5, "y": 0.125}, + {"matrix": [5, 3], "x": 14.5, "y": 0}, + {"matrix": [5, 2], "x": 15.5, "y": 0.125}, + {"matrix": [5, 1], "x": 16.5, "y": 0.375}, + {"matrix": [5, 0], "x": 17.5, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.75}, + + {"matrix": [6, 6], "x": 11.5, "y": 1.75}, + {"matrix": [6, 5], "x": 12.5, "y": 1.25}, + {"matrix": [6, 4], "x": 13.5, "y": 1.125}, + {"matrix": [6, 3], "x": 14.5, "y": 1}, + {"matrix": [6, 2], "x": 15.5, "y": 1.125}, + {"matrix": [6, 1], "x": 16.5, "y": 1.375}, + {"matrix": [6, 0], "x": 17.5, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.75}, + + {"matrix": [7, 6], "x": 11.5, "y": 2.75}, + {"matrix": [7, 5], "x": 12.5, "y": 2.25}, + {"matrix": [7, 4], "x": 13.5, "y": 2.125}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 2], "x": 15.5, "y": 2.125}, + {"matrix": [7, 1], "x": 16.5, "y": 2.375}, + {"matrix": [7, 0], "x": 17.5, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 4}, + + {"matrix": [8, 6], "x": 11.5, "y": 4}, + {"matrix": [8, 5], "x": 12.5, "y": 3.25}, + {"matrix": [8, 4], "x": 13.5, "y": 3.125}, + {"matrix": [8, 3], "x": 14.5, "y": 3}, + {"matrix": [8, 2], "x": 15.5, "y": 3.125}, + {"matrix": [8, 1], "x": 16.5, "y": 3.375}, + {"matrix": [8, 0], "x": 17.5, "y": 3.375}, + + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2, "y": 4.125}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 6], "x": 7, "y": 4, "h": 2}, + + {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2}, + {"matrix": [9, 5], "x": 11.5, "y": 5}, + {"matrix": [9, 4], "x": 12.5, "y": 5}, + {"matrix": [9, 3], "x": 14.5, "y": 4}, + {"matrix": [9, 2], "x": 15.5, "y": 4.125}, + {"matrix": [9, 1], "x": 16.5, "y": 4.375}, + {"matrix": [9, 0], "x": 17.5, "y": 4.375} ] }, "LAYOUT_4key_2u_inner": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.125}, - {"x": 5, "y": 0.25}, - {"x": 6, "y": 0.75}, - - {"x": 11.5, "y": 0.75}, - {"x": 12.5, "y": 0.25}, - {"x": 13.5, "y": 0.125}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0.125}, - {"x": 16.5, "y": 0.375}, - {"x": 17.5, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.125}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.75}, - - {"x": 11.5, "y": 1.75}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.125}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1.125}, - {"x": 16.5, "y": 1.375}, - {"x": 17.5, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.125}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.75}, - - {"x": 11.5, "y": 2.75}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.125}, - {"x": 14.5, "y": 2}, - {"x": 15.5, "y": 2.125}, - {"x": 16.5, "y": 2.375}, - {"x": 17.5, "y": 2.375}, - - {"x": 0, "y": 3.375}, - {"x": 1, "y": 3.375}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.125}, - {"x": 5, "y": 3.25}, - - {"x": 7, "y": 4}, - - {"x": 10.5, "y": 4}, - - {"x": 12.5, "y": 3.25}, - {"x": 13.5, "y": 3.125}, - {"x": 14.5, "y": 3}, - {"x": 15.5, "y": 3.125}, - {"x": 16.5, "y": 3.375}, - {"x": 17.5, "y": 3.375}, - - {"x": 0, "y": 4.375}, - {"x": 1, "y": 4.375}, - {"x": 2, "y": 4.125}, - {"x": 3, "y": 4}, - - {"x": 5, "y": 5}, - {"x": 6, "y": 4, "h": 2}, - {"x": 7, "y": 5}, - - {"x": 10.5, "y": 5}, - {"x": 11.5, "y": 4, "h": 2}, - {"x": 12.5, "y": 5}, - - {"x": 14.5, "y": 4}, - {"x": 15.5, "y": 4.125}, - {"x": 16.5, "y": 4.375}, - {"x": 17.5, "y": 4.375} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.75}, + + {"matrix": [5, 6], "x": 11.5, "y": 0.75}, + {"matrix": [5, 5], "x": 12.5, "y": 0.25}, + {"matrix": [5, 4], "x": 13.5, "y": 0.125}, + {"matrix": [5, 3], "x": 14.5, "y": 0}, + {"matrix": [5, 2], "x": 15.5, "y": 0.125}, + {"matrix": [5, 1], "x": 16.5, "y": 0.375}, + {"matrix": [5, 0], "x": 17.5, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.75}, + + {"matrix": [6, 6], "x": 11.5, "y": 1.75}, + {"matrix": [6, 5], "x": 12.5, "y": 1.25}, + {"matrix": [6, 4], "x": 13.5, "y": 1.125}, + {"matrix": [6, 3], "x": 14.5, "y": 1}, + {"matrix": [6, 2], "x": 15.5, "y": 1.125}, + {"matrix": [6, 1], "x": 16.5, "y": 1.375}, + {"matrix": [6, 0], "x": 17.5, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.75}, + + {"matrix": [7, 6], "x": 11.5, "y": 2.75}, + {"matrix": [7, 5], "x": 12.5, "y": 2.25}, + {"matrix": [7, 4], "x": 13.5, "y": 2.125}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 2], "x": 15.5, "y": 2.125}, + {"matrix": [7, 1], "x": 16.5, "y": 2.375}, + {"matrix": [7, 0], "x": 17.5, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 7, "y": 4}, + + {"matrix": [8, 6], "x": 10.5, "y": 4}, + {"matrix": [8, 5], "x": 12.5, "y": 3.25}, + {"matrix": [8, 4], "x": 13.5, "y": 3.125}, + {"matrix": [8, 3], "x": 14.5, "y": 3}, + {"matrix": [8, 2], "x": 15.5, "y": 3.125}, + {"matrix": [8, 1], "x": 16.5, "y": 3.375}, + {"matrix": [8, 0], "x": 17.5, "y": 3.375}, + + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2, "y": 4.125}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 4, "h": 2}, + {"matrix": [4, 6], "x": 7, "y": 5}, + + {"matrix": [9, 6], "x": 10.5, "y": 5}, + {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2}, + {"matrix": [9, 4], "x": 12.5, "y": 5}, + {"matrix": [9, 3], "x": 14.5, "y": 4}, + {"matrix": [9, 2], "x": 15.5, "y": 4.125}, + {"matrix": [9, 1], "x": 16.5, "y": 4.375}, + {"matrix": [9, 0], "x": 17.5, "y": 4.375} ] }, "LAYOUT_3key_2us": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.125}, - {"x": 5, "y": 0.25}, - {"x": 6, "y": 0.75}, - - {"x": 11.5, "y": 0.75}, - {"x": 12.5, "y": 0.25}, - {"x": 13.5, "y": 0.125}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0.125}, - {"x": 16.5, "y": 0.375}, - {"x": 17.5, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.125}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.75}, - - {"x": 11.5, "y": 1.75}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.125}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1.125}, - {"x": 16.5, "y": 1.375}, - {"x": 17.5, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.125}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.75}, - - {"x": 11.5, "y": 2.75}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.125}, - {"x": 14.5, "y": 2}, - {"x": 15.5, "y": 2.125}, - {"x": 16.5, "y": 2.375}, - {"x": 17.5, "y": 2.375}, - - {"x": 0, "y": 3.375}, - {"x": 1, "y": 3.375}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.125}, - {"x": 5, "y": 3.25}, - - {"x": 12.5, "y": 3.25}, - {"x": 13.5, "y": 3.125}, - {"x": 14.5, "y": 3}, - {"x": 15.5, "y": 3.125}, - {"x": 16.5, "y": 3.375}, - {"x": 17.5, "y": 3.375}, - - {"x": 0, "y": 4.375}, - {"x": 1, "y": 4.375}, - {"x": 2, "y": 4.125}, - {"x": 3, "y": 4}, - - {"x": 5, "y": 5}, - {"x": 6, "y": 4, "h": 2}, - {"x": 7, "y": 4, "h": 2}, - - {"x": 10.5, "y": 4, "h": 2}, - {"x": 11.5, "y": 4, "h": 2}, - {"x": 12.5, "y": 5}, - - {"x": 14.5, "y": 4}, - {"x": 15.5, "y": 4.125}, - {"x": 16.5, "y": 4.375}, - {"x": 17.5, "y": 4.375} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.75}, + + {"matrix": [5, 6], "x": 11.5, "y": 0.75}, + {"matrix": [5, 5], "x": 12.5, "y": 0.25}, + {"matrix": [5, 4], "x": 13.5, "y": 0.125}, + {"matrix": [5, 3], "x": 14.5, "y": 0}, + {"matrix": [5, 2], "x": 15.5, "y": 0.125}, + {"matrix": [5, 1], "x": 16.5, "y": 0.375}, + {"matrix": [5, 0], "x": 17.5, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.75}, + + {"matrix": [6, 6], "x": 11.5, "y": 1.75}, + {"matrix": [6, 5], "x": 12.5, "y": 1.25}, + {"matrix": [6, 4], "x": 13.5, "y": 1.125}, + {"matrix": [6, 3], "x": 14.5, "y": 1}, + {"matrix": [6, 2], "x": 15.5, "y": 1.125}, + {"matrix": [6, 1], "x": 16.5, "y": 1.375}, + {"matrix": [6, 0], "x": 17.5, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.75}, + + {"matrix": [7, 6], "x": 11.5, "y": 2.75}, + {"matrix": [7, 5], "x": 12.5, "y": 2.25}, + {"matrix": [7, 4], "x": 13.5, "y": 2.125}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 2], "x": 15.5, "y": 2.125}, + {"matrix": [7, 1], "x": 16.5, "y": 2.375}, + {"matrix": [7, 0], "x": 17.5, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [8, 5], "x": 12.5, "y": 3.25}, + {"matrix": [8, 4], "x": 13.5, "y": 3.125}, + {"matrix": [8, 3], "x": 14.5, "y": 3}, + {"matrix": [8, 2], "x": 15.5, "y": 3.125}, + {"matrix": [8, 1], "x": 16.5, "y": 3.375}, + {"matrix": [8, 0], "x": 17.5, "y": 3.375}, + + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2, "y": 4.125}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 4, "h": 2}, + {"matrix": [4, 6], "x": 7, "y": 4, "h": 2}, + + {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2}, + {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2}, + {"matrix": [9, 4], "x": 12.5, "y": 5}, + {"matrix": [9, 3], "x": 14.5, "y": 4}, + {"matrix": [9, 2], "x": 15.5, "y": 4.125}, + {"matrix": [9, 1], "x": 16.5, "y": 4.375}, + {"matrix": [9, 0], "x": 17.5, "y": 4.375} ] }, "LAYOUT_3key_1us": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.125}, - {"x": 5, "y": 0.25}, - {"x": 6, "y": 0.75}, - - {"x": 11.5, "y": 0.75}, - {"x": 12.5, "y": 0.25}, - {"x": 13.5, "y": 0.125}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0.125}, - {"x": 16.5, "y": 0.375}, - {"x": 17.5, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.125}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.75}, - - {"x": 11.5, "y": 1.75}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.125}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1.125}, - {"x": 16.5, "y": 1.375}, - {"x": 17.5, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.125}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.75}, - - {"x": 11.5, "y": 2.75}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.125}, - {"x": 14.5, "y": 2}, - {"x": 15.5, "y": 2.125}, - {"x": 16.5, "y": 2.375}, - {"x": 17.5, "y": 2.375}, - - {"x": 0, "y": 3.375}, - {"x": 1, "y": 3.375}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.125}, - {"x": 5, "y": 3.25}, - {"x": 6, "y": 4}, - - {"x": 11.5, "y": 4}, - {"x": 12.5, "y": 3.25}, - {"x": 13.5, "y": 3.125}, - {"x": 14.5, "y": 3}, - {"x": 15.5, "y": 3.125}, - {"x": 16.5, "y": 3.375}, - {"x": 17.5, "y": 3.375}, - - {"x": 0, "y": 4.375}, - {"x": 1, "y": 4.375}, - {"x": 2, "y": 4.125}, - {"x": 3, "y": 4}, - - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, - - {"x": 11.5, "y": 5}, - {"x": 12.5, "y": 5}, - - {"x": 14.5, "y": 4}, - {"x": 15.5, "y": 4.125}, - {"x": 16.5, "y": 4.375}, - {"x": 17.5, "y": 4.375} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.75}, + + {"matrix": [5, 6], "x": 11.5, "y": 0.75}, + {"matrix": [5, 5], "x": 12.5, "y": 0.25}, + {"matrix": [5, 4], "x": 13.5, "y": 0.125}, + {"matrix": [5, 3], "x": 14.5, "y": 0}, + {"matrix": [5, 2], "x": 15.5, "y": 0.125}, + {"matrix": [5, 1], "x": 16.5, "y": 0.375}, + {"matrix": [5, 0], "x": 17.5, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.75}, + + {"matrix": [6, 6], "x": 11.5, "y": 1.75}, + {"matrix": [6, 5], "x": 12.5, "y": 1.25}, + {"matrix": [6, 4], "x": 13.5, "y": 1.125}, + {"matrix": [6, 3], "x": 14.5, "y": 1}, + {"matrix": [6, 2], "x": 15.5, "y": 1.125}, + {"matrix": [6, 1], "x": 16.5, "y": 1.375}, + {"matrix": [6, 0], "x": 17.5, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.75}, + + {"matrix": [7, 6], "x": 11.5, "y": 2.75}, + {"matrix": [7, 5], "x": 12.5, "y": 2.25}, + {"matrix": [7, 4], "x": 13.5, "y": 2.125}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 2], "x": 15.5, "y": 2.125}, + {"matrix": [7, 1], "x": 16.5, "y": 2.375}, + {"matrix": [7, 0], "x": 17.5, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 4}, + + {"matrix": [8, 6], "x": 11.5, "y": 4}, + {"matrix": [8, 5], "x": 12.5, "y": 3.25}, + {"matrix": [8, 4], "x": 13.5, "y": 3.125}, + {"matrix": [8, 3], "x": 14.5, "y": 3}, + {"matrix": [8, 2], "x": 15.5, "y": 3.125}, + {"matrix": [8, 1], "x": 16.5, "y": 3.375}, + {"matrix": [8, 0], "x": 17.5, "y": 3.375}, + + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2, "y": 4.125}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [9, 5], "x": 11.5, "y": 5}, + {"matrix": [9, 4], "x": 12.5, "y": 5}, + {"matrix": [9, 3], "x": 14.5, "y": 4}, + {"matrix": [9, 2], "x": 15.5, "y": 4.125}, + {"matrix": [9, 1], "x": 16.5, "y": 4.375}, + {"matrix": [9, 0], "x": 17.5, "y": 4.375} ] }, "LAYOUT_2key": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.125}, - {"x": 5, "y": 0.25}, - {"x": 6, "y": 0.75}, - - {"x": 11.5, "y": 0.75}, - {"x": 12.5, "y": 0.25}, - {"x": 13.5, "y": 0.125}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0.125}, - {"x": 16.5, "y": 0.375}, - {"x": 17.5, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.125}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.75}, - - {"x": 11.5, "y": 1.75}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.125}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1.125}, - {"x": 16.5, "y": 1.375}, - {"x": 17.5, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.125}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.75}, - - {"x": 11.5, "y": 2.75}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.125}, - {"x": 14.5, "y": 2}, - {"x": 15.5, "y": 2.125}, - {"x": 16.5, "y": 2.375}, - {"x": 17.5, "y": 2.375}, - - {"x": 0, "y": 3.375}, - {"x": 1, "y": 3.375}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.125}, - {"x": 5, "y": 3.25}, - - {"x": 12.5, "y": 3.25}, - {"x": 13.5, "y": 3.125}, - {"x": 14.5, "y": 3}, - {"x": 15.5, "y": 3.125}, - {"x": 16.5, "y": 3.375}, - {"x": 17.5, "y": 3.375}, - - {"x": 0, "y": 4.375}, - {"x": 1, "y": 4.375}, - {"x": 2, "y": 4.125}, - {"x": 3, "y": 4}, - - {"x": 5, "y": 5}, - {"x": 6, "y": 4, "h": 2}, - - {"x": 11.5, "y": 4, "h": 2}, - {"x": 12.5, "y": 5}, - - {"x": 14.5, "y": 4}, - {"x": 15.5, "y": 4.125}, - {"x": 16.5, "y": 4.375}, - {"x": 17.5, "y": 4.375} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.75}, + + {"matrix": [5, 6], "x": 11.5, "y": 0.75}, + {"matrix": [5, 5], "x": 12.5, "y": 0.25}, + {"matrix": [5, 4], "x": 13.5, "y": 0.125}, + {"matrix": [5, 3], "x": 14.5, "y": 0}, + {"matrix": [5, 2], "x": 15.5, "y": 0.125}, + {"matrix": [5, 1], "x": 16.5, "y": 0.375}, + {"matrix": [5, 0], "x": 17.5, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.75}, + + {"matrix": [6, 6], "x": 11.5, "y": 1.75}, + {"matrix": [6, 5], "x": 12.5, "y": 1.25}, + {"matrix": [6, 4], "x": 13.5, "y": 1.125}, + {"matrix": [6, 3], "x": 14.5, "y": 1}, + {"matrix": [6, 2], "x": 15.5, "y": 1.125}, + {"matrix": [6, 1], "x": 16.5, "y": 1.375}, + {"matrix": [6, 0], "x": 17.5, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.75}, + + {"matrix": [7, 6], "x": 11.5, "y": 2.75}, + {"matrix": [7, 5], "x": 12.5, "y": 2.25}, + {"matrix": [7, 4], "x": 13.5, "y": 2.125}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 2], "x": 15.5, "y": 2.125}, + {"matrix": [7, 1], "x": 16.5, "y": 2.375}, + {"matrix": [7, 0], "x": 17.5, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [8, 5], "x": 12.5, "y": 3.25}, + {"matrix": [8, 4], "x": 13.5, "y": 3.125}, + {"matrix": [8, 3], "x": 14.5, "y": 3}, + {"matrix": [8, 2], "x": 15.5, "y": 3.125}, + {"matrix": [8, 1], "x": 16.5, "y": 3.375}, + {"matrix": [8, 0], "x": 17.5, "y": 3.375}, + + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2, "y": 4.125}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 4, "h": 2}, + + {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2}, + {"matrix": [9, 4], "x": 12.5, "y": 5}, + {"matrix": [9, 3], "x": 14.5, "y": 4}, + {"matrix": [9, 2], "x": 15.5, "y": 4.125}, + {"matrix": [9, 1], "x": 16.5, "y": 4.375}, + {"matrix": [9, 0], "x": 17.5, "y": 4.375} ] } } diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c index eb794f9ac7..35a313f6fd 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.c +++ b/keyboards/omkbd/ergodash/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h deleted file mode 100644 index 4a1ee020e7..0000000000 --- a/keyboards/omkbd/ergodash/rev1/rev1.h +++ /dev/null @@ -1,129 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#ifndef FLIP_HALF -// Standard Keymap -// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -# define LAYOUT_4key( \ - 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 \ -) { \ - { 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 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} - -// Just defined for configurator support, the matrix is identical to LAYOUT_4key -# define LAYOUT_4key_2u_inner( \ - 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 \ -) { \ - { 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 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} - -# define LAYOUT_3key_2us( \ - 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, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { 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, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, XXX }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} - -# define LAYOUT_3key_1us( \ - 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, R41, R42, R43, R44, R45, R46 \ -) { \ - { 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, XXX }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, XXX } \ -} - -# define LAYOUT_2key( \ - 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, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ -) { \ - { 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, XXX }, \ - { L40, L41, L42, L43, L44, L45, XXX }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, XXX }, \ - { R46, R45, R44, R43, R42, R41, XXX } \ -} - -#define LAYOUT LAYOUT_4key - -#else -// Keymap with right side flipped -// (TRRS jack on both halves are to the right) -# define LAYOUT( \ - 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 \ -) { \ - { 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 }, \ - { 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 } \ -} -#endif -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/omkbd/runner3680/3x6/config.h | 1 - keyboards/omkbd/runner3680/3x6/info.json | 3 +++ keyboards/omkbd/runner3680/3x7/config.h | 1 - keyboards/omkbd/runner3680/3x7/info.json | 3 +++ keyboards/omkbd/runner3680/3x8/config.h | 1 - keyboards/omkbd/runner3680/3x8/info.json | 3 +++ keyboards/omkbd/runner3680/4x6/config.h | 1 - keyboards/omkbd/runner3680/4x6/info.json | 3 +++ keyboards/omkbd/runner3680/4x7/config.h | 1 - keyboards/omkbd/runner3680/4x7/info.json | 3 +++ keyboards/omkbd/runner3680/4x8/config.h | 1 - keyboards/omkbd/runner3680/4x8/info.json | 3 +++ keyboards/omkbd/runner3680/5x6/config.h | 1 - keyboards/omkbd/runner3680/5x6/info.json | 3 +++ keyboards/omkbd/runner3680/5x6_5x8/config.h | 1 - keyboards/omkbd/runner3680/5x6_5x8/info.json | 3 +++ keyboards/omkbd/runner3680/5x7/config.h | 1 - keyboards/omkbd/runner3680/5x7/info.json | 3 +++ keyboards/omkbd/runner3680/5x8/config.h | 1 - keyboards/omkbd/runner3680/5x8/info.json | 3 +++ 20 files changed, 30 insertions(+), 10 deletions(-) (limited to 'keyboards/omkbd') diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index b54416a389..d2cd91cbc5 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 36 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 18, 18 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index 9cb57ec106..c197f04207 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index c70baa156f..b8c601b564 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 42 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 21, 21 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index a3cde77a45..458fab653c 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index 41740c62e4..3a273e8bb9 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 48 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 24, 24 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index 4c816a400c..33fcc3228f 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index 41740c62e4..3a273e8bb9 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 48 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 24, 24 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index 05785c52dd..2e6eda2a2e 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index 03b4919378..f6b5dcf145 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 56 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 28, 28 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index 548cb8752f..af1a4375d6 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index d3f8800e34..9a53d19688 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 64 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 32, 32 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index e492360e6a..88dc1455ce 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index 8dbc8175aa..52626f1de3 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 60 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 30, 30 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index 2ed37dd414..08c4950b80 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 6c1d08fe32..33f41e5289 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -39,7 +39,6 @@ #define RGBLED_NUM 70 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 30, 40 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #endif #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 70 diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index b597d80a12..8b1b7054a5 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -22,6 +22,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index f7457e18b4..7b60494fcb 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 70 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 35, 35 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index e9460d7d18..0c0c8670f2 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index 193767245e..55d8ae5c97 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -38,7 +38,6 @@ #define RGBLED_NUM 80 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 40, 40 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index e851ec39b4..41e95e583a 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -19,6 +19,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 100 + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3