summaryrefslogtreecommitdiff
path: root/keyboards/omkbd
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/omkbd')
-rw-r--r--keyboards/omkbd/ergodash/ergodash.c1
-rw-r--r--keyboards/omkbd/ergodash/ergodash.h11
-rw-r--r--keyboards/omkbd/ergodash/mini/config.h8
-rw-r--r--keyboards/omkbd/ergodash/mini/info.json113
-rw-r--r--keyboards/omkbd/ergodash/mini/mini.c2
-rw-r--r--keyboards/omkbd/ergodash/mini/mini.h10
-rw-r--r--keyboards/omkbd/ergodash/rev1/config.h8
-rw-r--r--keyboards/omkbd/ergodash/rev1/info.json751
-rw-r--r--keyboards/omkbd/ergodash/rev1/rev1.c2
-rw-r--r--keyboards/omkbd/ergodash/rev1/rev1.h10
-rw-r--r--keyboards/omkbd/runner3680/3x6/3x6.c1
-rw-r--r--keyboards/omkbd/runner3680/3x6/3x6.h2
-rw-r--r--keyboards/omkbd/runner3680/3x6/config.h7
-rw-r--r--keyboards/omkbd/runner3680/3x6/info.json5
-rw-r--r--keyboards/omkbd/runner3680/3x7/3x7.c1
-rw-r--r--keyboards/omkbd/runner3680/3x7/3x7.h2
-rw-r--r--keyboards/omkbd/runner3680/3x7/config.h7
-rw-r--r--keyboards/omkbd/runner3680/3x7/info.json5
-rw-r--r--keyboards/omkbd/runner3680/3x8/3x8.c1
-rw-r--r--keyboards/omkbd/runner3680/3x8/3x8.h2
-rw-r--r--keyboards/omkbd/runner3680/3x8/config.h7
-rw-r--r--keyboards/omkbd/runner3680/3x8/info.json5
-rw-r--r--keyboards/omkbd/runner3680/4x6/4x6.c1
-rw-r--r--keyboards/omkbd/runner3680/4x6/4x6.h2
-rw-r--r--keyboards/omkbd/runner3680/4x6/config.h7
-rw-r--r--keyboards/omkbd/runner3680/4x6/info.json5
-rw-r--r--keyboards/omkbd/runner3680/4x7/4x7.c1
-rw-r--r--keyboards/omkbd/runner3680/4x7/4x7.h2
-rw-r--r--keyboards/omkbd/runner3680/4x7/config.h7
-rw-r--r--keyboards/omkbd/runner3680/4x7/info.json5
-rw-r--r--keyboards/omkbd/runner3680/4x8/4x8.c1
-rw-r--r--keyboards/omkbd/runner3680/4x8/4x8.h2
-rw-r--r--keyboards/omkbd/runner3680/4x8/config.h7
-rw-r--r--keyboards/omkbd/runner3680/4x8/info.json5
-rw-r--r--keyboards/omkbd/runner3680/5x6/5x6.c1
-rw-r--r--keyboards/omkbd/runner3680/5x6/5x6.h2
-rw-r--r--keyboards/omkbd/runner3680/5x6/config.h7
-rw-r--r--keyboards/omkbd/runner3680/5x6/info.json5
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h2
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/config.h7
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/info.json5
-rw-r--r--keyboards/omkbd/runner3680/5x7/5x7.c1
-rw-r--r--keyboards/omkbd/runner3680/5x7/5x7.h2
-rw-r--r--keyboards/omkbd/runner3680/5x7/config.h7
-rw-r--r--keyboards/omkbd/runner3680/5x7/info.json5
-rw-r--r--keyboards/omkbd/runner3680/5x8/5x8.c1
-rw-r--r--keyboards/omkbd/runner3680/5x8/5x8.h2
-rw-r--r--keyboards/omkbd/runner3680/5x8/config.h7
-rw-r--r--keyboards/omkbd/runner3680/5x8/info.json5
-rw-r--r--keyboards/omkbd/runner3680/runner3680.c1
-rw-r--r--keyboards/omkbd/runner3680/runner3680.h43
51 files changed, 554 insertions, 555 deletions
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/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 <http://www.gnu.org/licenses/>.
#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..5d53117b14 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/info.json
@@ -1,23 +1,96 @@
{
- "keyboard_name": "ErgoDash Mini",
- "manufacturer": "Omkbd",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6060",
- "device_version": "1.0.0"
- },
- "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/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 4aca15775b..be69cce49b 100644
--- a/keyboards/omkbd/ergodash/mini/mini.h
+++ b/keyboards/omkbd/ergodash/mini/mini.h
@@ -1,17 +1,7 @@
#pragma once
-#include "ergodash.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#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/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 <http://www.gnu.org/licenses/>.
#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..a5f7e38b5b 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
@@ -18,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}
+ ]
}
}
}
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 7f094534cc..4a1ee020e7 100644
--- a/keyboards/omkbd/ergodash/rev1/rev1.h
+++ b/keyboards/omkbd/ergodash/rev1/rev1.h
@@ -1,17 +1,7 @@
#pragma once
-#include "ergodash.h"
-
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#define XXX KC_NO
#ifndef FLIP_HALF
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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"
},
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