summaryrefslogtreecommitdiff
path: root/keyboards/input_club
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/input_club')
-rw-r--r--keyboards/input_club/ergodox_infinity/config.h7
-rw-r--r--keyboards/input_club/ergodox_infinity/info.json5
-rw-r--r--keyboards/input_club/infinity60/config.h37
-rw-r--r--keyboards/input_club/infinity60/led/config.h22
-rw-r--r--keyboards/input_club/infinity60/led/info.json7
-rw-r--r--keyboards/input_club/infinity60/rev1/config.h24
-rw-r--r--keyboards/input_club/infinity60/rev1/info.json7
-rw-r--r--keyboards/input_club/k_type/config.h16
-rw-r--r--keyboards/input_club/k_type/info.json5
-rw-r--r--keyboards/input_club/whitefox/config.h16
-rw-r--r--keyboards/input_club/whitefox/info.json5
11 files changed, 29 insertions, 122 deletions
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index fdadcd5642..6ebc0f4083 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -39,13 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
)
-// For some reason, the rows are colums in the schematic, and vice versa
-#define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 }
-#define MATRIX_COL_PINS { D1, D4, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Serial config (for communication between halves) */
#define SERIAL_USART_DRIVER SD1 // Only true for the master half
#define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index 635355d490..c751cfe3f2 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -6,6 +6,11 @@
"pid": "0xB04D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D4", "D5", "D6", "D7"],
+ "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",
diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h
deleted file mode 100644
index c4ec6a4a7d..0000000000
--- a/keyboards/input_club/infinity60/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-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
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
deleted file mode 100644
index 301003e8b9..0000000000
--- a/keyboards/input_club/infinity60/led/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-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
-#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 }
diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/info.json
new file mode 100644
index 0000000000..7a9b924a71
--- /dev/null
+++ b/keyboards/input_club/infinity60/led/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"],
+ "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/input_club/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h
deleted file mode 100644
index 1207dffc78..0000000000
--- a/keyboards/input_club/infinity60/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-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
-#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 }
-
-
diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/info.json
new file mode 100644
index 0000000000..a5afb37751
--- /dev/null
+++ b/keyboards/input_club/infinity60/rev1/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "B16", "B17", "C4", "C5", "D0"],
+ "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index aa7dca86d3..2a4c7d057c 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -18,22 +18,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 { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 }
-#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index 60522333d7..c05785ac69 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -8,6 +8,11 @@
"pid": "0xB04D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"],
+ "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 7567d0ef50..067b7f4e59 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/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 { D0, D1, D4, D5, D6, D7, C1, C2 }
-#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define LED_BRIGHTNESS_LO 100
#define LED_BRIGHTNESS_HI 255
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index 0cd34f8312..80853b4847 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -7,6 +7,11 @@
"pid": "0xB04D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
+ "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 06:33:01 +0000