LailaTheElf/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2022-08-21 22:09:30 +00:00
commit e36ae90a65
64 changed files with 152 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyboards/bajjak/config.h
View File

@ -23,12 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x1209
#define PRODUCT_ID 0x0002
#define DEVICE_VER 0x0001
#define PRODUCT BAJJAK
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

8
keyboards/bajjak/info.json
View File

@ -1,6 +1,12 @@
{
"keyboard_name": "bajjak",
"keyboard_name": "BAJJAK",
"manufacturer": "garykong",
"maintainer": "garykong",
"usb": {
"vid": "0x1209",
"pid": "0x0002",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_6x7": {
"layout": [

3
keyboards/dumbpad/v1x/config.h
View File

@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0010
/* Column/Row IO definitions */
#define MATRIX_ROWS 4
#define MATRIX_COLS 5

4
keyboards/handwired/tractyl_manuform/4x6_right/config.h
View File

@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define PRODUCT_ID 0x3537
#define DEVICE_VER 0x0001
#define PRODUCT Tractyl Manuform(4x6)
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10

6
keyboards/handwired/tractyl_manuform/4x6_right/info.json
View File

@ -1,7 +1,11 @@
{
"keyboard_name": "Tractyl Manuform 4x6",
"keyboard_name": "Tractyl Manuform (4x6)",
"url": "",
"maintainer": "drashna",
"usb": {
"pid": "0x3537",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_4x6_right": {
"layout": [

3
keyboards/handwired/tractyl_manuform/5x6_right/config.h
View File

@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define PRODUCT_ID 0x3536
#define DEVICE_VER 0x0001
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 12

2
keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define PRODUCT Tractyl Manuform(5x6) Elite C
// wiring of each half
#define MATRIX_COL_PINS \
{ D4, D7, E6, B4, B5, B7 }

3
keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json Normal file
View File

@ -0,0 +1,3 @@
{
"keyboard_name": "Tractyl Manuform (5x6) Elite-C"
}

2
keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define PRODUCT Tractyl Manuform(5x6) Proton C
// wiring of each half
#define MATRIX_COL_PINS \
{ B0, B1, B2, B3, B4, B5 }

3
keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json Normal file
View File

@ -0,0 +1,3 @@
{
"keyboard_name": "Tractyl Manuform (5x6) Proton-C"
}

2
keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define PRODUCT Tractyl Manuform(5x6) BlackPill
// wiring of each half
#define MATRIX_COL_PINS \
{ A15, B3, B4, B5, B6, B7 }

3
keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json Normal file
View File

@ -0,0 +1,3 @@
{
"keyboard_name": "Tractyl Manuform (5x6) BlackPill"
}

5
keyboards/handwired/tractyl_manuform/5x6_right/info.json
View File

@ -1,6 +1,9 @@
{
"keyboard_name": "Tractyl Manuform 5x6",
"url": "",
"usb": {
"pid": "0x3536",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_5x6_right": {
"layout": [

2
keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define PRODUCT Tractyl Manuform(5x6) Teensy 2.0 ++
// wiring of each half
#define MATRIX_COL_PINS \
{ C0, C1, C2, C3, C4, C5 }

3
keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json Normal file
View File

@ -0,0 +1,3 @@
{
"keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++"
}

3
keyboards/handwired/tractyl_manuform/config.h
View File

@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x44DD
/* disable debug print */
// #define NO_DEBUG

5
keyboards/handwired/tractyl_manuform/info.json
View File

@ -1,4 +1,7 @@
{
"manufacturer": "QMK Community",
"maintainer": "Drashna Jael're"
"maintainer": "Drashna Jael're",
"usb": {
"vid": "0x44DD"
}
}

2
keyboards/kapcave/paladinpad/rev1/config.h
View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define DEVICE_VER 0x0001
/* key matrix pins */
#define MATRIX_ROW_PINS { C7, B6, B4, D7, D6 }
#define MATRIX_COL_PINS { D4, D5, D3, B7 }

2
keyboards/kapcave/paladinpad/rev2/config.h
View File

@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define DEVICE_VER 0x0002
/* key matrix pins */
#define MATRIX_ROW_PINS { F4, F6, D7, B4, D6 }
#define MATRIX_COL_PINS { F7, F5, D3, B7 }

2
keyboards/kin80/blackpill103/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0002
#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS

5
keyboards/kin80/blackpill103/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}

2
keyboards/kin80/blackpill401/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0003
#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS

5
keyboards/kin80/blackpill401/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.3"
}
}

2
keyboards/kin80/blackpill411/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0003
#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS

5
keyboards/kin80/blackpill411/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.3"
}
}

2
keyboards/kin80/micro/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 }
#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 }

5
keyboards/kin80/micro/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}

7
keyboards/kopibeng/xt60_singa/config.h
View File

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4B50 // 'KP' kopibeng
#define PRODUCT_ID 0x0601
#define DEVICE_VER 0x0001
#define MANUFACTURER kopibeng
#define PRODUCT XT60_SINGA
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14

8
keyboards/kopibeng/xt60_singa/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "XT60_SINGA",
"maintainer": "Kopibeng",
"manufacturer": "kopibeng",
"url": "",
"maintainer": "Kopibeng",
"usb": {
"vid": "0x4B50",
"pid": "0x0601",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

4
keyboards/massdrop/alt/config.h
View File

@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEED3
#define DEVICE_VER 0x0101
#define MANUFACTURER "Massdrop Inc."
#define PRODUCT "ALT Keyboard"
#define SERIAL_NUM "Unavailable"

5
keyboards/massdrop/alt/info.json
View File

@ -2,6 +2,11 @@
"keyboard_name": "ALT",
"url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard",
"maintainer": "Massdrop",
"usb": {
"vid": "0x04D8",
"pid": "0xEED3",
"device_version": "1.0.1"
},
"layouts": {
"LAYOUT_65_ansi_blocker": {
"layout": [

4
keyboards/massdrop/ctrl/config.h
View File

@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEED2
#define DEVICE_VER 0x0101
#define MANUFACTURER "Massdrop Inc."
#define PRODUCT "CTRL Keyboard"
#define SERIAL_NUM "Unavailable"

5
keyboards/massdrop/ctrl/info.json
View File

@ -2,6 +2,11 @@
"keyboard_name": "CTRL",
"url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
"maintainer": "Massdrop",
"usb": {
"vid": "0x04D8",
"pid": "0xEED2",
"device_version": "1.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/mechwild/puckbuddy/config.h
View File

@ -5,13 +5,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x6D77 // mw = "MechWild"
#define PRODUCT_ID 0x170F
#define DEVICE_VER 0x0100
#define MANUFACTURER MechWild
#define PRODUCT PuckBuddy
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4

8
keyboards/mechwild/puckbuddy/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "MechWild PuckBuddy",
"keyboard_name": "PuckBuddy",
"manufacturer": "MechWild",
"url": "mechwild.com",
"maintainer": "kylemccreery",
"usb": {
"vid": "0x6D77",
"pid": "0x170F",
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT": {
"layout": [

6
keyboards/minimon/index_tab/config.h
View File

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4B49
#define PRODUCT_ID 0x1306
#define DEVICE_VER 0x0001
#define PRODUCT Index Tab
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 13

6
keyboards/minimon/index_tab/info.json
View File

@ -1,10 +1,14 @@
{
"keyboard_name": "Index Tab",
"maintainer": "kyrremann",
"url": "https://github.com/Kyrremann/index-tab",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_6x13"
},
"usb": {
"vid": "0x4B49",
"pid": "0x1306",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_6x13": {
"layout": [

4
keyboards/tkw/grandiceps/config.h
View File

@ -17,10 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0001
#define PRODUCT Grandiceps Split
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 6

2
keyboards/v4n4g0rth0n/v1/config.h
View File

@ -17,7 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7}
#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, F0}

5
keyboards/v4n4g0rth0n/v1/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}

2
keyboards/v4n4g0rth0n/v2/config.h
View File

@ -17,7 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0002
#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7}
#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, B0}

5
keyboards/v4n4g0rth0n/v2/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}

7
keyboards/vertex/angler2/config.h
View File

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x480E
#define PRODUCT_ID 0x408F
#define DEVICE_VER 0x0001
#define MANUFACTURER Vertex_eason
#define PRODUCT Angler2
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16

8
keyboards/vertex/angler2/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "angler2",
"keyboard_name": "Angler2",
"manufacturer": "Vertex_eason",
"url": "https://github.com/Vertex-kb",
"maintainer": "vertex",
"usb": {
"vid": "0x480E",
"pid": "0x408F",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

3
keyboards/vitamins_included/rev1/config.h
View File

@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
#define SOFT_SERIAL_PIN D0
/* USB Device descriptor parameters */
#define DEVICE_VER 0x0001
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

5
keyboards/vitamins_included/rev1/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}

3
keyboards/vitamins_included/rev2/config.h
View File

@ -24,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SPLIT_HAND_PIN B4
#define SOFT_SERIAL_PIN D0
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0002
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

5
keyboards/vitamins_included/rev2/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}

4
keyboards/xelus/valor_frl_tkl/info.json
View File

@ -1,12 +1,10 @@
{
"keyboard_name": "Valor FRL TKL",
"manufacturer": "Xelus",
"url": "",
"maintainer": "Xelus22",
"usb": {
"vid": "0x5845",
"pid": "0x4654",
"device_version": "0.0.1"
"pid": "0x4654"
},
"layouts": {
"LAYOUT_all": {

6
keyboards/xelus/valor_frl_tkl/rev1/info.json Normal file
View File

@ -0,0 +1,6 @@
{
"keyboard_name": "Valor FRL TKL Rev1",
"usb": {
"device_version": "0.0.1"
}
}

4
keyboards/xelus/valor_frl_tkl/rev2_0/config.h
View File

@ -16,10 +16,6 @@
#pragma once
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0002
#define PRODUCT Xelus Valor FRL TKL Rev2.0
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 17

6
keyboards/xelus/valor_frl_tkl/rev2_0/info.json Normal file
View File

@ -0,0 +1,6 @@
{
"keyboard_name": "Valor FRL TKL Rev2.0",
"usb": {
"device_version": "0.0.2"
}
}

4
keyboards/xelus/valor_frl_tkl/rev2_1/config.h
View File

@ -16,10 +16,6 @@
#pragma once
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0003
#define PRODUCT Xelus Valor FRL TKL Rev2.1
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 17

6
keyboards/xelus/valor_frl_tkl/rev2_1/info.json Normal file
View File

@ -0,0 +1,6 @@
{
"keyboard_name": "Valor FRL TKL Rev2.2",
"usb": {
"device_version": "0.0.3"
}
}

2
keyboards/ymdk/yd60mq/12led/config.h
View File

@ -1,5 +1,3 @@
#pragma once
#define DEVICE_VER 0x0001
#define RGBLED_NUM 12

5
keyboards/ymdk/yd60mq/12led/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}

2
keyboards/ymdk/yd60mq/16led/config.h
View File

@ -1,5 +1,3 @@
#pragma once
#define DEVICE_VER 0x0002
#define RGBLED_NUM 16

5
keyboards/ymdk/yd60mq/16led/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}

1
keyboards/ymdk/ymd75/rev1/config.h
View File

@ -26,4 +26,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
#define BACKLIGHT_PIN D4
#define DIODE_DIRECTION COL2ROW
#define DEVICE_VER 0x0100

5
keyboards/ymdk/ymd75/rev1/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "1.0.0"
}
}

1
keyboards/ymdk/ymd75/rev2/config.h
View File

@ -7,4 +7,3 @@
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
#define BACKLIGHT_PIN D4
#define DIODE_DIRECTION COL2ROW
#define DEVICE_VER 0x0200

5
keyboards/ymdk/ymd75/rev2/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "2.0.0"
}
}

1
keyboards/ymdk/ymd75/rev3/config.h
View File

@ -6,5 +6,4 @@
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
#define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3
#define DIODE_DIRECTION ROW2COL
#define DEVICE_VER 0x0300
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4

5
keyboards/ymdk/ymd75/rev3/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "3.0.0"
}
}