summaryrefslogtreecommitdiff
path: root/keyboards/ymdk/np24
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ymdk/np24')
-rw-r--r--keyboards/ymdk/np24/u4rgb6/config.h10
-rw-r--r--keyboards/ymdk/np24/u4rgb6/info.json223
-rw-r--r--keyboards/ymdk/np24/u4rgb6/u4rgb6.c16
-rw-r--r--keyboards/ymdk/np24/u4rgb6/u4rgb6.h81
4 files changed, 114 insertions, 216 deletions
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index 0524cfd563..3ab1f3b604 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -15,16 +15,7 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 }
-#define MATRIX_COL_PINS { F5, F4, D3, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,4 +27,3 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index dd4b532538..927496efa6 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -7,6 +7,11 @@
"pid": "0x5024",
"device_version": "4.0.6"
},
+ "matrix_pins": {
+ "cols": ["F5", "F4", "D3", "D2"],
+ "rows": ["B3", "B6", "B2", "B1", "D7", "B4"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B7",
"levels": 31
@@ -21,129 +26,129 @@
"layouts": {
"LAYOUT_ortho_6x4": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
-
- {"x": 0, "y": 1.25},
- {"x": 1, "y": 1.25},
- {"x": 2, "y": 1.25},
- {"x": 3, "y": 1.25},
-
- {"x": 0, "y": 2.25},
- {"x": 1, "y": 2.25},
- {"x": 2, "y": 2.25},
- {"x": 3, "y": 2.25},
-
- {"x": 0, "y": 3.25},
- {"x": 1, "y": 3.25},
- {"x": 2, "y": 3.25},
- {"x": 3, "y": 3.25},
-
- {"x": 0, "y": 4.25},
- {"x": 1, "y": 4.25},
- {"x": 2, "y": 4.25},
- {"x": 3, "y": 4.25},
-
- {"x": 0, "y": 5.25},
- {"x": 1, "y": 5.25},
- {"x": 2, "y": 5.25},
- {"x": 3, "y": 5.25}
+ {"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": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 5.25}
]
},
"LAYOUT_ortho_4x6_right": {
"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, "w": 1.5},
-
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1, "w": 1.5},
-
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2, "w": 1.5},
-
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "y": 3, "w": 1.5}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [4, 0], "x": 1, "y": 0},
+ {"matrix": [3, 0], "x": 2, "y": 0},
+ {"matrix": [2, 0], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0, "w": 1.5},
+
+ {"matrix": [5, 1], "x": 0, "y": 1},
+ {"matrix": [4, 1], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [0, 1], "x": 5, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 2], "x": 0, "y": 2},
+ {"matrix": [4, 2], "x": 1, "y": 2},
+ {"matrix": [3, 2], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [1, 2], "x": 4, "y": 2},
+ {"matrix": [0, 2], "x": 5, "y": 2, "w": 1.5},
+
+ {"matrix": [5, 3], "x": 0, "y": 3},
+ {"matrix": [4, 3], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [1, 3], "x": 4, "y": 3},
+ {"matrix": [0, 3], "x": 5, "y": 3, "w": 1.5}
]
},
"LAYOUT_ortho_4x6_left": {
"layout": [
- {"x": 0, "y": 0, "w": 1.5},
- {"x": 1.5, "y": 0},
- {"x": 2.5, "y": 0},
- {"x": 3.5, "y": 0},
- {"x": 4.5, "y": 0},
- {"x": 5.5, "y": 0},
-
- {"x": 0, "y": 1, "w": 1.5},
- {"x": 1.5, "y": 1},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
-
- {"x": 0, "y": 2, "w": 1.5},
- {"x": 1.5, "y": 2},
- {"x": 2.5, "y": 2},
- {"x": 3.5, "y": 2},
- {"x": 4.5, "y": 2},
- {"x": 5.5, "y": 2},
-
- {"x": 0, "y": 3, "w": 1.5},
- {"x": 1.5, "y": 3},
- {"x": 2.5, "y": 3},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3}
+ {"matrix": [0, 3], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 0},
+ {"matrix": [2, 3], "x": 2.5, "y": 0},
+ {"matrix": [3, 3], "x": 3.5, "y": 0},
+ {"matrix": [4, 3], "x": 4.5, "y": 0},
+ {"matrix": [5, 3], "x": 5.5, "y": 0},
+
+ {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [2, 2], "x": 2.5, "y": 1},
+ {"matrix": [3, 2], "x": 3.5, "y": 1},
+ {"matrix": [4, 2], "x": 4.5, "y": 1},
+ {"matrix": [5, 2], "x": 5.5, "y": 1},
+
+ {"matrix": [0, 1], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [3, 1], "x": 3.5, "y": 2},
+ {"matrix": [4, 1], "x": 4.5, "y": 2},
+ {"matrix": [5, 1], "x": 5.5, "y": 2},
+
+ {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 3},
+ {"matrix": [2, 0], "x": 2.5, "y": 3},
+ {"matrix": [3, 0], "x": 3.5, "y": 3},
+ {"matrix": [4, 0], "x": 4.5, "y": 3},
+ {"matrix": [5, 0], "x": 5.5, "y": 3}
]
},
"LAYOUT_numpad_6x4": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
-
- {"x": 0, "y": 1.25},
- {"x": 1, "y": 1.25},
- {"x": 2, "y": 1.25},
- {"x": 3, "y": 1.25},
-
- {"x": 0, "y": 2.25},
- {"x": 1, "y": 2.25},
- {"x": 2, "y": 2.25},
-
- {"x": 0, "y": 3.25},
- {"x": 1, "y": 3.25},
- {"x": 2, "y": 3.25},
- {"x": 3, "y": 2.25, "h": 2},
-
- {"x": 0, "y": 4.25},
- {"x": 1, "y": 4.25},
- {"x": 2, "y": 4.25},
-
- {"x": 0, "y": 5.25, "w": 2},
- {"x": 2, "y": 5.25},
- {"x": 3, "y": 4.25, "h": 2}
+ {"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": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+ {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
]
}
}
diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c b/keyboards/ymdk/np24/u4rgb6/u4rgb6.c
deleted file mode 100644
index edd0c0552d..0000000000
--- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Simon Arlott
- *
- * 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/>.
- */
-#include "u4rgb6.h"
diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h b/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
deleted file mode 100644
index 7615cf2bed..0000000000
--- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
- * Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_6x4( \
- k00, k10, k20, k30, \
- k01, k11, k21, k31, \
- k02, k12, k22, k32, \
- k03, k13, k23, k33, \
- k04, k14, k24, k34, \
- k05, k15, k25, k35 \
-) { \
- { k00, k10, k20, k30 }, \
- { k01, k11, k21, k31 }, \
- { k02, k12, k22, k32 }, \
- { k03, k13, k23, k33 }, \
- { k04, k14, k24, k34 }, \
- { k05, k15, k25, k35 } \
-}
-
-#define LAYOUT_ortho_4x6_right( \
- k00, k01, k02, k03, k04, k05, \
- k10, k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, \
- k30, k31, k32, k33, k34, k35 \
-) { \
- { k05, k15, k25, k35 }, \
- { k04, k14, k24, k34 }, \
- { k03, k13, k23, k33 }, \
- { k02, k12, k22, k32 }, \
- { k01, k11, k21, k31 }, \
- { k00, k10, k20, k30 } \
-}
-
-#define LAYOUT_ortho_4x6_left( \
- k00, k01, k02, k03, k04, k05, \
- k10, k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, \
- k30, k31, k32, k33, k34, k35 \
-) { \
- { k30, k20, k10, k00 }, \
- { k31, k21, k11, k01 }, \
- { k32, k22, k12, k02 }, \
- { k33, k23, k13, k03 }, \
- { k34, k24, k14, k04 }, \
- { k35, k25, k15, k05 } \
-}
-
-#define LAYOUT_numpad_6x4( \
- k00, k10, k20, k30, \
- k01, k11, k21, k31, \
- k02, k12, k22, \
- k03, k13, k23, k33, \
- k04, k14, k24, \
- k15, k25, k35 \
-) { \
- { k00, k10, k20, k30 }, \
- { k01, k11, k21, k31 }, \
- { k02, k12, k22, XXX }, \
- { k03, k13, k23, k33 }, \
- { k04, k14, k24, XXX }, \
- { XXX, k15, k25, k35 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 06:52:26 +0000