summaryrefslogtreecommitdiff
path: root/keyboards/sentraq
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/sentraq')
-rw-r--r--keyboards/sentraq/number_pad/config.h19
-rw-r--r--keyboards/sentraq/number_pad/info.json5
-rw-r--r--keyboards/sentraq/number_pad/number_pad.c16
-rw-r--r--keyboards/sentraq/s60_x/default/config.h8
-rw-r--r--keyboards/sentraq/s60_x/default/default.c1
-rw-r--r--keyboards/sentraq/s60_x/default/info.json5
-rw-r--r--keyboards/sentraq/s60_x/rgb/config.h10
-rw-r--r--keyboards/sentraq/s60_x/rgb/info.json5
-rw-r--r--keyboards/sentraq/s60_x/rgb/rgb.c1
-rw-r--r--keyboards/sentraq/s65_plus/config.h8
-rw-r--r--keyboards/sentraq/s65_plus/info.json5
-rw-r--r--keyboards/sentraq/s65_plus/s65_plus.c1
-rw-r--r--keyboards/sentraq/s65_x/config.h8
-rw-r--r--keyboards/sentraq/s65_x/info.json5
-rw-r--r--keyboards/sentraq/s65_x/s65_x.c1
15 files changed, 25 insertions, 73 deletions
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index 0d96be0baf..0d1abf3c24 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -17,25 +17,7 @@ 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 { F5, F0, B5, D6, D4 }
-#define MATRIX_COL_PINS { C7, D5, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 13
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -52,4 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json
index 5b7af3fb0f..a5db65d78b 100644
--- a/keyboards/sentraq/number_pad/info.json
+++ b/keyboards/sentraq/number_pad/info.json
@@ -7,6 +7,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "D5", "D1", "D0"],
+ "rows": ["F5", "F0", "B5", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
diff --git a/keyboards/sentraq/number_pad/number_pad.c b/keyboards/sentraq/number_pad/number_pad.c
deleted file mode 100644
index f323648714..0000000000
--- a/keyboards/sentraq/number_pad/number_pad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 QMK Community
- *
- * 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 "number_pad.h"
diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index 01ce1f2e65..1fa22a6e9d 100644
--- a/keyboards/sentraq/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
@@ -1,19 +1,11 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/sentraq/s60_x/default/default.c b/keyboards/sentraq/s60_x/default/default.c
deleted file mode 100644
index 2a5bcfdd6d..0000000000
--- a/keyboards/sentraq/s60_x/default/default.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "default.h"
diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json
index ae5728a679..78e8827c00 100644
--- a/keyboards/sentraq/s60_x/default/info.json
+++ b/keyboards/sentraq/s60_x/default/info.json
@@ -1,5 +1,10 @@
{
"keyboard_name": "S60-X",
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F1"],
+ "rows": ["B7", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index 2332b484e1..443b6d7649 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -1,21 +1,12 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index 6420a8069a..0c6aba4ac6 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -1,5 +1,10 @@
{
"keyboard_name": "S60-X-RGB",
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
+ "rows": ["B5", "B4", "D7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
diff --git a/keyboards/sentraq/s60_x/rgb/rgb.c b/keyboards/sentraq/s60_x/rgb/rgb.c
deleted file mode 100644
index 0117e14ae5..0000000000
--- a/keyboards/sentraq/s60_x/rgb/rgb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rgb.h"
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 3b8323074f..ea97d48f84 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -1,10 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-
#define RGB_DI_PIN D3
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -22,9 +17,6 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index 3d9f6d1f21..b19bffd207 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"],
+ "rows": ["C7", "C6", "B6", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
diff --git a/keyboards/sentraq/s65_plus/s65_plus.c b/keyboards/sentraq/s65_plus/s65_plus.c
deleted file mode 100644
index 7b20ee0696..0000000000
--- a/keyboards/sentraq/s65_plus/s65_plus.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "s65_plus.h"
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index e8d1cb933d..c4678115db 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -1,10 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-
#define RGB_DI_PIN D3
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -23,9 +18,6 @@
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
#define RGBLIGHT_SLEEP
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json
index a37852080c..0ef809d1fe 100644
--- a/keyboards/sentraq/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"],
+ "rows": ["C7", "C6", "B6", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
diff --git a/keyboards/sentraq/s65_x/s65_x.c b/keyboards/sentraq/s65_x/s65_x.c
deleted file mode 100644
index 09ce310b07..0000000000
--- a/keyboards/sentraq/s65_x/s65_x.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "s65_x.h"