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-03 07:17:10 +00:00
commit 5a166ff290
327 changed files with 1042 additions and 1214 deletions
Download patch file Download diff file Expand all files Collapse all files

7
keyboards/m10a/config.h
View file

@ -20,13 +20,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x5241 // "RA"
#define PRODUCT_ID 0x00AA // 10-A
#define DEVICE_VER 0x0001
#define MANUFACTURER RAMA WORKS
#define PRODUCT RAMA WORKS M10-A
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 3

8
keyboards/m10a/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Rama Works X Machine Industries M10-A Macropad",
"keyboard_name": "M10-A",
"manufacturer": "RAMA WORKS",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x5241",
"pid": "0x00AA",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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

@ -5,13 +5,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x5241 // "RA"
#define PRODUCT_ID 0x004A // 4-A
#define DEVICE_VER 0x0001
#define MANUFACTURER RAMA WORKS
#define PRODUCT M4-A
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 2

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

@ -1,7 +1,13 @@
{
"keyboard_name": "Rama Works M4-A",
"keyboard_name": "M4-A",
"manufacturer": "RAMA WORKS",
"url": "http://rama.works",
"maintainer": "naut",
"usb": {
"vid": "0x5241",
"pid": "0x004A",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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

@ -18,13 +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 0x4D41
#define PRODUCT_ID 0x4D33
#define DEVICE_VER 0x0001
#define MANUFACTURER MachKeyboard
#define PRODUCT Mach33
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3

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

@ -1,7 +1,13 @@
{
"keyboard_name": "Mach 3",
"manufacturer": "MachKeyboard",
"url": "https://machkeyboards.com",
"maintainer": "etiennelepagel",
"usb": {
"vid": "0x4D41",
"pid": "0x4D33",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_3x3": {
"layout": [

7
keyboards/macro1/config.h
View file

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4C50 // "LP" = Laneware Peripherals
#define PRODUCT_ID 0x9999
#define DEVICE_VER 0x0001
#define MANUFACTURER Laneware Peripherals
#define PRODUCT MACRO-1
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 4

8
keyboards/macro1/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "MACRO1",
"keyboard_name": "MACRO-1",
"manufacturer": "Laneware Peripherals",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x4C50",
"pid": "0x9999",
"device_version": "0.0.1"
},
"layouts":{
"LAYOUT_numpad":{
"layout":[

7
keyboards/macro3/config.h
View file

@ -6,13 +6,6 @@
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC88B
#define PRODUCT_ID 0x3388
#define DEVICE_VER 0x0003
#define MANUFACTURER DPB
#define PRODUCT Macro3
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4

6
keyboards/macro3/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Macro3",
"manufacturer": "DPB",
"url": "https://github.com/davidphilipbarr/Macropads/tree/main/macro3",
"maintainer": "@davidphilipbarr",
"usb": {
"vid": "0xC88B",
"pid": "0x3388",
"device_version": "0.0.3"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/majistic/config.h
View file

@ -20,13 +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 0xFEED
#define PRODUCT_ID 0x6E55
#define DEVICE_VER 0x0001
#define MANUFACTURER yossiyossy
#define PRODUCT maJIStic
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8

6
keyboards/majistic/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "maJIStic",
"manufacturer": "yossiyossy",
"url": "https://github.com/yossiyossy/maJIStic",
"maintainer": "yossiyossy",
"usb": {
"vid": "0xFEED",
"pid": "0x6E55",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/makrosu/config.h
View file

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xAB69
#define PRODUCT_ID 0x8585
#define DEVICE_VER 0x0001
#define MANUFACTURER valdydesu_
#define PRODUCT makrosu
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 6

6
keyboards/makrosu/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "MakrOSU",
"manufacturer": "Valdydesu_",
"url": "",
"maintainer": "Valdydesu_",
"usb": {
"vid": "0xAB69",
"pid": "0x8585",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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

@ -15,13 +15,6 @@
*/
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4443 //DC
#define PRODUCT_ID 0x4C43 //LC
#define DEVICE_VER 0x3031 //01
#define MANUFACTURER Dom
#define PRODUCT Lyra
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10

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

@ -1,7 +1,13 @@
{
"keyboard_name": "lyra",
"keyboard_name": "Lyra",
"manufacturer": "Dom",
"url": "",
"maintainer": "malevolti",
"usb": {
"vid": "0x4443",
"pid": "0x4C43",
"device_version": "30.3.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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

@ -15,13 +15,6 @@
*/
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4443 //DC
#define PRODUCT_ID 0x4C53 //LS
#define DEVICE_VER 0x3031 //01
#define MANUFACTURER Dom
#define PRODUCT SuperLyra
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 18

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

@ -1,7 +1,13 @@
{
"keyboard_name": "superlyra",
"keyboard_name": "SuperLyra",
"manufacturer": "Dom",
"url": "",
"maintainer": "malevolti",
"usb": {
"vid": "0x4443",
"pid": "0x4C53",
"device_version": "30.3.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/manta60/config.h
View file

@ -19,13 +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 0x991D
#define DEVICE_VER 0x0001
#define MANUFACTURER kamonanban
#define PRODUCT manta60
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 7

6
keyboards/manta60/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "manta60",
"manufacturer": "kamonanban",
"url": "https://github.com/KamoNanban",
"maintainer": "kamonanban",
"usb": {
"vid": "0xFEED",
"pid": "0x991D",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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