summaryrefslogtreecommitdiff
path: root/keyboards/durgod/dgk6x
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/durgod/dgk6x')
-rw-r--r--keyboards/durgod/dgk6x/config.h10
-rw-r--r--keyboards/durgod/dgk6x/dgk6x.c12
-rw-r--r--keyboards/durgod/dgk6x/dgk6x.h18
-rw-r--r--keyboards/durgod/dgk6x/galaxy/config.h3
-rw-r--r--keyboards/durgod/dgk6x/galaxy/info.json1
-rw-r--r--keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json2
-rw-r--r--keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json2
-rw-r--r--keyboards/durgod/dgk6x/galaxy/rules.mk1
-rw-r--r--keyboards/durgod/dgk6x/hades/config.h3
-rw-r--r--keyboards/durgod/dgk6x/hades/info.json1
-rw-r--r--keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json2
-rw-r--r--keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json2
-rw-r--r--keyboards/durgod/dgk6x/hades/rules.mk1
-rw-r--r--keyboards/durgod/dgk6x/info.json10
-rw-r--r--keyboards/durgod/dgk6x/rules.mk8
-rw-r--r--keyboards/durgod/dgk6x/venus/config.h3
-rw-r--r--keyboards/durgod/dgk6x/venus/info.json1
-rw-r--r--keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json2
-rw-r--r--keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json2
-rw-r--r--keyboards/durgod/dgk6x/venus/rules.mk1
20 files changed, 23 insertions, 62 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/dgk6x.c b/keyboards/durgod/dgk6x/dgk6x.c
index 49496689f2..649821c5f2 100644
--- a/keyboards/durgod/dgk6x/dgk6x.c
+++ b/keyboards/durgod/dgk6x/dgk6x.c
@@ -39,20 +39,14 @@ void led_init_ports(void) {
#ifndef WINLOCK_DISABLED
-static bool win_key_locked = false;
-
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_TGUI:
+ case GUI_TOG:
if (record->event.pressed) {
- // Toggle GUI lock on key press
- win_key_locked = !win_key_locked;
- writePin(LED_WIN_LOCK_PIN, !win_key_locked);
+ // Toggle LED on key press
+ togglePin(LED_WIN_LOCK_PIN);
}
break;
- case KC_LGUI:
- if (win_key_locked) { return false; }
- break;
}
return process_record_user(keycode, record);
}
diff --git a/keyboards/durgod/dgk6x/dgk6x.h b/keyboards/durgod/dgk6x/dgk6x.h
index e2c6d19c27..5a303b461e 100644
--- a/keyboards/durgod/dgk6x/dgk6x.h
+++ b/keyboards/durgod/dgk6x/dgk6x.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Jessica Sullivan and Don Kjer
+/* Copyright 2021 Jessica Sullivan and Don Kjer
*
* 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
@@ -25,22 +25,6 @@
# include "galaxy.h"
#endif
-#ifndef WINLOCK_DISABLED
-// Define the TGUI key here so it is available in QMK configurator
-enum DGK6X_keycodes {
-#ifdef VIA_ENABLE
- KC_TGUI = USER00, // Toggle between GUI Lock or Unlock
- NEW_SAFE_RANGE = SAFE_RANGE
-#else
- KC_TGUI = SAFE_RANGE, // Toggle between GUI Lock or Unlock
- NEW_SAFE_RANGE
-#endif
-};
-
-#undef SAFE_RANGE
-#define SAFE_RANGE NEW_SAFE_RANGE
-#endif /* WINLOCK_DISABLED */
-
/* Function Prototype */
void off_all_leds(void);
void on_all_leds(void);
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index 7da032b967..9c2d38d6d9 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -16,14 +16,11 @@
#pragma once
-#include "config_common.h"
/* key matrix rows */
-#define MATRIX_ROWS 6
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }
/* key matrix columns */
-#define MATRIX_COLS 16
#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11, C12 }
#ifdef RGB_MATRIX_ENABLE
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/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
index 6c986333fc..c40cfac303 100644
--- a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
@@ -17,7 +17,7 @@
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+ "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS"
],
[
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG",
diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
index b90b858e0a..e8073ff800 100644
--- a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
@@ -17,7 +17,7 @@
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+ "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS"
],
[
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG",
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..ff390f5b2e 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -16,14 +16,11 @@
#pragma once
-#include "config_common.h"
/* key matrix rows */
-#define MATRIX_ROWS 5
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
/* key matrix columns */
-#define MATRIX_COLS 15
#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11 }
#ifdef RGB_MATRIX_ENABLE
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/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
index bf20d1fadf..6be7665280 100644
--- a/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/hades/keymaps/default/keymap.json
@@ -15,7 +15,7 @@
"KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS"
+ "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS"
],
[
"KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
diff --git a/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
index 3c525ee047..0cef377c84 100644
--- a/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/hades/keymaps/via/keymap.json
@@ -15,7 +15,7 @@
"KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS"
+ "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS"
],
[
"KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
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..90d3d2e5b7
--- /dev/null
+++ b/keyboards/durgod/dgk6x/info.json
@@ -0,0 +1,10 @@
+{
+ "indicators": {
+ "caps_lock": "C4",
+ "scroll_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..bb3c168f81 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -16,14 +16,11 @@
#pragma once
-#include "config_common.h"
/* key matrix rows */
-#define MATRIX_ROWS 5
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
/* key matrix columns */
-#define MATRIX_COLS 14
#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10 }
#ifdef RGB_MATRIX_ENABLE
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/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
index a13761a7d7..e7ef2e9d4b 100644
--- a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
@@ -15,7 +15,7 @@
"KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS", "KC_HOME", "KC_END", "KC_DEL",
"KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS"
+ "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS"
],
[
"KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD",
diff --git a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
index abd51438e9..fd45625534 100644
--- a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
@@ -15,7 +15,7 @@
"KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS", "KC_HOME", "KC_END", "KC_DEL",
"KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS"
+ "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS"
],
[
"KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD",
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 07:23:13 +0000