summaryrefslogtreecommitdiff
path: root/keyboards/yushakobo/navpad
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/yushakobo/navpad')
-rw-r--r--keyboards/yushakobo/navpad/10/10.c17
-rw-r--r--keyboards/yushakobo/navpad/10/10.h26
-rw-r--r--keyboards/yushakobo/navpad/10/config.h6
-rw-r--r--keyboards/yushakobo/navpad/10/info.json18
-rw-r--r--keyboards/yushakobo/navpad/10/keymaps/default/config.h4
-rw-r--r--keyboards/yushakobo/navpad/10/keymaps/via/config.h4
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/config.h32
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/info.json52
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/rev0.c17
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/rev0.h25
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/config.h16
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/info.json52
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/rev1.c17
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/rev1.h25
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c17
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h50
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/config.h28
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/info.json98
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h4
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c2
-rw-r--r--keyboards/yushakobo/navpad/navpad_prefs.c2
21 files changed, 207 insertions, 305 deletions
diff --git a/keyboards/yushakobo/navpad/10/10.c b/keyboards/yushakobo/navpad/10/10.c
deleted file mode 100644
index c1f6fc485d..0000000000
--- a/keyboards/yushakobo/navpad/10/10.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 "10.h"
diff --git a/keyboards/yushakobo/navpad/10/10.h b/keyboards/yushakobo/navpad/10/10.h
deleted file mode 100644
index 5fd02cd073..0000000000
--- a/keyboards/yushakobo/navpad/10/10.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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"
-#include "navpad_prefs.h"
-
-#if defined(KEYBOARD_yushakobo_navpad_10_rev0)
-# include "rev0.h"
-#elif defined(KEYBOARD_yushakobo_navpad_10_rev1)
-# include "rev1.h"
-#endif
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index 7f1153299c..fdd7a80cc5 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 9
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -37,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* disable action features */
//#define NO_ACTION_LAYER
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index a6b946367f..2cd4bfe8fe 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -12,19 +12,9 @@
{"pin_a": "B5", "pin_b": "B6"}
]
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "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": 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": 3, "y": 3},{"x": 4, "y": 3},{"x": 5, "y": 3},{"x": 6, "y": 3},
- {"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": 0, "y": 5},{"x": 1, "y": 5},{"x": 2, "y": 5},{"x": 3, "y": 5},{"x": 4, "y": 5},{"x": 5, "y": 5},{"x": 6, "y": 5}
-
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/config.h b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
index b4d2122ab4..10ba897cce 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/config.h
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef RGB_DI_PIN
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/config.h b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
index b4d2122ab4..10ba897cce 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/config.h
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef RGB_DI_PIN
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h
deleted file mode 100644
index 3e65349c87..0000000000
--- a/keyboards/yushakobo/navpad/10/rev0/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 yushakobo
-
-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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, D0 }
-#define MATRIX_COL_PINS { F4, F5, F6, B2, B3, B1, F7 }
diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json
index 5baab67dba..afe4c6f0c0 100644
--- a/keyboards/yushakobo/navpad/10/rev0/info.json
+++ b/keyboards/yushakobo/navpad/10/rev0/info.json
@@ -1,5 +1,57 @@
{
"usb": {
"device_version": "0.0.0"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "D0"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [5, 2], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+
+ {"matrix": [4, 0], "x": 0, "y": 5},
+ {"matrix": [4, 1], "x": 1, "y": 5},
+ {"matrix": [4, 2], "x": 2, "y": 5},
+ {"matrix": [4, 3], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+ {"matrix": [4, 6], "x": 6, "y": 5}
+ ]
+ }
}
}
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.c b/keyboards/yushakobo/navpad/10/rev0/rev0.c
deleted file mode 100644
index c1feab87a3..0000000000
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 "rev0.h"
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h
index 97a651bc1c..69eca3ef67 100644
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.h
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h
@@ -18,27 +18,4 @@
#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, k14, k15, k16, \
- k20, k21, k22, k23, k24, k25, k26, \
- k33, k34, k35, k36, \
- k40, k41, k42, k43, k44, k45, k46, \
- k50, k51, k52, k53, k54, k55, k56 \
- ) \
- {\
- { k00, k01, k02, k13, k14, k15, k16 }, \
- { k10, k11, k12, k23, k24, k25, k26 }, \
- { k20, k21, k22, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { k50, k51, k52, k53, k54, k55, k56 }, \
- { KC_NO, KC_NO, k03, KC_NO, KC_NO, KC_NO, KC_NO } \
- }
+#include "navpad_prefs.h"
diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h
index d2e7829323..d4a4e48d77 100644
--- a/keyboards/yushakobo/navpad/10/rev1/config.h
+++ b/keyboards/yushakobo/navpad/10/rev1/config.h
@@ -17,20 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 }
-#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7 }
-
-#ifdef RGB_DI_PIN
# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }
-#endif
diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json
index 90ac25f360..bd20c0d0b4 100644
--- a/keyboards/yushakobo/navpad/10/rev1/info.json
+++ b/keyboards/yushakobo/navpad/10/rev1/info.json
@@ -1,5 +1,57 @@
{
"usb": {
"device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "B2", "B3", "B1", "F7"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [5, 1], "x": 3, "y": 0},
+
+ {"matrix": [5, 2], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [0, 2], "x": 3, "y": 1},
+ {"matrix": [0, 3], "x": 4, "y": 1},
+ {"matrix": [0, 4], "x": 5, "y": 1},
+ {"matrix": [0, 5], "x": 6, "y": 1},
+
+ {"matrix": [5, 3], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 3, "y": 2},
+ {"matrix": [1, 3], "x": 4, "y": 2},
+ {"matrix": [1, 4], "x": 5, "y": 2},
+ {"matrix": [1, 5], "x": 6, "y": 2},
+
+ {"matrix": [2, 2], "x": 3, "y": 3},
+ {"matrix": [2, 3], "x": 4, "y": 3},
+ {"matrix": [2, 4], "x": 5, "y": 3},
+ {"matrix": [2, 5], "x": 6, "y": 3},
+
+ {"matrix": [5, 4], "x": 0, "y": 4},
+ {"matrix": [3, 0], "x": 1, "y": 4},
+ {"matrix": [3, 1], "x": 2, "y": 4},
+ {"matrix": [3, 2], "x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 4, "y": 4},
+ {"matrix": [3, 4], "x": 5, "y": 4},
+ {"matrix": [3, 5], "x": 6, "y": 4},
+
+ {"matrix": [5, 5], "x": 0, "y": 5},
+ {"matrix": [4, 0], "x": 1, "y": 5},
+ {"matrix": [4, 1], "x": 2, "y": 5},
+ {"matrix": [4, 2], "x": 3, "y": 5},
+ {"matrix": [4, 3], "x": 4, "y": 5},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 5}
+ ]
+ }
}
}
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.c b/keyboards/yushakobo/navpad/10/rev1/rev1.c
deleted file mode 100644
index bf47612035..0000000000
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 "rev1.h"
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h
index 50fd54a026..69eca3ef67 100644
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.h
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h
@@ -18,27 +18,4 @@
#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, k14, k15, k16, \
- k20, k21, k22, k23, k24, k25, k26, \
- k33, k34, k35, k36, \
- k40, k41, k42, k43, k44, k45, k46, \
- k50, k51, k52, k53, k54, k55, k56 \
- ) \
- {\
- { k01, k02, k13, k14, k15, k16 }, \
- { k11, k12, k23, k24, k25, k26 }, \
- { k21, k22, k33, k34, k35, k36 }, \
- { k41, k42, k43, k44, k45, k46 }, \
- { k51, k52, k53, k54, k55, k56 }, \
- { k00, k03, k10, k20, k40, k50 } \
- }
+#include "navpad_prefs.h"
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
deleted file mode 100644
index 8be5220d56..0000000000
--- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 "10_helix_r.h"
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h
deleted file mode 100644
index 53e32fd6e9..0000000000
--- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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"
-#include "navpad_prefs.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, k14, k15, k16, R10, R11, R12, R13, R14, R15,\
- k20, k21, k22, k23, k24, k25, k26, R20, R21, R22, R23, R24, R25,\
- k33, k34, k35, k36, R30, R31, R32, R33, R34, R35,\
- k40, k41, k42, k43, k44, k45, k46, R46, R40, R41, R42, R43, R44, R45,\
- k50, k51, k52, k53, k54, k55, k56, R56, R50, R51, R52, R53, R54, R55\
- ) \
- {\
- { k01, k02, k13, k14, k15, k16 }, \
- { k11, k12, k23, k24, k25, k26 }, \
- { k21, k22, k33, k34, k35, k36 }, \
- { k41, k42, k43, k44, k45, k46 }, \
- { k51, k52, k53, k54, k55, k56 }, \
- { k00, k03, k10, k20, k40, k50 }, \
- { R15, R14, R13, R12, R11, R10, KC_NO }, \
- { R25, R24, R23, R22, R21, R20, KC_NO }, \
- { R35, R34, R33, R32, R31, R30, KC_NO }, \
- { R45, R44, R43, R42, R41, R40, R46 }, \
- { R55, R54, R53, R52, R51, R50, R56 } \
- }
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 5b0e667cc9..00a59e57cb 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -17,38 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 }
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7, NO_PIN }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 }
-
#define EE_HANDS
-#ifdef RGB_DI_PIN
-# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \//navpad side
- 9, 10, 11, 12, 13, 14, \//helix side
+# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \
+ 9, 10, 11, 12, 13, 14, \
20, 19, 18, 17, 16, 15, \
21, 22, 23, 24, 25, 26, \
33, 32, 31, 30, 29, 28, 27, \
34, 35, 36, 37, 38, 39, 40 }
-#endif
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 9+32
# define RGBLED_SPLIT { 9, 32 }
# define RGBLIGHT_HUE_STEP 8
@@ -65,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* disable action features */
//#define NO_ACTION_LAYER
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index 19b8c31efb..7e0a3b76c2 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -8,6 +8,11 @@
"pid": "0x0008",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"}
@@ -21,19 +26,100 @@
{"pin_a": "B6", "pin_b": "B5"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ }
}
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "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": 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": 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": 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": 8, "y": 4},{"x": 9, "y": 4},{"x": 10, "y": 4},{"x": 11, "y": 4},{"x": 12, "y": 4},{"x": 13, "y": 4},
- {"x": 0, "y": 5},{"x": 1, "y": 5},{"x": 2, "y": 5},{"x": 3, "y": 5},{"x": 4, "y": 5},{"x": 5, "y": 5},{"x": 6, "y": 5},{"x": 7, "y": 5},{"x": 8, "y": 5},{"x": 9, "y": 5},{"x": 10, "y": 5},{"x": 11, "y": 5},{"x": 12, "y": 5},{"x": 13, "y": 5}
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [5, 1], "x": 3, "y": 0},
+
+ {"matrix": [5, 2], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [0, 2], "x": 3, "y": 1},
+ {"matrix": [0, 3], "x": 4, "y": 1},
+ {"matrix": [0, 4], "x": 5, "y": 1},
+ {"matrix": [0, 5], "x": 6, "y": 1},
+
+ {"matrix": [6, 5], "x": 8, "y": 1},
+ {"matrix": [6, 4], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 0], "x": 13, "y": 1},
+
+ {"matrix": [5, 3], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 3, "y": 2},
+ {"matrix": [1, 3], "x": 4, "y": 2},
+ {"matrix": [1, 4], "x": 5, "y": 2},
+ {"matrix": [1, 5], "x": 6, "y": 2},
+
+ {"matrix": [7, 5], "x": 8, "y": 2},
+ {"matrix": [7, 4], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 0], "x": 13, "y": 2},
+
+ {"matrix": [2, 2], "x": 3, "y": 3},
+ {"matrix": [2, 3], "x": 4, "y": 3},
+ {"matrix": [2, 4], "x": 5, "y": 3},
+ {"matrix": [2, 5], "x": 6, "y": 3},
+
+ {"matrix": [8, 5], "x": 8, "y": 3},
+ {"matrix": [8, 4], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 2], "x": 11, "y": 3},
+ {"matrix": [8, 1], "x": 12, "y": 3},
+ {"matrix": [8, 0], "x": 13, "y": 3},
+
+ {"matrix": [5, 4], "x": 0, "y": 4},
+ {"matrix": [3, 0], "x": 1, "y": 4},
+ {"matrix": [3, 1], "x": 2, "y": 4},
+ {"matrix": [3, 2], "x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 4, "y": 4},
+ {"matrix": [3, 4], "x": 5, "y": 4},
+ {"matrix": [3, 5], "x": 6, "y": 4},
+
+ {"matrix": [9, 6], "x": 7, "y": 4},
+ {"matrix": [9, 5], "x": 8, "y": 4},
+ {"matrix": [9, 4], "x": 9, "y": 4},
+ {"matrix": [9, 3], "x": 10, "y": 4},
+ {"matrix": [9, 2], "x": 11, "y": 4},
+ {"matrix": [9, 1], "x": 12, "y": 4},
+ {"matrix": [9, 0], "x": 13, "y": 4},
+
+ {"matrix": [5, 5], "x": 0, "y": 5},
+ {"matrix": [4, 0], "x": 1, "y": 5},
+ {"matrix": [4, 1], "x": 2, "y": 5},
+ {"matrix": [4, 2], "x": 3, "y": 5},
+ {"matrix": [4, 3], "x": 4, "y": 5},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 5},
+
+ {"matrix": [10, 6], "x": 7, "y": 5},
+ {"matrix": [10, 5], "x": 8, "y": 5},
+ {"matrix": [10, 4], "x": 9, "y": 5},
+ {"matrix": [10, 3], "x": 10, "y": 5},
+ {"matrix": [10, 2], "x": 11, "y": 5},
+ {"matrix": [10, 1], "x": 12, "y": 5},
+ {"matrix": [10, 0], "x": 13, "y": 5}
]
}
}
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
index b4d2122ab4..10ba897cce 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
@@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef RGB_DI_PIN
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
index 58286f73ce..011daf517e 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
@@ -15,6 +15,8 @@
*/
#include QMK_KEYBOARD_H
+#include "navpad_prefs.h"
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] =LAYOUT (
KC_PSCR, KC_SCRL, KC_PAUS, KC_MUTE,
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c
index fd2a7b0789..1ffd441674 100644
--- a/keyboards/yushakobo/navpad/navpad_prefs.c
+++ b/keyboards/yushakobo/navpad/navpad_prefs.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
+#include "navpad_prefs.h"
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) { return false; }