Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matrix consistency improvements #13471

Merged
merged 1 commit into from
Jul 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/aeboards/constellation/rev2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
#define MATRIX_COLS 14

/* key matrix pins */
#define MATRIX_ROW_PINS { B15, A14, A2, B13, B14 }
Expand Down
2 changes: 1 addition & 1 deletion keyboards/ai03/voyager60_alps/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT Voyager60-Alps

#define MATRIX_ROWS 5
#define MATRIX_COLS 15
#define MATRIX_COLS 14

#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
Expand Down
2 changes: 1 addition & 1 deletion keyboards/boardsource/3x4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define MATRIX_ROWS 3
#define MATRIX_COLS 4

#define MATRIX_ROW_PINS { F7, F6, F5,}
#define MATRIX_ROW_PINS {F7, F6, F5}
#define MATRIX_COL_PINS {B6, B2, B3, B1}

#define DIODE_DIRECTION COL2ROW
Expand Down
4 changes: 2 additions & 2 deletions keyboards/boardsource/the_mark/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

#define MATRIX_ROW_PINS {B0, B1, B2, B3, B4,}
#define MATRIX_COL_PINS { B5, B6, B7, F5, C7, D0, D1, D2, D3, D4, D5, D6, D7,F0, F1, F4}
#define MATRIX_ROW_PINS {B0, B1, B2, B3, B4}
#define MATRIX_COL_PINS {B5, B6, B7, F5, C7, D0, D1, D2, D3, D4, D5, D6, D7,F0, F1, F4}
#define UNUSED_PINS

/* COL2ROW, ROW2COL */
Expand Down
2 changes: 1 addition & 1 deletion keyboards/converter/ibm_5291/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER QMK
#define PRODUCT 5291 keyboard converter

#define MATRIX_ROWS 24
#define MATRIX_ROWS 5
#define MATRIX_COLS 4

#define MATRIX_ROW_PINS {B2, B3, B4, B5, B6}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/converter/siemens_tastatur/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT Siemens Tastatur

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_ROWS 5
#define MATRIX_COLS 19

//This is all fake and not used
#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 }
#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
#define DIODE_DIRECTION COL2ROW

Expand Down
2 changes: 1 addition & 1 deletion keyboards/coseyfannitutti/mulletpad/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#define MATRIX_ROW_PINS { F4, F1, F5, F6, F7 }
#define MATRIX_COL_PINS { F0, C7, C6, B6, }
#define MATRIX_COL_PINS { F0, C7, C6, B6 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL */
Expand Down
2 changes: 1 addition & 1 deletion keyboards/dc01/left/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6 }
#define MATRIX_COL_PINS { F4, F1, F0, F7, F6, F5 }
#define MATRIX_COL_PINS { F4, F1, F0, F7, F6, F5, NO_PIN, NO_PIN, NO_PIN, 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 UNUSED_PINS

#define F_SCL 350000UL
Expand Down
4 changes: 2 additions & 2 deletions keyboards/ggkeyboards/genesis/hotswap/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#define PRODUCT Genesis

/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_ROWS 6
#define MATRIX_COLS 18

/*
Expand All @@ -46,4 +46,4 @@


// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
// https://noroadsleft.github.io/kbf_qmk_converter/
4 changes: 2 additions & 2 deletions keyboards/ggkeyboards/genesis/solder/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#define PRODUCT Genesis

/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_ROWS 6
#define MATRIX_COLS 18

/*
Expand All @@ -46,4 +46,4 @@


// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
// https://noroadsleft.github.io/kbf_qmk_converter/
2 changes: 1 addition & 1 deletion keyboards/handwired/promethium/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* key matrix size */
#define MATRIX_COLS 6
#define MATRIX_ROWS 9
#define MATRIX_ROWS 3

/* default pin-out */
#define MATRIX_COL_PINS { F4, F1, F0, D6, D0, D1 }
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/swiftrax/astro65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT Astro65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
#define MATRIX_COLS 15

// ROWS: Top to bottom, COLS: Left to right

Expand Down
2 changes: 1 addition & 1 deletion keyboards/kinesis/alvicstep/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*
*/
//Passed through the port multipler, so 4 pins =16
#define MATRIX_ROW_PINS { F0,F1, F2, F3 }
#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 }
Expand Down
2 changes: 1 addition & 1 deletion keyboards/kinesis/kint41/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
LINE_PIN2, /* ROW_MIN */ \
LINE_PIN17, /* ROW_ESC */ \
LINE_PIN23, /* ROW_F1 */ \
LINE_PIN21, /* ROW_F2 */ \
LINE_PIN21 /* ROW_F2 */ \
}

#define MATRIX_COL_PINS \
Expand Down
2 changes: 1 addition & 1 deletion keyboards/kinesis/nguyenvietyen/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/
// Passed through the port multipler, so 4 pins =16
#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
#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 }
#define UNUSED_PINS

Expand Down
2 changes: 1 addition & 1 deletion keyboards/kmac/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS \
{ D0, D1, D2, D3, D5, B7 }
#define MATRIX_COL_PINS \
{ B6, C6, C7, F1, F0, B5 }
{ B6, C6, C7, F1, F0, B5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
#define UNUSED_PINS

/* COL2ROW, ROW2COL*/
Expand Down
2 changes: 1 addition & 1 deletion keyboards/lizard_trick/tenkey_plusplus/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

#define MATRIX_ROW_PINS { B7, D4, B5, B6, C6, C7, }
#define MATRIX_ROW_PINS { B7, D4, B5, B6, C6, C7 }
#define MATRIX_COL_PINS { D5, D3, D2, F7 }
#define UNUSED_PINS

Expand Down
4 changes: 2 additions & 2 deletions keyboards/mechlovin/tmkl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { A8, A4, A5, A3, A2, A1, }
#define MATRIX_ROW_PINS { A8, A4, A5, A3, A2, A1 }
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 }

#define DIODE_DIRECTION COL2ROW
Expand All @@ -58,4 +58,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_CAPS_LOCK_PIN B9

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_SUPPORT_ENABLE
2 changes: 1 addition & 1 deletion keyboards/meira/featherble/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_ROW_PINS { F7, F6, F5, F4 }
// Column pins to demux in LSB order
#define MATRIX_COL_PINS { C7, B7, B6, C6 }
#define MATRIX_COL_PINS { C7, B7, B6, C6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
#define LED_EN_PIN D2
#define UNUSED_PINS

Expand Down
2 changes: 1 addition & 1 deletion keyboards/meira/promicro/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_ROW_PINS { F7, F6, F5, F4 }
// Column pins to demux in LSB order
#define MATRIX_COL_PINS { B1, B3, B2, B6 }
#define MATRIX_COL_PINS { B1, B3, B2, B6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
#define LED_EN_PIN D2
#define UNUSED_PINS

Expand Down
4 changes: 2 additions & 2 deletions keyboards/orthodox/rev3/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// wiring of each half

//REV.3 PRO MICRO
#define MATRIX_ROW_PINS { D2, B4, B5, }
#define MATRIX_ROW_PINS { D2, B4, B5 }
#define MATRIX_COL_PINS { D7, F4, F5, B6, B2, B3, B1, F7, F6 }

/*/
//REV.3 TEENSY
#define MATRIX_ROW_PINS { B0, C6, C7, }
#define MATRIX_ROW_PINS { B0, C6, C7 }
#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
/*/

Expand Down
2 changes: 1 addition & 1 deletion keyboards/orthodox/rev3_teensy/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// wiring of each half

//REV.3 TEENSY
#define MATRIX_ROW_PINS { B0, C6, C7, }
#define MATRIX_ROW_PINS { B0, C6, C7 }
#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }

/* COL2ROW or ROW2COL */
Expand Down