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 2022-08-14 08:55:12 +00:00
commit 38ac75cfff
145 changed files with 789 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

7
keyboards/basekeys/slice/rev1/config.h
View file

@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEC17
#define DEVICE_VER 0x0002
#define MANUFACTURER 2Moons
#define PRODUCT Slice
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9

8
keyboards/basekeys/slice/rev1/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "slice",
"keyboard_name": "Slice",
"manufacturer": "2Moons",
"url": "https://www.basekeys.com",
"maintainer": "2Moons",
"usb": {
"vid": "0x04D8",
"pid": "0xEC17",
"device_version": "0.0.2"
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.6600000000000001, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.3900000000000001, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]

7
keyboards/basekeys/slice/rev1_rgb/config.h
View file

@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEC15
#define DEVICE_VER 0x0002
#define MANUFACTURER 2Moons
#define PRODUCT Slice RGB
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 9

8
keyboards/basekeys/slice/rev1_rgb/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "slice",
"keyboard_name": "Slice RGB",
"manufacturer": "2Moons",
"url": "https://www.basekeys.com",
"maintainer": "2Moons",
"usb": {
"vid": "0x04D8",
"pid": "0xEC15",
"device_version": "0.0.2"
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]

2
keyboards/bastardkb/charybdis/3x5/config.h
View file

@ -18,8 +18,6 @@
#pragma once
#include "config_common.h"
/* Key matrix configuration. */
#define MATRIX_ROWS 8 // Rows are doubled-up.
#define MATRIX_COLS 5

2
keyboards/bastardkb/charybdis/3x5/info.json
View file

@ -1,6 +1,8 @@
{
"url": "https://bastardkb.com/charybdis-nano",
"manufacturer": "Bastard Keyboards",
"usb": {
"vid": "0xA8F8",
"pid": "0x1832",
},
"layouts": {

2
keyboards/bastardkb/charybdis/4x6/config.h
View file

@ -18,8 +18,6 @@
#pragma once
#include "config_common.h"
/* Key matrix configuration. */
#define MATRIX_ROWS 10 // Rows are doubled-up.
#define MATRIX_COLS 6

2
keyboards/bastardkb/charybdis/4x6/info.json
View file

@ -1,6 +1,8 @@
{
"url": "https://bastardkb.com/charybdis",
"manufacturer": "Bastard Keyboards",
"usb": {
"vid": "0xA8F8",
"pid": "0x1833",
},
"layouts": {

6
keyboards/bear_face/config.h
View file

@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x09f5
#define MANUFACTURER chemicalwill
#define PRODUCT bear_face
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15

10
keyboards/bear_face/info.json Normal file
View file

@ -0,0 +1,10 @@
{
"keyboard_name": "bear_face",
"manufacturer": "chemicalwill",
"url": "https://github.com/chemicalwill/bear_face_pcb",
"maintainer": "chemicalwill",
"usb": {
"vid": "0xFEED",
"pid": "0x09F5"
}
}

19
keyboards/bear_face/v1/config.h
View file

@ -1,19 +0,0 @@
/*
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
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/>.
*/
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0100

6
keyboards/bear_face/v1/info.json
View file

@ -1,7 +1,7 @@
{
"keyboard_name": "bear_face",
"url": "https://github.com/chemicalwill/bear_face_pcb",
"maintainer": "chemicalwill",
"usb": {
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT_83_ansi": {
"layout": [

19
keyboards/bear_face/v2/config.h
View file

@ -1,19 +0,0 @@
/*
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
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/>.
*/
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0200

6
keyboards/bear_face/v2/info.json
View file

@ -1,7 +1,7 @@
{
"keyboard_name": "bear_face",
"url": "https://github.com/chemicalwill/bear_face_pcb",
"maintainer": "chemicalwill",
"usb": {
"device_version": "2.0.0"
},
"layouts": {
"LAYOUT_83_ansi": {
"layout": [

6
keyboards/bemeier/bmek/config.h
View file

@ -17,12 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x626D // BeMeier
#define PRODUCT_ID 0x656B // ErgonomicKeyboard
#define MANUFACTURER Bemeier
#define PRODUCT BMEK
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20

7
keyboards/bemeier/bmek/info.json
View file

@ -1,7 +1,12 @@
{
"keyboard_name": "bmek",
"keyboard_name": "BMEK",
"manufacturer": "Bemeier",
"url": "https://github.com/Bemeier/bmek",
"maintainer": "Bemeier",
"usb": {
"vid": "0x626D",
"pid": "0x656B"
},
"layouts": {
"LAYOUT_all": {
"layout": [

2
keyboards/bemeier/bmek/rev1/config.h
View file

@ -17,8 +17,6 @@
#include "config_common.h"
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS \
{ D4, D7, B6, B4, B7 }
#define MATRIX_COL_PINS \

5
keyboards/bemeier/bmek/rev1/info.json Normal file
View file

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

2
keyboards/bemeier/bmek/rev2/config.h
View file

@ -17,8 +17,6 @@
#include "config_common.h"
#define DEVICE_VER 0x0002
#define MATRIX_ROW_PINS \
{ F4, F5, D7, B5, B4 }
#define MATRIX_COL_PINS \

5
keyboards/bemeier/bmek/rev2/info.json Normal file
View file

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

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