drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-07-27 19:19:51 +00:00
commit ed5351d75e
84 changed files with 271 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

6
keyboards/gboards/butterstick/config.h
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

6
keyboards/gboards/butterstick/info.json
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": [

7
keyboards/gboards/ergotaco/config.h
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)

6
keyboards/gboards/ergotaco/info.json
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": [

7
keyboards/gboards/georgi/config.h
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)

6
keyboards/gboards/georgi/info.json
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": [

7
keyboards/gboards/gergo/config.h
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)

8
keyboards/gboards/gergo/info.json
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": [

7
keyboards/gboards/gergoplex/config.h
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)

6
keyboards/gboards/gergoplex/info.json
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": [