mkbd65/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into xap

Browse source
This commit is contained in:
QMK Bot 2023-03-10 13:40:34 +00:00
commit 81d97fc53d
421 changed files with 1081 additions and 3038 deletions
Download patch file Download diff file Expand all files Collapse all files

8
keyboards/m10a/config.h
View file

@ -18,14 +18,6 @@
#pragma once
/* Planck PCB default pin-out */
#define MATRIX_ROW_PINS { B6, F7, F6, D6 }
#define MATRIX_COL_PINS { F5, F1, F0 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

5
keyboards/m10a/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x00AA",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F5", "F1", "F0"],
"rows": ["B6", "F7", "F6", "D6"]
},
"diode_direction": "ROW2COL",
"backlight": {
"pin": "B7",
"levels": 6

17
keyboards/machine_industries/m4_a/config.h
View file

@ -3,23 +3,6 @@
#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 { C7, C6 }
#define MATRIX_COL_PINS { F6, F7 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

5
keyboards/machine_industries/m4_a/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x004A",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F6", "F7"],
"rows": ["C7", "C6"]
},
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

25
keyboards/machkeyboards/mach3/config.h
View file

@ -1,25 +0,0 @@
/* Copyright 2021 Mach Keyboards
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
/* key pins */
#define MATRIX_ROW_PINS { D1, D0, D4 }
#define MATRIX_COL_PINS { E6, B4, B5 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

5
keyboards/machkeyboards/mach3/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x4D33",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["E6", "B4", "B5"],
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5,

8
keyboards/macro1/config.h
View file

@ -16,14 +16,6 @@
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
#define MATRIX_COL_PINS { D3, D4, D6, D7 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

5
keyboards/macro1/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x9999",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D3", "D4", "D6", "D7"],
"rows": ["E6", "B7", "D0", "D1", "D2", "B3"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F0", "pin_b": "F1"}

9
keyboards/majistic/config.h
View file

@ -18,15 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, F4, F5 } // F4, F5 is dummy
#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS_RIGHT { B6, B2, B3, B1, F7, F6, F5, F4 }
/* 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 */

13
keyboards/majistic/info.json
View file

@ -8,8 +8,19 @@
"pid": "0x6E55",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
"rows": ["F6", "F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
}
},
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",

7
keyboards/makrosu/config.h
View file

@ -16,14 +16,7 @@
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { B6 }
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}
#define TAP_CODE_DELAY 10
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

5
keyboards/makrosu/info.json
View file

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

6
keyboards/malevolti/lyra/rev1/config.h
View file

@ -15,10 +15,4 @@
*/
#pragma once
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
#define DIODE_DIRECTION COL2ROW
#define TAPPING_TERM 100

5
keyboards/malevolti/lyra/rev1/info.json
View file

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

6
keyboards/malevolti/superlyra/rev1/config.h
View file

@ -15,10 +15,4 @@
*/
#pragma once
// wiring of each half
#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
#define DIODE_DIRECTION COL2ROW
#define TAPPING_TERM 100

5
keyboards/malevolti/superlyra/rev1/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x4C53",
"device_version": "30.3.1"
},
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
"rows": ["B7", "B3", "B2", "B1", "B0"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {

17
keyboards/manta60/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 { D4, C6, D7, E6 ,B4}
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define SELECT_SOFT_SERIAL_SPEED 1
#define RGB_DI_PIN D3

5
keyboards/manta60/info.json
View file

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

7
keyboards/manyboard/macro/config.h
View file

@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
#define MATRIX_COL_PINS { D4, D5, D6, D7 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL
/* RGB Pins */
#define RGB_DI_PIN B6
#define RGBLED_NUM 2

5
keyboards/manyboard/macro/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x0015",
"device_version": "1.0.3"
},
"matrix_pins": {
"cols": ["D4", "D5", "D6", "D7"],
"rows": ["D0", "D1", "D2", "D3"]
},
"diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "C7"}

Some files were not shown because too many files have changed in this diff Show more