summaryrefslogtreecommitdiff
path: root/keyboards/omkbd/runner3680/5x6_5x8
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/omkbd/runner3680/5x6_5x8')
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c2
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h41
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/config.h8
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/info.json156
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/rules.mk1
5 files changed, 87 insertions, 121 deletions
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 <http://www.gnu.org/licenses/>.
*/
-#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 afceac0a89..0000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
+++ /dev/null
@@ -1,41 +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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "runner3680.h"
-
-#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/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 30ef01e8cd..6c1d08fe32 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
@@ -32,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 1e8bd452f3..b597d80a12 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -8,86 +8,102 @@
"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"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"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},
+
+ {"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},
+
+ {"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},
+
+ {"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},
+
+ {"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},
- {"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": [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},
- {"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": [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},
- {"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": [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},
- {"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": [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/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 08:10:16 +0000