diff options
Diffstat (limited to 'keyboards/durgod')
-rw-r--r-- | keyboards/durgod/dgk6x/config.h | 4 | ||||
-rw-r--r-- | keyboards/durgod/dgk6x/galaxy/config.h | 5 | ||||
-rw-r--r-- | keyboards/durgod/dgk6x/galaxy/info.json | 8 | ||||
-rw-r--r-- | keyboards/durgod/dgk6x/hades/config.h | 5 | ||||
-rw-r--r-- | keyboards/durgod/dgk6x/hades/info.json | 8 | ||||
-rw-r--r-- | keyboards/durgod/dgk6x/venus/config.h | 5 | ||||
-rw-r--r-- | keyboards/durgod/dgk6x/venus/info.json | 8 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/config.h | 4 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/k310/base/config.h | 4 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/k310/config.h | 8 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/k310/info.json | 8 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/k320/base/config.h | 4 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/k320/config.h | 8 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/k320/info.json | 8 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/keymaps/chimera/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/durgod/k3x0/keymaps/typhon/keymap.c | 6 |
16 files changed, 41 insertions, 58 deletions
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h index 28a506cf8d..bfb3f2ba9d 100644 --- a/keyboards/durgod/dgk6x/config.h +++ b/keyboards/durgod/dgk6x/config.h @@ -18,10 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xD60D -#define MANUFACTURER Hoksi Technology - #define WAIT_US_TIMER GPTD3 /* COL2ROW, ROW2COL*/ diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h index e8108f7d11..7da032b967 100644 --- a/keyboards/durgod/dgk6x/galaxy/config.h +++ b/keyboards/durgod/dgk6x/galaxy/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6A1A -#define DEVICE_VER 0x0001 -#define PRODUCT Galaxy 84 HK gaming x DURGOD (QMK) - /* key matrix rows */ #define MATRIX_ROWS 6 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 } diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json index 6fc8959d0b..221d6613aa 100644 --- a/keyboards/durgod/dgk6x/galaxy/info.json +++ b/keyboards/durgod/dgk6x/galaxy/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Galaxy", + "keyboard_name": "Galaxy 84 HK gaming x DURGOD (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.amazon.com/Galaxy-75-Modular-Mechanical-Keyboard/dp/B08PDRD8MP", "maintainer": "dkjer", + "usb": { + "vid": "0xD60D", + "pid": "0x6A1A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_75_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h index c148ae1b1f..a2bba0a5a5 100644 --- a/keyboards/durgod/dgk6x/hades/config.h +++ b/keyboards/durgod/dgk6x/hades/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x4AD3 -#define DEVICE_VER 0x0001 -#define PRODUCT DURGOD Hades (QMK) - /* key matrix rows */ #define MATRIX_ROWS 5 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json index b439ea4acb..345b26adcd 100644 --- a/keyboards/durgod/dgk6x/hades/info.json +++ b/keyboards/durgod/dgk6x/hades/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Hades", + "keyboard_name": "DURGOD Hades (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.amazon.com/gp/product/B08562392T", "maintainer": "J-Sully", + "usb": { + "vid": "0xD60D", + "pid": "0x4AD3", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h index 3bef1ea7ed..207508dead 100644 --- a/keyboards/durgod/dgk6x/venus/config.h +++ b/keyboards/durgod/dgk6x/venus/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x7EC5 -#define DEVICE_VER 0x0001 -#define PRODUCT DURGOD Venus (QMK) - /* key matrix rows */ #define MATRIX_ROWS 5 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json index 21e93d55c2..a2d297d661 100644 --- a/keyboards/durgod/dgk6x/venus/info.json +++ b/keyboards/durgod/dgk6x/venus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Venus", + "keyboard_name": "DURGOD Venus (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.amazon.com/dp/B07XFP5MMZ", "maintainer": "J-Sully", + "usb": { + "vid": "0xD60D", + "pid": "0x7EC5", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k3x0/config.h index 691076ecac..0f2e01cfc1 100644 --- a/keyboards/durgod/k3x0/config.h +++ b/keyboards/durgod/k3x0/config.h @@ -19,10 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xD60D -#define MANUFACTURER Hoksi Technology - #define WAIT_US_TIMER GPTD3 /* key matrix size (rows in specific keyboard variant) */ diff --git a/keyboards/durgod/k3x0/k310/base/config.h b/keyboards/durgod/k3x0/k310/base/config.h index 025369acd7..2ccb2f2f0c 100644 --- a/keyboards/durgod/k3x0/k310/base/config.h +++ b/keyboards/durgod/k3x0/k310/base/config.h @@ -17,7 +17,3 @@ #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define PRODUCT DURGOD Taurus K310 (QMK) -#define DEVICE_VER 0x0001 // Base (no backlight) diff --git a/keyboards/durgod/k3x0/k310/config.h b/keyboards/durgod/k3x0/k310/config.h index 1eadb8e52d..cb936a201f 100644 --- a/keyboards/durgod/k3x0/k310/config.h +++ b/keyboards/durgod/k3x0/k310/config.h @@ -19,14 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x3100 -// Taurus K310 models: -//#define DEVICE_VER 0x0001 // Base (no backlight) -//#define DEVICE_VER 0x0002 // Corona (white led matrix) -//#define DEVICE_VER 0x0003 // Aurora (red & blue led matrix) -//#define DEVICE_VER 0x0004 // Nebula (rgb led matrix) - /* key matrix size (cols in generic keyboard config) */ #define MATRIX_ROWS 8 diff --git a/keyboards/durgod/k3x0/k310/info.json b/keyboards/durgod/k3x0/k310/info.json index bf960ebd94..06e935484e 100644 --- a/keyboards/durgod/k3x0/k310/info.json +++ b/keyboards/durgod/k3x0/k310/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Taurus K310", + "keyboard_name": "DURGOD Taurus K310 (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.durgod.com/page9?product_id=53&_l=en", "maintainer": "tylert", + "usb": { + "vid": "0xD60D", + "pid": "0x3100", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ diff --git a/keyboards/durgod/k3x0/k320/base/config.h b/keyboards/durgod/k3x0/k320/base/config.h index d4eb732b90..2ccb2f2f0c 100644 --- a/keyboards/durgod/k3x0/k320/base/config.h +++ b/keyboards/durgod/k3x0/k320/base/config.h @@ -17,7 +17,3 @@ #pragma once #include "config_common.h" - -/* USB Device descriptor parameter */ -#define PRODUCT DURGOD Taurus K320 (QMK) -#define DEVICE_VER 0x0001 // Base (no backlight) diff --git a/keyboards/durgod/k3x0/k320/config.h b/keyboards/durgod/k3x0/k320/config.h index 25b4c63036..2ea9b37fdf 100644 --- a/keyboards/durgod/k3x0/k320/config.h +++ b/keyboards/durgod/k3x0/k320/config.h @@ -19,14 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x3200 -// Taurus K320 models: -//#define DEVICE_VER 0x0001 // Base (no backlight) -//#define DEVICE_VER 0x0002 // Corona (white led matrix) -//#define DEVICE_VER 0x0003 // Aurora (red & blue led matrix) -//#define DEVICE_VER 0x0004 // Nebula (rgb led matrix) - /* key matrix size (cols in generic keyboard config) */ #define MATRIX_ROWS 7 diff --git a/keyboards/durgod/k3x0/k320/info.json b/keyboards/durgod/k3x0/k320/info.json index cc0da77a3f..0386ef7709 100644 --- a/keyboards/durgod/k3x0/k320/info.json +++ b/keyboards/durgod/k3x0/k320/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "DURGOD Taurus K320", + "keyboard_name": "DURGOD Taurus K320 (QMK)", + "manufacturer": "Hoksi Technology", "url": "https://www.durgod.com/page9?product_id=47&_l=en", "maintainer": "dkjer", + "usb": { + "vid": "0xD60D", + "pid": "0x3200", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/durgod/k3x0/keymaps/chimera/keymap.c b/keyboards/durgod/k3x0/keymaps/chimera/keymap.c index 8053da351a..5fa0d5eb4c 100644 --- a/keyboards/durgod/k3x0/keymaps/chimera/keymap.c +++ b/keyboards/durgod/k3x0/keymaps/chimera/keymap.c @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ [_WSL] = LAYOUT_all( /* Windows Second / System Layer */ - RESET, KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, @@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ [_MSL] = LAYOUT_all( /* Mac Second / System Layer */ - RESET, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, @@ -358,7 +358,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_state_set(1UL<<_WFL | 1UL<<_WSL); } break; - case RESET: + case QK_BOOT: if (record->event.pressed) { // Flash LEDs to indicate bootloader mode is enabled. on_all_leds(); diff --git a/keyboards/durgod/k3x0/keymaps/typhon/keymap.c b/keyboards/durgod/k3x0/keymaps/typhon/keymap.c index afd38392c1..21daf5687a 100644 --- a/keyboards/durgod/k3x0/keymaps/typhon/keymap.c +++ b/keyboards/durgod/k3x0/keymaps/typhon/keymap.c @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ [_WSL] = LAYOUT_all( /* Windows Second / System Layer */ - RESET, KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, @@ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ [_MSL] = LAYOUT_all( /* Mac Second / System Layer */ - RESET, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, @@ -358,7 +358,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_state_set(1UL<<_WFL | 1UL<<_WSL); } break; - case RESET: + case QK_BOOT: if (record->event.pressed) { // Flash LEDs to indicate bootloader mode is enabled. on_all_leds(); |