diff options
Diffstat (limited to 'keyboards/durgod')
21 files changed, 37 insertions, 66 deletions
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h index fe4ca58072..98b7bf0dbd 100644 --- a/keyboards/durgod/dgk6x/config.h +++ b/keyboards/durgod/dgk6x/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" #define WAIT_US_TIMER GPTD3 @@ -31,20 +30,11 @@ // Increase VIA layer count #define DYNAMIC_KEYMAP_LAYER_COUNT 16 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Bootmagic Lite key configuration */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 /* LED indicator pins */ -#define LED_CAPS_LOCK_PIN C4 #define LED_WIN_LOCK_PIN C5 -#define LED_SCROLL_LOCK_PIN A8 #define LED_MR_LOCK_PIN LED_SCROLL_LOCK_PIN -#define LED_PIN_ON_STATE 0 #ifdef RGB_MATRIX_ENABLE // This is a 7-bit address, that gets left-shifted and bit 0 diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h index 7da032b967..a55bc2c6f8 100644 --- a/keyboards/durgod/dgk6x/galaxy/config.h +++ b/keyboards/durgod/dgk6x/galaxy/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix rows */ #define MATRIX_ROWS 6 diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json index 221d6613aa..e7b843f107 100644 --- a/keyboards/durgod/dgk6x/galaxy/info.json +++ b/keyboards/durgod/dgk6x/galaxy/info.json @@ -8,6 +8,7 @@ "pid": "0x6A1A", "device_version": "0.0.1" }, + "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/galaxy/rules.mk b/keyboards/durgod/dgk6x/galaxy/rules.mk index 255352f11a..e69de29bb2 100644 --- a/keyboards/durgod/dgk6x/galaxy/rules.mk +++ b/keyboards/durgod/dgk6x/galaxy/rules.mk @@ -1 +0,0 @@ -LAYOUTS = 75_ansi diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h index a2bba0a5a5..1409946eca 100644 --- a/keyboards/durgod/dgk6x/hades/config.h +++ b/keyboards/durgod/dgk6x/hades/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix rows */ #define MATRIX_ROWS 5 diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json index 345b26adcd..2ebd9c8a41 100644 --- a/keyboards/durgod/dgk6x/hades/info.json +++ b/keyboards/durgod/dgk6x/hades/info.json @@ -8,6 +8,7 @@ "pid": "0x4AD3", "device_version": "0.0.1" }, + "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/hades/rules.mk b/keyboards/durgod/dgk6x/hades/rules.mk index 41f77628cd..e69de29bb2 100644 --- a/keyboards/durgod/dgk6x/hades/rules.mk +++ b/keyboards/durgod/dgk6x/hades/rules.mk @@ -1 +0,0 @@ -LAYOUTS = 65_ansi diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json new file mode 100644 index 0000000000..64f608fde3 --- /dev/null +++ b/keyboards/durgod/dgk6x/info.json @@ -0,0 +1,10 @@ +{ + "indicators": { + "caps_lock": "C4", + "num_lock": "A8", + "on_state": 0 + }, + "processor": "STM32F072", // F070 + "bootloader": "stm32-dfu", + "board": "DURGOD_STM32_F070" +} diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk index 660719104d..c82ce44bac 100644 --- a/keyboards/durgod/dgk6x/rules.mk +++ b/keyboards/durgod/dgk6x/rules.mk @@ -1,11 +1,3 @@ -# MCU name -# Actually F070, but close enough -MCU = STM32F072 -BOARD = DURGOD_STM32_F070 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Do not put the microcontroller into power saving mode NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h index 207508dead..0af168fc0c 100644 --- a/keyboards/durgod/dgk6x/venus/config.h +++ b/keyboards/durgod/dgk6x/venus/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix rows */ #define MATRIX_ROWS 5 diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json index a2d297d661..c7d020bfdf 100644 --- a/keyboards/durgod/dgk6x/venus/info.json +++ b/keyboards/durgod/dgk6x/venus/info.json @@ -8,6 +8,7 @@ "pid": "0x7EC5", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/durgod/dgk6x/venus/rules.mk b/keyboards/durgod/dgk6x/venus/rules.mk index cdf5ba34a2..e69de29bb2 100644 --- a/keyboards/durgod/dgk6x/venus/rules.mk +++ b/keyboards/durgod/dgk6x/venus/rules.mk @@ -1 +0,0 @@ -LAYOUTS = 60_ansi diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h index 018afb342d..f2e84528f0 100644 --- a/keyboards/durgod/k310/base/config.h +++ b/keyboards/durgod/k310/base/config.h @@ -17,7 +17,6 @@ #pragma once -#include "config_common.h" #define WAIT_US_TIMER GPTD3 @@ -36,21 +35,11 @@ // Users may enable more if they wish #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Bootmagic Lite key configuration */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 /* LED indicator pins */ -#define LED_NUM_LOCK_PIN C8 -#define LED_CAPS_LOCK_PIN C9 -#define LED_SCROLL_LOCK_PIN A8 #define LED_WIN_LOCK_PIN A9 #define LED_MR_LOCK_PIN A10 -#define LED_PIN_ON_STATE 0 /* Original hardware "reset" button on pin D2 */ #define HARDWARE_RESET_PIN D2 diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json new file mode 100644 index 0000000000..7e5f9aa8d3 --- /dev/null +++ b/keyboards/durgod/k310/base/info.json @@ -0,0 +1,11 @@ +{ + "indicators": { + "caps_lock": "C9", + "num_lock": "C8", + "scroll_lock": "A8", + "on_state": 0 + }, + "processor": "STM32F072", // F070 + "bootloader": "stm32-dfu", + "board": "DURGOD_STM32_F070" +} diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk index 5c07a0fa71..92e817504f 100644 --- a/keyboards/durgod/k310/base/rules.mk +++ b/keyboards/durgod/k310/base/rules.mk @@ -1,11 +1,3 @@ -# MCU name -# Actually F070, but close enough -MCU = STM32F072 -BOARD = DURGOD_STM32_F070 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -19,5 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes - -LAYOUTS = fullsize_ansi fullsize_iso diff --git a/keyboards/durgod/k310/info.json b/keyboards/durgod/k310/info.json index 06e935484e..30b944f33e 100644 --- a/keyboards/durgod/k310/info.json +++ b/keyboards/durgod/k310/info.json @@ -8,6 +8,7 @@ "pid": "0x3100", "device_version": "0.0.1" }, + "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ diff --git a/keyboards/durgod/k320/base/config.h b/keyboards/durgod/k320/base/config.h index 5f64a04f9a..bd9d34765f 100644 --- a/keyboards/durgod/k320/base/config.h +++ b/keyboards/durgod/k320/base/config.h @@ -17,7 +17,6 @@ #pragma once -#include "config_common.h" #define WAIT_US_TIMER GPTD3 @@ -36,20 +35,11 @@ // Users may enable more if they wish #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Bootmagic Lite key configuration */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 /* LED indicator pins */ -#define LED_CAPS_LOCK_PIN C9 -#define LED_SCROLL_LOCK_PIN A8 #define LED_WIN_LOCK_PIN A9 #define LED_MR_LOCK_PIN A10 -#define LED_PIN_ON_STATE 0 /* Original hardware "reset" button on pin D2 */ #define HARDWARE_RESET_PIN D2 diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/info.json new file mode 100644 index 0000000000..2fe54b1701 --- /dev/null +++ b/keyboards/durgod/k320/base/info.json @@ -0,0 +1,10 @@ +{ + "indicators": { + "caps_lock": "C9", + "scroll_lock": "A8", + "on_state": 0 + }, + "processor": "STM32F072", // F070 + "bootloader": "stm32-dfu", + "board": "DURGOD_STM32_F070" +} diff --git a/keyboards/durgod/k320/base/rules.mk b/keyboards/durgod/k320/base/rules.mk index 37896a20ce..92e817504f 100644 --- a/keyboards/durgod/k320/base/rules.mk +++ b/keyboards/durgod/k320/base/rules.mk @@ -1,11 +1,3 @@ -# MCU name -# Actually F070, but close enough -MCU = STM32F072 -BOARD = DURGOD_STM32_F070 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -19,5 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes - -LAYOUTS = tkl_ansi tkl_iso diff --git a/keyboards/durgod/k320/info.json b/keyboards/durgod/k320/info.json index 4d239e05ac..34f1252703 100644 --- a/keyboards/durgod/k320/info.json +++ b/keyboards/durgod/k320/info.json @@ -8,6 +8,7 @@ "pid": "0x3200", "device_version": "0.0.1" }, + "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c index c03fdb5bf7..7f49352de4 100644 --- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c +++ b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c @@ -69,7 +69,7 @@ enum unicode_names { SUM, }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [DEGR] = 0x00B0, // ° [PONE] = 0x00B1, // ± [POW2] = 0x00B2, // ² |