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

This commit is contained in:
QMK Bot
2022-07-27 19:19:51 +00:00
84 changed files with 271 additions and 315 deletions

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 0x7353
#define PRODUCT_ID 0x0160
#define DEVICE_VER 0x0001
#define MANUFACTURER Evyd13
#define PRODUCT Lex60
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Gami Studio Lex60",
"keyboard_name": "Lex60",
"manufacturer": "Evyd13",
"url": "",
"maintainer": "GamiStudio",
"usb": {
"vid": "0x7353",
"pid": "0x0160",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -2,12 +2,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT Butter Stick
#define VERSION "Paula Deen"
#define DEBOUNCE 5

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Butter Stick",
"manufacturer": "g Heavy Industries",
"url": "",
"maintainer": "germ",
"usb": {
"vid": "0xFEED",
"pid": "0x1337",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_butter": {
"layout": [

View File

@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VERBOSE
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT ErgoTaco
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "ErgoTaco",
"manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
"maintainer": "germ",
"usb": {
"vid": "0xFEED",
"pid": "0x1337",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -30,13 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define NO_ACTION_ONESHOT
#define IGNORE_MOD_TAP_INTERRUPT
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1337
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT Georgi
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Georgi",
"manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
"maintainer": "germ",
"usb": {
"vid": "0xFEED",
"pid": "0x1337",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_georgi": {
"layout": [

View File

@ -35,13 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VERBOSE
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1307
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT Gergo
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

View File

@ -1,7 +1,13 @@
{
"maintainer": "germ",
"keyboard_name": "Gergo",
"manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
"maintainer": "germ",
"usb": {
"vid": "0xFEED",
"pid": "0x1307",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_gergo": {
"layout": [

View File

@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x6B0A
#define PRODUCT_ID 0x0002
#define DEVICE_VER 0x0001
#define MANUFACTURER g Heavy Industries
#define PRODUCT GergoPlex
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "GergoPlex",
"manufacturer": "g Heavy Industries",
"url": "",
"maintainer": "germ",
"usb": {
"vid": "0x6B0A",
"pid": "0x0002",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [

View File

@ -15,13 +15,6 @@
*/
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x0483
#define PRODUCT_ID 0xA372
#define DEVICE_VER 0x0002
#define MANUFACTURER GeekBoards
#define PRODUCT Macropad v2
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "macropad_v2",
"keyboard_name": "Macropad v2",
"manufacturer": "GeebBoards",
"url": "https://geekboards.ru/",
"maintainer": "ruddy17",
"usb": {
"vid": "0x0483",
"pid": "0xA372",
"device_version": "0.0.2"
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -2,14 +2,6 @@
#include "config_common.h"
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1319
#define DEVICE_VER 0x0001
#define MANUFACTURER Geekboards
#define PRODUCT Geekboards Tester
#define MATRIX_ROWS 2
#define MATRIX_COLS 4

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Geekboards 8-keys macropad",
"keyboard_name": "Tester",
"manufacturer": "Geekboards",
"url": "",
"maintainer": "moyi4681",
"usb": {
"vid": "0xFEED",
"pid": "0x1319",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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 0x6770 // gp generic_panda
#define PRODUCT_ID 0x6501 // 65_01
#define DEVICE_VER 0x0001
#define MANUFACTURER generic_panda
#define PRODUCT panda65_01
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Panda65_01",
"manufacturer": "generic_panda",
"url": "https://github.com/JesseLeung97/qmk_firmware/tree/master/keyboards/generic_panda/panda65_01",
"maintainer": "generic_panda",
"usb": {
"vid": "0x6770",
"pid": "0x6501",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_bs": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"LShift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"FN", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}]

View File

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x2222
#define DEVICE_VER 0x0001
#define MANUFACTURER GEN ONE LLC
#define PRODUCT Eclipse65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "eclipse_65",
"keyboard_name": "Eclipse65",
"manufacturer": "GEN ONE LLC",
"url": "https://genonemerch.com",
"maintainer": "rojasa1990",
"usb": {
"vid": "0xFEED",
"pid": "0x2222",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_65_ansi": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

View File

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xE720 // GEN ONE
#define PRODUCT_ID 0x0001 // G1_65
#define DEVICE_VER 0x0001
#define MANUFACTURER GEN ONE LLC
#define PRODUCT G1_65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "G1_65",
"manufacturer": "GEN ONE LLC",
"url": "https://genonemerch.com",
"maintainer": "rojasa1990",
"usb": {
"vid": "0xE720",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_65_ansi": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

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 0x00FA
#define PRODUCT_ID 0x2020
#define DEVICE_VER 0x0001
#define MANUFACTURER JJ48_24 & Omar Afzal
#define PRODUCT Gentleman 65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16

View File

@ -1,7 +1,13 @@
{
"name": "The Gentleman 65",
"name": "Gentleman 65",
"manufacturer": "JJ48_24 & Omar Afzal",
"url": "https://jkeys.design/products/gentleman-65",
"maintainer": "0marA",
"usb": {
"vid": "0x00FA",
"pid": "0x2020",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

View File

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xBB00
#define PRODUCT_ID 0xD4D3
#define DEVICE_VER 0x0001
#define MANUFACTURER GG Keyboards
#define PRODUCT Genesis Hotswap
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 18

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Genesis Hotswap",
"manufacturer": "GG Keyboards",
"url": "",
"maintainer": "Spooknik",
"usb": {
"vid": "0xBB00",
"pid": "0xD4D3",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_tkl_ansi"
},

View File

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xBB00
#define PRODUCT_ID 0xD4D2
#define DEVICE_VER 0x0001
#define MANUFACTURER GG Keyboards
#define PRODUCT Genesis Solder
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 18

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Genesis Solder",
"manufacturer": "GG Keyboards",
"url": "",
"maintainer": "Spooknik",
"usb": {
"vid": "0xBB00",
"pid": "0xD4D2",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},

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 0x4335 // GEEKhack
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER geekhack
#define PRODUCT GH60 Rev C
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14

View File

@ -1,7 +1,13 @@
{
"keyboard_name": "GH60 Rev C",
"manufacturer": "geekhack",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x4335",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

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