1
0
Fork 0

Move matrix config to info.json, part 6 (#20019)

This commit is contained in:
Ryan 2023-03-11 00:32:05 +11:00 committed by GitHub
parent 9e64300e67
commit 76cc7fe109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
702 changed files with 1779 additions and 5015 deletions

View file

@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
#define DIODE_DIRECTION ROW2COL
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGB_MATRIX_LED_COUNT 36

View file

@ -8,6 +8,11 @@
"pid": "0x3536",
"device_version": "0.0.3"
},
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"],
"rows": ["B1", "B3", "B2", "B6"]
},
"diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
// #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3435",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -3,12 +3,5 @@
#pragma once
// Wiring pins
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B4 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, F6 }
#define DIODE_DIRECTION COL2ROW
#define EE_HANDS
#define SPLIT_USB_DETECT

View file

@ -8,6 +8,11 @@
"pid": "0x3435",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "F6"],
"rows": ["F7", "B1", "B3", "B2", "B4"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// row-driven
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// row-driven
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3536",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -1,33 +0,0 @@
/*
Copyright 2020 Jan Christoph Ebersbach
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
// left half pro-mirco
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
// // right half adafruit feather
// #define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2 }
// #define MATRIX_ROW_PINS { D6, B7, B6, B5, D7, C6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
// #define RGB_DI_PIN D3
// #define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3536",
"device_version": "0.0.3"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0",
"bootmagic": {

View file

@ -1,30 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert
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
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
// #define RGB_DI_PIN D3
// #define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3536",
"device_version": "0.0.2"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0",
"bootmagic": {

View file

@ -1,24 +0,0 @@
/*
Copyright 2022 fgoodwin <fgoodwin@north-tech.net>
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
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW

View file

@ -8,6 +8,11 @@
"pid": "0x3536",
"device_version": "0.0.3"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D3"
},

View file

@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3537",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -16,11 +16,6 @@
#pragma once
#define MATRIX_ROW_PINS { B12, B13, B14, B15, A8 , A9, A10}
#define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4}
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
// in col2row col is input, and row is output
// #define SPLIT_HAND_MATRIX_GRID A10, A4
// 68kohm

View file

@ -1,4 +1,9 @@
{
"matrix_pins": {
"cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
"rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
},
"diode_direction": "COL2ROW",
"split": {
"bootmagic": {
"matrix": [7, 0]

View file

@ -16,13 +16,6 @@
#pragma once
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -1,4 +1,9 @@
{
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 }
#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

View file

@ -8,6 +8,11 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},

View file

@ -1,39 +1,5 @@
#pragma once
// MCUs are flipped on each side, relative to the shape of the case,
// but for ease of mounting, the pinout is not flipped with the controller.
// The same finger on each hand uses a column connected to the pin with the
// same silk-screen label on each Pro Micro.
// Pin use:
//
// MCU | Silk | DMOTE
// -----+------+----------
// D3 | TX0 |
// D2 | RX1 |
// D1 | 2 | LED strip input (dominant half only)
// D0 | 3 | Serial interface between halves
// D4 | 4 | Outermost pinky-finger column
// C6 | 5 | Column
// D7 | 6 | Column
// E6 | 7 | Column
// B4 | 8 | Column
// B5 | 9 | Outermost index-finger column
// -----+------+----------
// F4 | A3 |
// F5 | A2 |
// F6 | A1 | Top row (furthest from user)
// F7 | A0 | Row
// B1 | 15 | Row
// B3 | 14 | Row
// B2 | 16 | Row
// B6 | 10 | Bottom row (closest to user)
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define DIODE_DIRECTION COL2ROW
// WS2812 RGB LED, normally used to indicate keyboard state:
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2

View file

@ -10,6 +10,11 @@
"pid": "0x3632",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
"soft_serial_pin": "D0"