diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-25 03:13:13 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-25 03:13:13 +0000 |
| commit | 5fb47723230260478554ec6412c1cd1576f9d6e8 (patch) | |
| tree | 5a0023c1a404114c8cf6a6f4030b8e8be04fdf99 | |
| parent | dde9dc7b60267c7f8fe69bfc27a6062c7036dcd2 (diff) | |
| parent | 711f861d83490014269ba93731bcd50263f95168 (diff) | |
| download | qmk_firmware-5fb47723230260478554ec6412c1cd1576f9d6e8.tar.gz qmk_firmware-5fb47723230260478554ec6412c1cd1576f9d6e8.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/crkbd/config.h | 1 | ||||
| -rw-r--r-- | keyboards/crkbd/rev1/common/config.h | 2 | ||||
| -rw-r--r-- | keyboards/crkbd/rev1/legacy/config.h | 1 | ||||
| -rw-r--r-- | keyboards/zinc/rev1/config.h | 6 | ||||
| -rw-r--r-- | keyboards/zinc/reva/config.h | 6 |
5 files changed, 7 insertions, 9 deletions
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h index a2dd710714..d7a3474733 100644 --- a/keyboards/crkbd/config.h +++ b/keyboards/crkbd/config.h @@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PRODUCT_ID 0x0001 #define DEVICE_VER 0x0001 #define MANUFACTURER foostan +#define PRODUCT Corne /* key matrix size */ // Rows are doubled-up diff --git a/keyboards/crkbd/rev1/common/config.h b/keyboards/crkbd/rev1/common/config.h index 12f5f75766..a2c2cde0b7 100644 --- a/keyboards/crkbd/rev1/common/config.h +++ b/keyboards/crkbd/rev1/common/config.h @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT Corne Keyboard Rev.1 (Split Common) - #define USE_SERIAL #define SOFT_SERIAL_PIN D2 diff --git a/keyboards/crkbd/rev1/legacy/config.h b/keyboards/crkbd/rev1/legacy/config.h index eae6f788af..e95f49125a 100644 --- a/keyboards/crkbd/rev1/legacy/config.h +++ b/keyboards/crkbd/rev1/legacy/config.h @@ -20,4 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "serial_config.h" -#define PRODUCT Corne Keyboard Rev.1 (Legacy Split) diff --git a/keyboards/zinc/rev1/config.h b/keyboards/zinc/rev1/config.h index 0cde101c49..0209de262a 100644 --- a/keyboards/zinc/rev1/config.h +++ b/keyboards/zinc/rev1/config.h @@ -19,10 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x9991 +#define VENDOR_ID 0x04D8 +#define PRODUCT_ID 0xEA3B #define DEVICE_VER 0x0001 -#define MANUFACTURER monksoffunk +#define MANUFACTURER 25KEYS #define PRODUCT zinc rev.1 #define TAPPING_FORCE_HOLD diff --git a/keyboards/zinc/reva/config.h b/keyboards/zinc/reva/config.h index 18b4209043..aa562fea1d 100644 --- a/keyboards/zinc/reva/config.h +++ b/keyboards/zinc/reva/config.h @@ -19,10 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x9991 +#define VENDOR_ID 0x04D8 +#define PRODUCT_ID 0xEA3B #define DEVICE_VER 0x0001 -#define MANUFACTURER monksoffunk +#define MANUFACTURER 25KEYS #define PRODUCT zinc rev.A #define TAPPING_FORCE_HOLD |