1
0
Fork 0

first pass: matrix consistency improvements (#13471)

This commit is contained in:
Zach White 2021-07-11 08:41:57 -07:00 committed by GitHub
parent 5a50a28962
commit adf0d70da4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 28 additions and 28 deletions

View file

@ -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 }

View file

@ -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}

View file

@ -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

View file

@ -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 */

View file

@ -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}

View file

@ -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

View file

@ -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 */

View file

@ -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

View file

@ -26,7 +26,7 @@
#define PRODUCT Genesis
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
/*
@ -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/

View file

@ -26,7 +26,7 @@
#define PRODUCT Genesis
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
/*
@ -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/

View file

@ -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 }

View file

@ -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

View file

@ -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 }

View file

@ -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 \

View file

@ -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

View file

@ -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*/

View file

@ -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

View file

@ -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
@ -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

View file

@ -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

View file

@ -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

View file

@ -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 }
/*/

View file

@ -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 */