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.h3
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/config.h32
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/info.json7
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/rev0.c17
-rw-r--r--keyboards/yushakobo/navpad/10/rev0/rev0.h2
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/config.h14
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/info.json7
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/rev1.c17
-rw-r--r--keyboards/yushakobo/navpad/10/rev1/rev1.h2
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c17
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/config.h19
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/info.json11
-rw-r--r--keyboards/yushakobo/navpad/navpad_prefs.c2
15 files changed, 28 insertions, 165 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..4a567f22b1 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -17,9 +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
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..76b579338c 100644
--- a/keyboards/yushakobo/navpad/10/rev0/info.json
+++ b/keyboards/yushakobo/navpad/10/rev0/info.json
@@ -1,5 +1,10 @@
{
"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"
}
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..7e2dbab462 100644
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.h
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h
@@ -18,6 +18,8 @@
#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
diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h
index d2e7829323..4c69a35dea 100644
--- a/keyboards/yushakobo/navpad/10/rev1/config.h
+++ b/keyboards/yushakobo/navpad/10/rev1/config.h
@@ -17,20 +17,6 @@ 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..5bf5ce1135 100644
--- a/keyboards/yushakobo/navpad/10/rev1/info.json
+++ b/keyboards/yushakobo/navpad/10/rev1/info.json
@@ -1,5 +1,10 @@
{
"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"
}
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..b56b6f67cf 100644
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.h
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h
@@ -18,6 +18,8 @@
#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
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/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 5b0e667cc9..ae49a16f3b 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -17,22 +17,6 @@ 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
@@ -44,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
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
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index 19b8c31efb..5bc055b381 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,6 +26,12 @@
{"pin_a": "B6", "pin_b": "B5"}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ }
}
},
"processor": "atmega32u4",
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; }