Merge remote-tracking branch 'upstream/develop'

8 files changed, 17 insertions, 53 deletions

diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h
index 018afb342d..20885ecb29 100644
--- a/keyboards/durgod/k310/base/config.h
+++ b/keyboards/durgod/k310/base/config.h
@@ -17,14 +17,9 @@
 
 #pragma once
 
-#include "config_common.h"
 
 #define WAIT_US_TIMER           GPTD3
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 }
 #define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
 
@@ -36,21 +31,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/k310/k310.c b/keyboards/durgod/k310/k310.c
index fc41ee5657..cf2b618158 100644
--- a/keyboards/durgod/k310/k310.c
+++ b/keyboards/durgod/k310/k310.c
@@ -53,20 +53,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/k310/k310.h b/keyboards/durgod/k310/k310.h
index e106c8dbe6..94c582a452 100644
--- a/keyboards/durgod/k310/k310.h
+++ b/keyboards/durgod/k310/k310.h
@@ -78,23 +78,6 @@
     { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
 }
 
-
-#ifndef WINLOCK_DISABLED
-// Define the TGUI key here so it is available in QMK configurator
-enum K3x0_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/k310/keymaps/default/keymap.json b/keyboards/durgod/k310/keymaps/default/keymap.json
index 41cf2f7bf4..7b9c0e7efb 100644
--- a/keyboards/durgod/k310/keymaps/default/keymap.json
+++ b/keyboards/durgod/k310/keymaps/default/keymap.json
@@ -17,7 +17,7 @@
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______",    "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",                                        "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",            "_______",               "_______",               "_______", "_______", "_______", "_______",
-      "_______", "KC_TGUI", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______",    "_______",            "_______"
+      "_______", "GUI_TOG", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______",    "_______",            "_______"
     ]
   ],
   "author": "tylert",
diff --git a/keyboards/durgod/k310/keymaps/via/keymap.c b/keyboards/durgod/k310/keymaps/via/keymap.c
index ad7b61dfe4..c2f0ebd65f 100644
--- a/keyboards/durgod/k310/keymaps/via/keymap.c
+++ b/keyboards/durgod/k310/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,             _______, _______, _______, _______,
-      _______, KC_TGUI, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______,    _______,          _______
+      _______, GUI_TOG, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______,    _______,          _______
   ),
   [_LAYER3] = LAYOUT_all( /* Layer 3 */
       _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,