summaryrefslogtreecommitdiff
path: root/keyboards/kinesis
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kinesis')
-rw-r--r--keyboards/kinesis/alvicstep/alvicstep.c2
-rw-r--r--keyboards/kinesis/alvicstep/alvicstep.h9
-rw-r--r--keyboards/kinesis/alvicstep/config.h21
-rw-r--r--keyboards/kinesis/kinesis.c1
-rw-r--r--keyboards/kinesis/kinesis.h26
-rw-r--r--keyboards/kinesis/kint2pp/config.h17
-rw-r--r--keyboards/kinesis/kint2pp/info.json5
-rw-r--r--keyboards/kinesis/kint2pp/kint2pp.c1
-rw-r--r--keyboards/kinesis/kint36/config.h17
-rw-r--r--keyboards/kinesis/kint36/info.json5
-rw-r--r--keyboards/kinesis/kint41/config.h44
-rw-r--r--keyboards/kinesis/kint41/info.json5
-rw-r--r--keyboards/kinesis/kintlc/config.h44
-rw-r--r--keyboards/kinesis/kintlc/info.json5
-rw-r--r--keyboards/kinesis/nguyenvietyen/config.h17
-rw-r--r--keyboards/kinesis/nguyenvietyen/nguyenvietyen.c1
-rw-r--r--keyboards/kinesis/stapelberg/config.h18
-rw-r--r--keyboards/kinesis/stapelberg/info.json5
-rw-r--r--keyboards/kinesis/stapelberg/stapelberg.c1
19 files changed, 34 insertions, 210 deletions
diff --git a/keyboards/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index a2a62df36a..274ac083c5 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -1,4 +1,4 @@
-#include "kinesis.h"
+#include "alvicstep.h"
// begin section origin https://github.com/alvicstep/tmk_keyboard
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 053698770a..3b71e51678 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -1,6 +1,13 @@
#pragma once
-#include "../kinesis.h"
+#include "quantum.h"
+
+void all_led_off(void);
+void all_led_on(void);
+void num_lock_led_on(void);
+void caps_lock_led_on(void);
+void scroll_lock_led_on(void);
+void keypad_led_on(void);
#define ___ KC_NO
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index 905c95a272..bb3357ea57 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -1,26 +1,5 @@
#pragma once
-#include "../config.h"
-
/* key matrix size */
#define MATRIX_ROWS 16
#define MATRIX_COLS 8
-
-/*
- * 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)
- *
-*/
-//Passed through the port multipler, so 4 pins =16
-#define MATRIX_ROW_PINS { F0, F1, F2, F3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-// May be upside down.
-#define MATRIX_COL_PINS { B0,B1, B2, B3, B4, B5, B6, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/kinesis.c b/keyboards/kinesis/kinesis.c
deleted file mode 100644
index 7a6a1be544..0000000000
--- a/keyboards/kinesis/kinesis.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kinesis.h"
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
deleted file mode 100644
index e3345ee27f..0000000000
--- a/keyboards/kinesis/kinesis.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_kinesis_alvicstep)
-# include "alvicstep.h"
-#elif defined(KEYBOARD_kinesis_stapelberg)
-# include "stapelberg.h"
-#elif defined(KEYBOARD_kinesis_kint2pp)
-# include "kint2pp.h"
-#elif defined(KEYBOARD_kinesis_nguyenvietyen)
-# include "nguyenvietyen.h"
-#elif defined(KEYBOARD_kinesis_kint36)
-# include "kint36.h"
-#elif defined(KEYBOARD_kinesis_kint41)
-# include "kint41.h"
-#elif defined(KEYBOARD_kinesis_kintlc)
-# include "kintlc.h"
-#endif
-
-#include "quantum.h"
-
-void all_led_off(void);
-void all_led_on(void);
-void num_lock_led_on(void);
-void caps_lock_led_on(void);
-void scroll_lock_led_on(void);
-void keypad_led_on(void);
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index c9d69dbf48..aa87459cd4 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -1,22 +1,5 @@
#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 { D7, E0, E1, C0, C6, F6, D4, D2, D3, D0, B7, D1, E6, B4, B2 }
-#define MATRIX_COL_PINS { E7, F0, F7, B1, B3, B0, D5 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define IGNORE_MOD_TAP_INTERRUPT
// The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index 9619fe05b6..66d27b5f98 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -6,6 +6,11 @@
"pid": "0x6060",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["E7", "F0", "F7", "B1", "B3", "B0", "D5"],
+ "rows": ["D7", "E0", "E1", "C0", "C6", "F6", "D4", "D2", "D3", "D0", "B7", "D1", "E6", "B4", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C1",
"num_lock": "C5",
diff --git a/keyboards/kinesis/kint2pp/kint2pp.c b/keyboards/kinesis/kint2pp/kint2pp.c
deleted file mode 100644
index 856e29c31e..0000000000
--- a/keyboards/kinesis/kint2pp/kint2pp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kint2pp.h"
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 8837f51ff9..b9bb73219c 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -16,23 +16,6 @@
#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 { D3, C3, C4, C6, D2, B0, D7, A12, A13, B17, B16, D0, B1, C2, D6 }
-#define MATRIX_COL_PINS { B3, D1, C0, D5, C1, B2, D4 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define IGNORE_MOD_TAP_INTERRUPT
// The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 8224abbe98..ac7c0dae98 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -6,6 +6,11 @@
"pid": "0x345C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B3", "D1", "C0", "D5", "C1", "B2", "D4"],
+ "rows": ["D3", "C3", "C4", "C6", "D2", "B0", "D7", "A12", "A13", "B17", "B16", "D0", "B1", "C2", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C7",
"num_lock": "A14",
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 8f29bdc498..152a7d9c9b 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -16,50 +16,6 @@
#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 \
- { \
- LINE_PIN8, /* ROW_EQL */ \
- LINE_PIN9, /* ROW_1 */ \
- LINE_PIN10, /* ROW_2 */ \
- LINE_PIN11, /* ROW_3 */ \
- LINE_PIN7, /* ROW_4 */ \
- LINE_PIN16, /* ROW_5 */ \
- LINE_PIN5, /* ROW_6 */ \
- LINE_PIN3, /* ROW_7 */ \
- LINE_PIN4, /* ROW_8 */ \
- LINE_PIN1, /* ROW_9 */ \
- LINE_PIN0, /* ROW_0 */ \
- LINE_PIN2, /* ROW_MIN */ \
- LINE_PIN17, /* ROW_ESC */ \
- LINE_PIN23, /* ROW_F1 */ \
- LINE_PIN21 /* ROW_F2 */ \
- }
-
-#define MATRIX_COL_PINS \
- { \
- LINE_PIN18, /* COL_0 */ \
- LINE_PIN14, /* COL_1 */ \
- LINE_PIN15, /* COL_2 */ \
- LINE_PIN20, /* COL_3 */ \
- LINE_PIN22, /* COL_4 */ \
- LINE_PIN19, /* COL_5 */ \
- LINE_PIN6 /* COL_6 */ \
- }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define IGNORE_MOD_TAP_INTERRUPT
// The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 716275ad3a..0e25a46739 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -6,6 +6,11 @@
"pid": "0x345C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
+ "rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "LINE_PIN12",
"num_lock": "LINE_PIN26",
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index 1939ac4e57..c1699c2d6d 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -16,50 +16,6 @@
#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 \
- { \
- LINE_PIN8, /* ROW_EQL */ \
- LINE_PIN9, /* ROW_1 */ \
- LINE_PIN10, /* ROW_2 */ \
- LINE_PIN11, /* ROW_3 */ \
- LINE_PIN7, /* ROW_4 */ \
- LINE_PIN16, /* ROW_5 */ \
- LINE_PIN5, /* ROW_6 */ \
- LINE_PIN3, /* ROW_7 */ \
- LINE_PIN4, /* ROW_8 */ \
- LINE_PIN1, /* ROW_9 */ \
- LINE_PIN0, /* ROW_0 */ \
- LINE_PIN2, /* ROW_MIN */ \
- LINE_PIN17, /* ROW_ESC */ \
- LINE_PIN23, /* ROW_F1 */ \
- LINE_PIN21 /* ROW_F2 */ \
- }
-
-#define MATRIX_COL_PINS \
- { \
- LINE_PIN18, /* COL_0 */ \
- LINE_PIN14, /* COL_1 */ \
- LINE_PIN15, /* COL_2 */ \
- LINE_PIN20, /* COL_3 */ \
- LINE_PIN22, /* COL_4 */ \
- LINE_PIN19, /* COL_5 */ \
- LINE_PIN6 /* COL_6 */ \
- }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define IGNORE_MOD_TAP_INTERRUPT
// The Teensy LC power consumption is unknown as per
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index 7309fc778f..2bbbd3eb30 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -6,6 +6,11 @@
"pid": "0x345C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
+ "rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "LINE_PIN12",
"scroll_lock": "LINE_PIN25",
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index c6798eb951..f4d3af8dbd 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -3,20 +3,3 @@
/* key matrix size */
#define MATRIX_ROWS 16
#define MATRIX_COLS 8
-
-/*
- * 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)
- *
- */
-// Passed through the port multipler, so 4 pins =16
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
deleted file mode 100644
index 3f01479389..0000000000
--- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nguyenvietyen.h"
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 6d8c61e8f6..3489b5104b 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -1,23 +1,5 @@
#pragma once
-#include "../config.h"
-
-/*
- * 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, D2, D3, D4, D5, D6, D7, C0, C1, C2, C3, C4, C5, C6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* don't know if this should be defined at the board or top level. Assuming board
#define MOUSEKEY_DELAY 100
#define MOUSEKEY_INTERVAL 20
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index 37f05a49f4..0224dd6393 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -6,6 +6,11 @@
"pid": "0x6060",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
+ "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F3",
"num_lock": "F2",
diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c
deleted file mode 100644
index a69679eef9..0000000000
--- a/keyboards/kinesis/stapelberg/stapelberg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "stapelberg.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 09:56:27 +0000