drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Move matrix config to info.json, part 7 (#20020)

Browse source
This commit is contained in:
Ryan 2023-03-11 00:39:56 +11:00 • committed by GitHub
parent ace372d90d
commit caa8c81086
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
421 changed files with 1081 additions and 3038 deletions
Download patch file Download diff file Expand all files Collapse all files

24
keyboards/merge/iso_macro/config.h
View file

@ -1,24 +0,0 @@
/* Copyright 2021 duoshock
*
* 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
#define MATRIX_ROW_PINS { F4, F5, F6}
#define MATRIX_COL_PINS { B4, B5, B6}
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

5
keyboards/merge/iso_macro/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x1200",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B4", "B5", "B6"],
"rows": ["F4", "F5", "F6"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F0", "pin_b": "F1"},

6
keyboards/merge/uc1/config.h
View file

@ -16,9 +16,6 @@
#pragma once
#define MATRIX_ROW_PINS { B1, B2 }
#define MATRIX_COL_PINS { B3, B4 }
#define RGB_DI_PIN B5
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
@ -36,6 +33,3 @@
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_SLEEP
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

5
keyboards/merge/uc1/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x5543",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B3", "B4"],
"rows": ["B1", "B2"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}

6
keyboards/merge/um70/config.h
View file

@ -16,12 +16,6 @@
#pragma once
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define SPLIT_USB_DETECT
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE

5
keyboards/merge/um70/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x3222",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}

6
keyboards/merge/um80/config.h
View file

@ -16,12 +16,6 @@
#pragma once
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define SPLIT_USB_DETECT
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE

5
keyboards/merge/um80/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x3241",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
"rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}

6
keyboards/merge/uma/config.h
View file

@ -16,11 +16,5 @@
#pragma once
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define SPLIT_USB_DETECT
#define SPLIT_MODS_ENABLE

5
keyboards/merge/uma/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x3232",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "C6"
},