Move matrix config to info.json, part 1 (#19985)

This commit is contained in:
Ryan 2023-03-06 09:53:52 +11:00 committed by GitHub
parent b34d51d08d
commit 23c365b023
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
502 changed files with 1299 additions and 3461 deletions

View file

@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 9

View file

@ -1,32 +0,0 @@
/*
Copyright 2021 yushakobo
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
*
* 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 { D4, C6, D7, E6, B4, D0 }
#define MATRIX_COL_PINS { F4, F5, F6, B2, B3, B1, F7 }

View file

@ -1,5 +1,10 @@
{
"usb": {
"device_version": "0.0.0"
}
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"],
"rows": ["D4", "C6", "D7", "E6", "B4", "D0"]
},
"diode_direction": "COL2ROW"
}

View file

@ -17,20 +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 { D4, C6, D7, E6, B4, F4 }
#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7 }
#ifdef RGB_DI_PIN
# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }
#endif

View file

@ -1,5 +1,10 @@
{
"usb": {
"device_version": "0.0.1"
}
},
"matrix_pins": {
"cols": ["F5", "F6", "B2", "B3", "B1", "F7"],
"rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
},
"diode_direction": "COL2ROW"
}

View file

@ -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 { D4, C6, D7, E6, B4, F4 }
#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7, NO_PIN }
#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 }
#define EE_HANDS
#ifdef RGB_DI_PIN
@ -44,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34, 35, 36, 37, 38, 39, 40 }
#endif
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 9+32

View file

@ -8,6 +8,11 @@
"pid": "0x0008",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
"rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"}
@ -21,6 +26,12 @@
{"pin_a": "B6", "pin_b": "B5"}
]
}
},
"matrix_pins": {
"right": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
}
}
},
"processor": "atmega32u4",

View file

@ -17,23 +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 { F4, B3, B6 }
#define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D2
#define RGBLED_NUM 18

View file

@ -8,6 +8,11 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
"rows": ["F4", "B3", "B6"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}