sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fauxpark
2022-08-15 17:54:07 +10:00
parent 8e9ee29fe3 51d5aad25b
commit c202602938
170 changed files with 508 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keyboards/ergodox_ez/base/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"keyboard_name": "ErgoDox EZ",
"usb": {
"pid": "0x4974"
}
}

0
keyboards/ergodox_ez/base/rules.mk Normal file
View File

7
keyboards/ergodox_ez/config.h
View File

@@ -22,13 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x3297
#define DEVICE_VER 0x0001
#define MANUFACTURER ZSA Technology Labs
#define PRODUCT_ID 0x4974
#define PRODUCT ErgoDox EZ
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)

26
keyboards/ergodox_ez/glow/config.h
View File

@@ -1,26 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
Copyright 2015 ZSA Technology Labs Inc (@zsa)
Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
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/>.
*/
#pragma once
#undef PRODUCT_ID
#define PRODUCT_ID 0x4976
#undef PRODUCT
#define PRODUCT ErgoDox EZ Glow

6
keyboards/ergodox_ez/glow/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"keyboard_name": "ErgoDox EZ Glow",
"usb": {
"pid": "0x4976"
}
}

6
keyboards/ergodox_ez/info.json
View File

@@ -1,7 +1,11 @@
{
"keyboard_name": "ErgoDox EZ",
"manufacturer": "ZSA Technology Labs",
"url": "ergodox-ez.com",
"maintainer": "ZSA via Drashna",
"usb": {
"vid": "0x3297",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ergodox": {
"layout": [

2
keyboards/ergodox_ez/rules.mk
View File

@@ -38,3 +38,5 @@ AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
MOUSE_SHARED_EP = no
DEFAULT_FOLDER = ergodox_ez/base

26
keyboards/ergodox_ez/shine/config.h
View File

@@ -1,26 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
Copyright 2015 ZSA Technology Labs Inc (@zsa)
Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
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/>.
*/
#pragma once
#undef PRODUCT_ID
#define PRODUCT_ID 0x4975
#undef PRODUCT
#define PRODUCT ErgoDox EZ Shine

6
keyboards/ergodox_ez/shine/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"keyboard_name": "ErgoDox EZ Shine",
"usb": {
"pid": "0x4975"
}
}