ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

16
keyboards/chlx/merro60/config.h
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, D5, D3, B5, F4 }
#define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, D6 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

5
keyboards/chlx/merro60/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x0601",
"device_version": "1.0.0"
},
"matrix_pins": {
"cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"],
"rows": ["D4", "D5", "D3", "B5", "F4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {

17
keyboards/chlx/str_merro60/config.h
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 { C6, C7, F7, F6, F5, F4, F1, F0, B3, B7 }
#define MATRIX_COL_PINS { D0, D1, D2, E6, B0, B1, B2 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION ROW2COL
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING

5
keyboards/chlx/str_merro60/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x0602",
"device_version": "1.0.0"
},
"matrix_pins": {
"cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"],
"rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"]
},
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {