aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/aeboards/ext65/rev2/config.h2
-rw-r--r--keyboards/aeboards/ext65/rev2/halconf.h2
-rw-r--r--keyboards/aeboards/ext65/rev2/mcuconf.h2
-rw-r--r--keyboards/cannonkeys/an_c/rules.mk2
-rw-r--r--keyboards/cannonkeys/chimera65/rules.mk2
-rw-r--r--keyboards/cannonkeys/instant60/rules.mk2
-rw-r--r--keyboards/cannonkeys/iron165/rules.mk2
-rw-r--r--keyboards/cannonkeys/satisfaction75/rules.mk2
-rw-r--r--keyboards/cannonkeys/savage65/rules.mk2
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk2
-rw-r--r--keyboards/cannonkeys/tsukuyomi/rules.mk2
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/gen1.c2
-rw-r--r--keyboards/crkbd/rev1/common/config.h1
-rw-r--r--keyboards/crkbd/rev1/common/rules.mk1
-rw-r--r--keyboards/crkbd/rev1/rev1.c2
-rw-r--r--keyboards/daji/seis_cinco/rules.mk2
-rw-r--r--keyboards/durgod/boards/DURGOD_STM32_F070/board.h (renamed from keyboards/durgod/k320/board.h)1
-rw-r--r--keyboards/durgod/boards/DURGOD_STM32_F070/board.mk12
-rw-r--r--keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h (renamed from keyboards/durgod/k320/bootloader_defs.h)0
-rw-r--r--keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h (renamed from keyboards/durgod/k320/chconf.h)15
-rw-r--r--keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h (renamed from keyboards/durgod/k320/mcuconf.h)0
-rw-r--r--keyboards/durgod/k320/config.h39
-rw-r--r--keyboards/durgod/k320/info.json1186
-rw-r--r--keyboards/durgod/k320/k320.c20
-rw-r--r--keyboards/durgod/k320/k320.h31
-rw-r--r--keyboards/durgod/k320/keymaps/default/keymap.c95
-rw-r--r--keyboards/durgod/k320/keymaps/default/keymap.json26
-rw-r--r--keyboards/durgod/k320/keymaps/default/readme.md4
-rw-r--r--keyboards/durgod/k320/keymaps/default_iso/keymap.c72
-rw-r--r--keyboards/durgod/k320/keymaps/default_iso/readme.md7
-rw-r--r--keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c71
-rw-r--r--keyboards/durgod/k320/keymaps/default_iso_mac/readme.md6
-rw-r--r--keyboards/durgod/k320/keymaps/default_mac/keymap.json26
-rw-r--r--keyboards/durgod/k320/keymaps/default_mac/readme.md8
-rw-r--r--keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c108
-rw-r--r--keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md7
-rw-r--r--keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk1
-rw-r--r--keyboards/durgod/k320/keymaps/kuenhlee/keymap.c5
-rw-r--r--keyboards/durgod/k320/keymaps/via/keymap.c29
-rw-r--r--keyboards/durgod/k320/keymaps/via/readme.md2
-rw-r--r--keyboards/durgod/k320/keymaps/via/rules.mk2
-rw-r--r--keyboards/durgod/k320/readme.md5
-rw-r--r--keyboards/durgod/k320/rules.mk2
-rw-r--r--keyboards/handwired/ck4x4/rules.mk2
-rw-r--r--keyboards/handwired/onekey/rules.mk4
-rw-r--r--keyboards/projectkb/alice/config.h3
-rw-r--r--keyboards/projectkb/alice/halconf.h2
-rw-r--r--keyboards/projectkb/alice/mcuconf.h2
-rw-r--r--keyboards/projectkb/signature87/rules.mk2
-rw-r--r--keyboards/ramonimbao/wete/config.h2
-rw-r--r--keyboards/ramonimbao/wete/halconf.h2
-rw-r--r--keyboards/ramonimbao/wete/mcuconf.h2
-rw-r--r--keyboards/readme.md2
-rw-r--r--keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk14
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/config.h4
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/rev1.c102
-rw-r--r--keyboards/terrazzo/terrazzo.c1
-rw-r--r--keyboards/westfoxtrot/prophet/config.h2
-rw-r--r--keyboards/westfoxtrot/prophet/halconf.h (renamed from keyboards/durgod/k320/keymaps/via/config.h)13
-rw-r--r--keyboards/westfoxtrot/prophet/mcuconf.h5
60 files changed, 602 insertions, 1372 deletions
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 541f07ee9..dc1bfb71c 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -74,3 +74,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
74#define BACKLIGHT_LEVELS 6 74#define BACKLIGHT_LEVELS 6
75#define BACKLIGHT_BREATHING 75#define BACKLIGHT_BREATHING
76#define BREATHING_PERIOD 6 76#define BREATHING_PERIOD 6
77
78#define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/aeboards/ext65/rev2/halconf.h b/keyboards/aeboards/ext65/rev2/halconf.h
index 6e2f53640..9fa1eca60 100644
--- a/keyboards/aeboards/ext65/rev2/halconf.h
+++ b/keyboards/aeboards/ext65/rev2/halconf.h
@@ -27,5 +27,7 @@
27 27
28#define HAL_USE_SPI TRUE 28#define HAL_USE_SPI TRUE
29 29
30#define HAL_USE_GPT TRUE
31
30#include_next <halconf.h> 32#include_next <halconf.h>
31 33
diff --git a/keyboards/aeboards/ext65/rev2/mcuconf.h b/keyboards/aeboards/ext65/rev2/mcuconf.h
index 26ce80615..43d53d4f2 100644
--- a/keyboards/aeboards/ext65/rev2/mcuconf.h
+++ b/keyboards/aeboards/ext65/rev2/mcuconf.h
@@ -32,3 +32,5 @@
32#undef STM32_SPI_USE_SPI2 32#undef STM32_SPI_USE_SPI2
33#define STM32_SPI_USE_SPI2 TRUE 33#define STM32_SPI_USE_SPI2 TRUE
34 34
35#undef STM32_GPT_USE_TIM1
36#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 8ed2d0ead..7309744d1 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
11EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
12CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
13COMMAND_ENABLE = yes # Commands for debug and configuration 13COMMAND_ENABLE = yes # Commands for debug and configuration
14SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 14SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
15NKRO_ENABLE = yes # USB Nkey Rollover 15NKRO_ENABLE = yes # USB Nkey Rollover
16CUSTOM_MATRIX = no # Custom matrix file 16CUSTOM_MATRIX = no # Custom matrix file
17BACKLIGHT_ENABLE = yes 17BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk
index 4d940da78..a08f2fa49 100644
--- a/keyboards/cannonkeys/chimera65/rules.mk
+++ b/keyboards/cannonkeys/chimera65/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
11EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
12CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
13COMMAND_ENABLE = yes # Commands for debug and configuration 13COMMAND_ENABLE = yes # Commands for debug and configuration
14SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 14SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
15NKRO_ENABLE = yes # USB Nkey Rollover 15NKRO_ENABLE = yes # USB Nkey Rollover
16CUSTOM_MATRIX = no # Custom matrix file 16CUSTOM_MATRIX = no # Custom matrix file
17BACKLIGHT_ENABLE = yes 17BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 0973ad954..e5ba2903b 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -10,7 +10,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
10EXTRAKEY_ENABLE = yes # Audio control and System control 10EXTRAKEY_ENABLE = yes # Audio control and System control
11CONSOLE_ENABLE = yes # Console for debug 11CONSOLE_ENABLE = yes # Console for debug
12COMMAND_ENABLE = yes # Commands for debug and configuration 12COMMAND_ENABLE = yes # Commands for debug and configuration
13SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 13SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
14NKRO_ENABLE = yes # USB Nkey Rollover 14NKRO_ENABLE = yes # USB Nkey Rollover
15CUSTOM_MATRIX = no # Custom matrix file 15CUSTOM_MATRIX = no # Custom matrix file
16BACKLIGHT_ENABLE = yes 16BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk
index 3925458dd..9de75a614 100644
--- a/keyboards/cannonkeys/iron165/rules.mk
+++ b/keyboards/cannonkeys/iron165/rules.mk
@@ -9,7 +9,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control 9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug 10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration 11COMMAND_ENABLE = yes # Commands for debug and configuration
12SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 12SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
13NKRO_ENABLE = yes # USB Nkey Rollover 13NKRO_ENABLE = yes # USB Nkey Rollover
14CUSTOM_MATRIX = no # Custom matrix file 14CUSTOM_MATRIX = no # Custom matrix file
15BACKLIGHT_ENABLE = yes 15BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index e3abea546..3861b4849 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -15,7 +15,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
15EXTRAKEY_ENABLE = yes # Audio control and System control 15EXTRAKEY_ENABLE = yes # Audio control and System control
16CONSOLE_ENABLE = yes # Console for debug 16CONSOLE_ENABLE = yes # Console for debug
17COMMAND_ENABLE = yes # Commands for debug and configuration 17COMMAND_ENABLE = yes # Commands for debug and configuration
18SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 18SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
19NKRO_ENABLE = yes # USB Nkey Rollover 19NKRO_ENABLE = yes # USB Nkey Rollover
20CUSTOM_MATRIX = no # Custom matrix file 20CUSTOM_MATRIX = no # Custom matrix file
21ENCODER_ENABLE = yes 21ENCODER_ENABLE = yes
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 8e1b984fd..2454573d2 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
11EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
12CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
13COMMAND_ENABLE = yes # Commands for debug and configuration 13COMMAND_ENABLE = yes # Commands for debug and configuration
14SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 14SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
15NKRO_ENABLE = yes # USB Nkey Rollover 15NKRO_ENABLE = yes # USB Nkey Rollover
16CUSTOM_MATRIX = no # Custom matrix file 16CUSTOM_MATRIX = no # Custom matrix file
17BACKLIGHT_ENABLE = yes 17BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 9b29e8fd1..294c873ee 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -11,7 +11,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
11EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
12CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
13COMMAND_ENABLE = yes # Commands for debug and configuration 13COMMAND_ENABLE = yes # Commands for debug and configuration
14SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 14SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
15NKRO_ENABLE = yes # USB Nkey Rollover 15NKRO_ENABLE = yes # USB Nkey Rollover
16CUSTOM_MATRIX = no # Custom matrix file 16CUSTOM_MATRIX = no # Custom matrix file
17BACKLIGHT_ENABLE = yes 17BACKLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index ce881f198..4e7791a79 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -10,7 +10,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug 10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration 11COMMAND_ENABLE = yes # Commands for debug and configuration
12# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 12# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
13SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 13SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
14# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 14# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
15NKRO_ENABLE = yes # USB Nkey Rollover 15NKRO_ENABLE = yes # USB Nkey Rollover
16BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 16BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index dd399317c..339bd78d5 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -16,8 +16,6 @@
16#include "gen1.h" 16#include "gen1.h"
17 17
18#ifdef LED_MATRIX_ENABLE 18#ifdef LED_MATRIX_ENABLE
19 #include "is31fl3731-simple.h"
20
21const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { 19const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
22/* Refer to IS31 manual for these locations 20/* Refer to IS31 manual for these locations
23 * driver 21 * driver
diff --git a/keyboards/crkbd/rev1/common/config.h b/keyboards/crkbd/rev1/common/config.h
index a2c2cde0b..b468fe395 100644
--- a/keyboards/crkbd/rev1/common/config.h
+++ b/keyboards/crkbd/rev1/common/config.h
@@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23 23
24#ifdef RGB_MATRIX_ENABLE 24#ifdef RGB_MATRIX_ENABLE
25# define RGB_MATRIX_SPLIT { 27, 27 } 25# define RGB_MATRIX_SPLIT { 27, 27 }
26# define SPLIT_TRANSPORT_MIRROR
26#endif 27#endif
27 28
28#define DIODE_DIRECTION COL2ROW 29#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crkbd/rev1/common/rules.mk b/keyboards/crkbd/rev1/common/rules.mk
index 0b8106e3f..d38a61809 100644
--- a/keyboards/crkbd/rev1/common/rules.mk
+++ b/keyboards/crkbd/rev1/common/rules.mk
@@ -1,2 +1 @@
1SPLIT_KEYBOARD = yes SPLIT_KEYBOARD = yes
2SPLIT_TRANSPORT = mirror # for when Split Mirroring drops, it will maintain mirroring functionality
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c
index f2df8942a..347f98150 100644
--- a/keyboards/crkbd/rev1/rev1.c
+++ b/keyboards/crkbd/rev1/rev1.c
@@ -87,7 +87,7 @@ led_config_t g_led_config = { {
87 87
88void matrix_init_kb(void) { 88void matrix_init_kb(void) {
89 89
90#ifdef RGB_MATRIX_ENABLE 90#if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_SPLIT)
91 if (!isLeftHand) { 91 if (!isLeftHand) {
92 g_led_config = (led_config_t){ { 92 g_led_config = (led_config_t){ {
93 { 51, 50, 45, 44, 37, 36 }, 93 { 51, 50, 45, 44, 37, 36 },
diff --git a/keyboards/daji/seis_cinco/rules.mk b/keyboards/daji/seis_cinco/rules.mk
index fa34092cd..768e50069 100644
--- a/keyboards/daji/seis_cinco/rules.mk
+++ b/keyboards/daji/seis_cinco/rules.mk
@@ -11,7 +11,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
11CONSOLE_ENABLE = no # Console for debug 11CONSOLE_ENABLE = no # Console for debug
12COMMAND_ENABLE = no # Commands for debug and configuration 12COMMAND_ENABLE = no # Commands for debug and configuration
13# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 13# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
14SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 14SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
15# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 15# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
16NKRO_ENABLE = yes # USB Nkey Rollover 16NKRO_ENABLE = yes # USB Nkey Rollover
17BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 17BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
diff --git a/keyboards/durgod/k320/board.h b/keyboards/durgod/boards/DURGOD_STM32_F070/board.h
index 17d08b17f..2d04bccbd 100644
--- a/keyboards/durgod/k320/board.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/board.h
@@ -20,4 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#define STM32_HSECLK 12000000U 20#define STM32_HSECLK 12000000U
21#include_next <board.h> 21#include_next <board.h>
22#undef STM32_HSE_BYPASS 22#undef STM32_HSE_BYPASS
23
diff --git a/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk b/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk
new file mode 100644
index 000000000..479184833
--- /dev/null
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk
@@ -0,0 +1,12 @@
1# List of all the board related files.
2BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB/board.c
3
4# Required include directories
5BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB
6
7# Include mcu configuration
8EXTRAINCDIRS = $(BOARD_PATH)/boards/DURGOD_STM32_F070
9
10# Shared variables
11ALLCSRC += $(BOARDSRC)
12ALLINC += $(BOARDINC)
diff --git a/keyboards/durgod/k320/bootloader_defs.h b/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
index 02c48c4e6..02c48c4e6 100644
--- a/keyboards/durgod/k320/bootloader_defs.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
diff --git a/keyboards/durgod/k320/chconf.h b/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
index 374a03003..a7d95c51a 100644
--- a/keyboards/durgod/k320/chconf.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
@@ -25,19 +25,4 @@
25 25
26#define CH_CFG_ST_TIMEDELTA 0 26#define CH_CFG_ST_TIMEDELTA 0
27 27
28#define CH_CFG_OPTIMIZE_SPEED FALSE
29
30#define CH_CFG_USE_REGISTRY TRUE
31
32#define CH_CFG_USE_WAITEXIT TRUE
33
34#define CH_CFG_USE_CONDVARS TRUE
35
36#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
37
38#define CH_CFG_USE_MESSAGES TRUE
39
40#define CH_CFG_USE_MAILBOXES TRUE
41
42#include_next <chconf.h> 28#include_next <chconf.h>
43
diff --git a/keyboards/durgod/k320/mcuconf.h b/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
index 6d67aa96a..6d67aa96a 100644
--- a/keyboards/durgod/k320/mcuconf.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
diff --git a/keyboards/durgod/k320/config.h b/keyboards/durgod/k320/config.h
index 70438900e..323a9ccff 100644
--- a/keyboards/durgod/k320/config.h
+++ b/keyboards/durgod/k320/config.h
@@ -1,19 +1,18 @@
1/* 1/* Copyright 2021 kuenhlee and Don Kjer
2Copyright 2021 kuenhlee and Don Kjer 2 *
3 3 * This program is free software: you can redistribute it and/or modify
4This program is free software: you can redistribute it and/or modify 4 * it under the terms of the GNU General Public License as published by
5it under the terms of the GNU General Public License as published by 5 * the Free Software Foundation, either version 2 of the License, or
6the Free Software Foundation, either version 2 of the License, or 6 * (at your option) any later version.
7(at your option) any later version. 7 *
8 8 * This program is distributed in the hope that it will be useful,
9This program is distributed in the hope that it will be useful, 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * GNU General Public License for more details.
12GNU General Public License for more details. 12 *
13 13 * You should have received a copy of the GNU General Public License
14You should have received a copy of the GNU General Public License 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15 */
16*/
17 16
18#pragma once 17#pragma once
19 18
@@ -36,8 +35,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
36/* COL2ROW, ROW2COL*/ 35/* COL2ROW, ROW2COL*/
37#define DIODE_DIRECTION ROW2COL 36#define DIODE_DIRECTION ROW2COL
38 37
38// Dynamic EEPROM
39// Something sensible or else VIA may crash
40// Users may enable more if they wish
41#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
42
39/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 43/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
40#define DEBOUNCE 7 44#define DEBOUNCE 5
41 45
42/* Bootmagic Lite key configuration */ 46/* Bootmagic Lite key configuration */
43#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE 47#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
@@ -50,4 +54,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
50#define LED_WIN_LOCK_PIN A9 54#define LED_WIN_LOCK_PIN A9
51#define LED_MR_LOCK_PIN A10 55#define LED_MR_LOCK_PIN A10
52#define LED_PIN_ON_STATE 0 56#define LED_PIN_ON_STATE 0
53
diff --git a/keyboards/durgod/k320/info.json b/keyboards/durgod/k320/info.json
index 5e33d8fcd..6c67c3d45 100644
--- a/keyboards/durgod/k320/info.json
+++ b/keyboards/durgod/k320/info.json
@@ -7,913 +7,293 @@
7 "layouts": { 7 "layouts": {
8 "LAYOUT_tkl_ansi": { 8 "LAYOUT_tkl_ansi": {
9 "layout": [ 9 "layout": [
10 { 10 { "label": "Esc", "x": 0, "y": 0 },
11 "label": "Esc", 11 { "label": "F1", "x": 2, "y": 0 },
12 "x": 0, 12 { "label": "F2", "x": 3, "y": 0 },
13 "y": 0 13 { "label": "F3", "x": 4, "y": 0 },
14 }, 14 { "label": "F4", "x": 5, "y": 0 },
15 { 15 { "label": "F5", "x": 6.5, "y": 0 },
16 "label": "F1", 16 { "label": "F6", "x": 7.5, "y": 0 },
17 "x": 2, 17 { "label": "F7", "x": 8.5, "y": 0 },
18 "y": 0 18 { "label": "F8", "x": 9.5, "y": 0 },
19 }, 19 { "label": "F9", "x": 11, "y": 0 },
20 { 20 { "label": "F10", "x": 12, "y": 0 },
21 "label": "F2", 21 { "label": "F11", "x": 13, "y": 0 },
22 "x": 3, 22 { "label": "F12", "x": 14, "y": 0 },
23 "y": 0 23 { "label": "PrtSc", "x": 15.25, "y": 0 },
24 }, 24 { "label": "Scroll Lock", "x": 16.25, "y": 0 },
25 { 25 { "label": "Pause", "x": 17.25, "y": 0 },
26 "label": "F3", 26
27 "x": 4, 27 { "label": "~", "x": 0, "y": 1.5 },
28 "y": 0 28 { "label": "!", "x": 1, "y": 1.5 },
29 }, 29 { "label": "@", "x": 2, "y": 1.5 },
30 { 30 { "label": "#", "x": 3, "y": 1.5 },
31 "label": "F4", 31 { "label": "$", "x": 4, "y": 1.5 },
32 "x": 5, 32 { "label": "%", "x": 5, "y": 1.5 },
33 "y": 0 33 { "label": "^", "x": 6, "y": 1.5 },
34 }, 34 { "label": "&", "x": 7, "y": 1.5 },
35 { 35 { "label": "*", "x": 8, "y": 1.5 },
36 "label": "F5", 36 { "label": "(", "x": 9, "y": 1.5 },
37 "x": 6.5, 37 { "label": ")", "x": 10, "y": 1.5 },
38 "y": 0 38 { "label": "_", "x": 11, "y": 1.5 },
39 }, 39 { "label": "+", "x": 12, "y": 1.5 },
40 { 40 { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
41 "label": "F6", 41 { "label": "Insert", "x": 15.25, "y": 1.5 },
42 "x": 7.5, 42 { "label": "Home", "x": 16.25, "y": 1.5 },
43 "y": 0 43 { "label": "PgUp", "x": 17.25, "y": 1.5 },
44 }, 44
45 { 45 { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
46 "label": "F7", 46 { "label": "Q", "x": 1.5, "y": 2.5 },
47 "x": 8.5, 47 { "label": "W", "x": 2.5, "y": 2.5 },
48 "y": 0 48 { "label": "E", "x": 3.5, "y": 2.5 },
49 }, 49 { "label": "R", "x": 4.5, "y": 2.5 },
50 { 50 { "label": "T", "x": 5.5, "y": 2.5 },
51 "label": "F8", 51 { "label": "Y", "x": 6.5, "y": 2.5 },
52 "x": 9.5, 52 { "label": "U", "x": 7.5, "y": 2.5 },
53 "y": 0 53 { "label": "I", "x": 8.5, "y": 2.5 },
54 }, 54 { "label": "O", "x": 9.5, "y": 2.5 },
55 { 55 { "label": "P", "x": 10.5, "y": 2.5 },
56 "label": "F9", 56 { "label": "{", "x": 11.5, "y": 2.5 },
57 "x": 11, 57 { "label": "}", "x": 12.5, "y": 2.5 },
58 "y": 0 58 { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
59 }, 59 { "label": "Delete", "x": 15.25, "y": 2.5 },
60 { 60 { "label": "End", "x": 16.25, "y": 2.5 },
61 "label": "F10", 61 { "label": "PgDn", "x": 17.25, "y": 2.5 },
62 "x": 12, 62
63 "y": 0 63 { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
64 }, 64 { "label": "A", "x": 1.75, "y": 3.5 },
65 { 65 { "label": "S", "x": 2.75, "y": 3.5 },
66 "label": "F11", 66 { "label": "D", "x": 3.75, "y": 3.5 },
67 "x": 13, 67 { "label": "F", "x": 4.75, "y": 3.5 },
68 "y": 0 68 { "label": "G", "x": 5.75, "y": 3.5 },
69 }, 69 { "label": "H", "x": 6.75, "y": 3.5 },
70 { 70 { "label": "J", "x": 7.75, "y": 3.5 },
71 "label": "F12", 71 { "label": "K", "x": 8.75, "y": 3.5 },
72 "x": 14, 72 { "label": "L", "x": 9.75, "y": 3.5 },
73 "y": 0 73 { "label": ":", "x": 10.75, "y": 3.5 },
74 }, 74 { "label": "\"", "x": 11.75, "y": 3.5 },
75 { 75 { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
76 "label": "PrtSc", 76
77 "x": 15.25, 77 { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
78 "y": 0 78 { "label": "Z", "x": 2.25, "y": 4.5 },
79 }, 79 { "label": "X", "x": 3.25, "y": 4.5 },
80 { 80 { "label": "C", "x": 4.25, "y": 4.5 },
81 "label": "Scroll Lock", 81 { "label": "V", "x": 5.25, "y": 4.5 },
82 "x": 16.25, 82 { "label": "B", "x": 6.25, "y": 4.5 },
83 "y": 0 83 { "label": "N", "x": 7.25, "y": 4.5 },
84 }, 84 { "label": "M", "x": 8.25, "y": 4.5 },
85 { 85 { "label": "<", "x": 9.25, "y": 4.5 },
86 "label": "Pause", 86 { "label": ">", "x": 10.25, "y": 4.5 },
87 "x": 17.25, 87 { "label": "?", "x": 11.25, "y": 4.5 },
88 "y": 0 88 { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
89 }, 89 { "label": "\u2191", "x": 16.25, "y": 4.5 },
90 { 90
91 "label": "~", 91 { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
92 "x": 0, 92 { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
93 "y": 1.5 93 { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
94 }, 94 { "x": 3.75, "y": 5.5, "w": 6.25 },
95 { 95 { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
96 "label": "!", 96 { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
97 "x": 1, 97 { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
98 "y": 1.5 98 { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
99 }, 99 { "label": "\u2190", "x": 15.25, "y": 5.5 },
100 { 100 { "label": "\u2193", "x": 16.25, "y": 5.5 },
101 "label": "@", 101 { "label": "\u2192", "x": 17.25, "y": 5.5 }
102 "x": 2,
103 "y": 1.5
104 },
105 {
106 "label": "#",
107 "x": 3,
108 "y": 1.5
109 },
110 {
111 "label": "$",
112 "x": 4,
113 "y": 1.5
114 },
115 {
116 "label": "%",
117 "x": 5,
118 "y": 1.5
119 },
120 {
121 "label": "^",
122 "x": 6,
123 "y": 1.5
124 },
125 {
126 "label": "&",
127 "x": 7,
128 "y": 1.5
129 },
130 {
131 "label": "*",
132 "x": 8,
133 "y": 1.5
134 },
135 {
136 "label": "(",
137 "x": 9,
138 "y": 1.5
139 },
140 {
141 "label": ")",
142 "x": 10,
143 "y": 1.5
144 },
145 {
146 "label": "_",
147 "x": 11,
148 "y": 1.5
149 },
150 {
151 "label": "+",
152 "x": 12,
153 "y": 1.5
154 },
155 {
156 "label": "Backspace",
157 "x": 13,
158 "y": 1.5,
159 "w": 2
160 },
161 {
162 "label": "Insert",
163 "x": 15.25,
164 "y": 1.5
165 },
166 {
167 "label": "Home",
168 "x": 16.25,
169 "y": 1.5
170 },
171 {
172 "label": "PgUp",
173 "x": 17.25,
174 "y": 1.5
175 },
176 {
177 "label": "Tab",
178 "x": 0,
179 "y": 2.5,
180 "w": 1.5
181 },
182 {
183 "label": "Q",
184 "x": 1.5,
185 "y": 2.5
186 },
187 {
188 "label": "W",
189 "x": 2.5,
190 "y": 2.5
191 },
192 {
193 "label": "E",
194 "x": 3.5,
195 "y": 2.5
196 },
197 {
198 "label": "R",
199 "x": 4.5,
200 "y": 2.5
201 },
202 {
203 "label": "T",
204 "x": 5.5,
205 "y": 2.5
206 },
207 {
208 "label": "Y",
209 "x": 6.5,
210 "y": 2.5
211 },
212 {
213 "label": "U",
214 "x": 7.5,
215 "y": 2.5
216 },
217 {
218 "label": "I",
219 "x": 8.5,
220 "y": 2.5
221 },
222 {
223 "label": "O",
224 "x": 9.5,
225 "y": 2.5
226 },
227 {
228 "label": "P",
229 "x": 10.5,
230 "y": 2.5
231 },
232 {
233 "label": "{",
234 "x": 11.5,
235 "y": 2.5
236 },
237 {
238 "label": "}",
239 "x": 12.5,
240 "y": 2.5
241 },
242 {
243 "label": "|",
244 "x": 13.5,
245 "y": 2.5,
246 "w": 1.5
247 },
248 {
249 "label": "Delete",
250 "x": 15.25,
251 "y": 2.5
252 },
253 {
254 "label": "End",
255 "x": 16.25,
256 "y": 2.5
257 },
258 {
259 "label": "PgDn",
260 "x": 17.25,
261 "y": 2.5
262 },
263 {
264 "label": "Caps Lock",
265 "x": 0,
266 "y": 3.5,
267 "w": 1.75
268 },
269 {
270 "label": "A",
271 "x": 1.75,
272 "y": 3.5
273 },
274 {
275 "label": "S",
276 "x": 2.75,
277 "y": 3.5
278 },
279 {
280 "label": "D",
281 "x": 3.75,
282 "y": 3.5
283 },
284 {
285 "label": "F",
286 "x": 4.75,
287 "y": 3.5
288 },
289 {
290 "label": "G",
291 "x": 5.75,
292 "y": 3.5
293 },
294 {
295 "label": "H",
296 "x": 6.75,
297 "y": 3.5
298 },
299 {
300 "label": "J",
301 "x": 7.75,
302 "y": 3.5
303 },
304 {
305 "label": "K",
306 "x": 8.75,
307 "y": 3.5
308 },
309 {
310 "label": "L",
311 "x": 9.75,
312 "y": 3.5
313 },
314 {
315 "label": ":",
316 "x": 10.75,
317 "y": 3.5
318 },
319 {
320 "label": "\"",
321 "x": 11.75,
322 "y": 3.5
323 },
324 {
325 "label": "Enter",
326 "x": 12.75,
327 "y": 3.5,
328 "w": 2.25
329 },
330 {
331 "label": "Shift",
332 "x": 0,
333 "y": 4.5,
334 "w": 2.25
335 },
336 {
337 "label": "Z",
338 "x": 2.25,
339 "y": 4.5
340 },
341 {
342 "label": "X",
343 "x": 3.25,
344 "y": 4.5
345 },
346 {
347 "label": "C",
348 "x": 4.25,
349 "y": 4.5
350 },
351 {
352 "label": "V",
353 "x": 5.25,
354 "y": 4.5
355 },
356 {
357 "label": "B",
358 "x": 6.25,
359 "y": 4.5
360 },
361 {
362 "label": "N",
363 "x": 7.25,
364 "y": 4.5
365 },
366 {
367 "label": "M",
368 "x": 8.25,
369 "y": 4.5
370 },
371 {
372 "label": "<",
373 "x": 9.25,
374 "y": 4.5
375 },
376 {
377 "label": ">",
378 "x": 10.25,
379 "y": 4.5
380 },
381 {
382 "label": "?",
383 "x": 11.25,
384 "y": 4.5
385 },
386 {
387 "label": "Shift",
388 "x": 12.25,
389 "y": 4.5,
390 "w": 2.75
391 },
392 {
393 "label": "\u2191",
394 "x": 16.25,
395 "y": 4.5
396 },
397 {
398 "label": "Ctrl",
399 "x": 0,
400 "y": 5.5,
401 "w": 1.25
402 },
403 {
404 "label": "Win",
405 "x": 1.25,
406 "y": 5.5,
407 "w": 1.25
408 },
409 {
410 "label": "Alt",
411 "x": 2.5,
412 "y": 5.5,
413 "w": 1.25
414 },
415 {
416 "x": 3.75,
417 "y": 5.5,
418 "w": 6.25
419 },
420 {
421 "label": "Alt",
422 "x": 10,
423 "y": 5.5,
424 "w": 1.25
425 },
426 {
427 "label": "Fn",
428 "x": 11.25,
429 "y": 5.5,
430 "w": 1.25
431 },
432 {
433 "label": "Menu",
434 "x": 12.5,
435 "y": 5.5,
436 "w": 1.25
437 },
438 {
439 "label": "Ctrl",
440 "x": 13.75,
441 "y": 5.5,
442 "w": 1.25
443 },
444 {
445 "label": "\u2190",
446 "x": 15.25,
447 "y": 5.5
448 },
449 {
450 "label": "\u2193",
451 "x": 16.25,
452 "y": 5.5
453 },
454 {
455 "label": "\u2192",
456 "x": 17.25,
457 "y": 5.5
458 }
459 ] 102 ]
460 }, 103 },
461 "LAYOUT_tkl_iso": { 104 "LAYOUT_tkl_iso": {
462 "layout": [ 105 "layout": [
463 { 106 { "label": "Esc", "x": 0, "y": 0 },
464 "label": "Esc", 107 { "label": "F1", "x": 2, "y": 0 },
465 "x": 0, 108 { "label": "F2", "x": 3, "y": 0 },
466 "y": 0 109 { "label": "F3", "x": 4, "y": 0 },
467 }, 110 { "label": "F4", "x": 5, "y": 0 },
468 { 111 { "label": "F5", "x": 6.5, "y": 0 },
469 "label": "F1", 112 { "label": "F6", "x": 7.5, "y": 0 },
470 "x": 2, 113 { "label": "F7", "x": 8.5, "y": 0 },
471 "y": 0 114 { "label": "F8", "x": 9.5, "y": 0 },
472 }, 115 { "label": "F9", "x": 11, "y": 0 },
473 { 116 { "label": "F10", "x": 12, "y": 0 },
474 "label": "F2", 117 { "label": "F11", "x": 13, "y": 0 },
475 "x": 3, 118 { "label": "F12", "x": 14, "y": 0 },
476 "y": 0 119 { "label": "PrtSc", "x": 15.25, "y": 0 },
477 }, 120 { "label": "Scroll Lock", "x": 16.25, "y": 0 },
478 { 121 { "label": "Pause", "x": 17.25, "y": 0 },
479 "label": "F3", 122
480 "x": 4, 123 { "label": "~", "x": 0, "y": 1.5 },
481 "y": 0 124 { "label": "!", "x": 1, "y": 1.5 },
482 }, 125 { "label": "@", "x": 2, "y": 1.5 },
483 { 126 { "label": "#", "x": 3, "y": 1.5 },
484 "label": "F4", 127 { "label": "$", "x": 4, "y": 1.5 },
485 "x": 5, 128 { "label": "%", "x": 5, "y": 1.5 },
486 "y": 0 129 { "label": "^", "x": 6, "y": 1.5 },
487 }, 130 { "label": "&", "x": 7, "y": 1.5 },
488 { 131 { "label": "*", "x": 8, "y": 1.5 },
489 "label": "F5", 132 { "label": "(", "x": 9, "y": 1.5 },
490 "x": 6.5, 133 { "label": ")", "x": 10, "y": 1.5 },
491 "y": 0 134 { "label": "_", "x": 11, "y": 1.5 },
492 }, 135 { "label": "+", "x": 12, "y": 1.5 },
493 { 136 { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
494 "label": "F6", 137 { "label": "Insert", "x": 15.25, "y": 1.5 },
495 "x": 7.5, 138 { "label": "Home", "x": 16.25, "y": 1.5 },
496 "y": 0 139 { "label": "PgUp", "x": 17.25, "y": 1.5 },
497 }, 140
498 { 141 { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
499 "label": "F7", 142 { "label": "Q", "x": 1.5, "y": 2.5 },
500 "x": 8.5, 143 { "label": "W", "x": 2.5, "y": 2.5 },
501 "y": 0 144 { "label": "E", "x": 3.5, "y": 2.5 },
502 }, 145 { "label": "R", "x": 4.5, "y": 2.5 },
503 { 146 { "label": "T", "x": 5.5, "y": 2.5 },
504 "label": "F8", 147 { "label": "Y", "x": 6.5, "y": 2.5 },
505 "x": 9.5, 148 { "label": "U", "x": 7.5, "y": 2.5 },
506 "y": 0 149 { "label": "I", "x": 8.5, "y": 2.5 },
507 }, 150 { "label": "O", "x": 9.5, "y": 2.5 },
508 { 151 { "label": "P", "x": 10.5, "y": 2.5 },
509 "label": "F9", 152 { "label": "{", "x": 11.5, "y": 2.5 },
510 "x": 11, 153 { "label": "}", "x": 12.5, "y": 2.5 },
511 "y": 0 154 { "label": "Delete", "x": 15.25, "y": 2.5 },
512 }, 155 { "label": "End", "x": 16.25, "y": 2.5 },
513 { 156 { "label": "PgDn", "x": 17.25, "y": 2.5 },
514 "label": "F10", 157
515 "x": 12, 158 { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
516 "y": 0 159 { "label": "A", "x": 1.75, "y": 3.5 },
517 }, 160 { "label": "S", "x": 2.75, "y": 3.5 },
518 { 161 { "label": "D", "x": 3.75, "y": 3.5 },
519 "label": "F11", 162 { "label": "F", "x": 4.75, "y": 3.5 },
520 "x": 13, 163 { "label": "G", "x": 5.75, "y": 3.5 },
521 "y": 0 164 { "label": "H", "x": 6.75, "y": 3.5 },
522 }, 165 { "label": "J", "x": 7.75, "y": 3.5 },
523 { 166 { "label": "K", "x": 8.75, "y": 3.5 },
524 "label": "F12", 167 { "label": "L", "x": 9.75, "y": 3.5 },
525 "x": 14, 168 { "label": ":", "x": 10.75, "y": 3.5 },
526 "y": 0 169 { "label": "\"", "x": 11.75, "y": 3.5 },
527 }, 170 { "label": "#", "x": 12.75, "y": 3.5 },
528 { 171 { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
529 "label": "PrtSc", 172
530 "x": 15.25, 173 { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
531 "y": 0 174 { "label": "\\", "x": 1.25, "y": 4.5 },
532 }, 175 { "label": "Z", "x": 2.25, "y": 4.5 },
533 { 176 { "label": "X", "x": 3.25, "y": 4.5 },
534 "label": "Scroll Lock", 177 { "label": "C", "x": 4.25, "y": 4.5 },
535 "x": 16.25, 178 { "label": "V", "x": 5.25, "y": 4.5 },
536 "y": 0 179 { "label": "B", "x": 6.25, "y": 4.5 },
537 }, 180 { "label": "N", "x": 7.25, "y": 4.5 },
538 { 181 { "label": "M", "x": 8.25, "y": 4.5 },
539 "label": "Pause", 182 { "label": "<", "x": 9.25, "y": 4.5 },
540 "x": 17.25, 183 { "label": ">", "x": 10.25, "y": 4.5 },
541 "y": 0 184 { "label": "?", "x": 11.25, "y": 4.5 },
542 }, 185 { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
543 { 186 { "label": "\u2191", "x": 16.25, "y": 4.5 },
544 "label": "~", 187
545 "x": 0, 188 { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
546 "y": 1.5 189 { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
547 }, 190 { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
548 { 191 { "x": 3.75, "y": 5.5, "w": 6.25 },
549 "label": "!", 192 { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
550 "x": 1, 193 { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
551 "y": 1.5 194 { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
552 }, 195 { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
553 { 196 { "label": "\u2190", "x": 15.25, "y": 5.5 },
554 "label": "@", 197 { "label": "\u2193", "x": 16.25, "y": 5.5 },
555 "x": 2, 198 { "label": "\u2192", "x": 17.25, "y": 5.5 }
556 "y": 1.5 199 ]
557 }, 200 },
558 { 201 "LAYOUT_all": {
559 "label": "#", 202 "layout": [
560 "x": 3, 203 { "label": "Esc", "x": 0, "y": 0 },
561 "y": 1.5 204 { "label": "F1", "x": 2, "y": 0 },
562 }, 205 { "label": "F2", "x": 3, "y": 0 },
563 { 206 { "label": "F3", "x": 4, "y": 0 },
564 "label": "$", 207 { "label": "F4", "x": 5, "y": 0 },
565 "x": 4, 208 { "label": "F5", "x": 6.5, "y": 0 },
566 "y": 1.5 209 { "label": "F6", "x": 7.5, "y": 0 },
567 }, 210 { "label": "F7", "x": 8.5, "y": 0 },
568 { 211 { "label": "F8", "x": 9.5, "y": 0 },
569 "label": "%", 212 { "label": "F9", "x": 11, "y": 0 },
570 "x": 5, 213 { "label": "F10", "x": 12, "y": 0 },
571 "y": 1.5 214 { "label": "F11", "x": 13, "y": 0 },
572 }, 215 { "label": "F12", "x": 14, "y": 0 },
573 { 216 { "label": "PrtSc", "x": 15.25, "y": 0 },
574 "label": "^", 217 { "label": "Scroll Lock", "x": 16.25, "y": 0 },
575 "x": 6, 218 { "label": "Pause", "x": 17.25, "y": 0 },
576 "y": 1.5 219
577 }, 220 { "label": "~", "x": 0, "y": 1.5 },
578 { 221 { "label": "!", "x": 1, "y": 1.5 },
579 "label": "&", 222 { "label": "@", "x": 2, "y": 1.5 },
580 "x": 7, 223 { "label": "#", "x": 3, "y": 1.5 },
581 "y": 1.5 224 { "label": "$", "x": 4, "y": 1.5 },
582 }, 225 { "label": "%", "x": 5, "y": 1.5 },
583 { 226 { "label": "^", "x": 6, "y": 1.5 },
584 "label": "*", 227 { "label": "&", "x": 7, "y": 1.5 },
585 "x": 8, 228 { "label": "*", "x": 8, "y": 1.5 },
586 "y": 1.5 229 { "label": "(", "x": 9, "y": 1.5 },
587 }, 230 { "label": ")", "x": 10, "y": 1.5 },
588 { 231 { "label": "_", "x": 11, "y": 1.5 },
589 "label": "(", 232 { "label": "+", "x": 12, "y": 1.5 },
590 "x": 9, 233 { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
591 "y": 1.5 234 { "label": "Insert", "x": 15.25, "y": 1.5 },
592 }, 235 { "label": "Home", "x": 16.25, "y": 1.5 },
593 { 236 { "label": "PgUp", "x": 17.25, "y": 1.5 },
594 "label": ")", 237
595 "x": 10, 238 { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
596 "y": 1.5 239 { "label": "Q", "x": 1.5, "y": 2.5 },
597 }, 240 { "label": "W", "x": 2.5, "y": 2.5 },
598 { 241 { "label": "E", "x": 3.5, "y": 2.5 },
599 "label": "_", 242 { "label": "R", "x": 4.5, "y": 2.5 },
600 "x": 11, 243 { "label": "T", "x": 5.5, "y": 2.5 },
601 "y": 1.5 244 { "label": "Y", "x": 6.5, "y": 2.5 },
602 }, 245 { "label": "U", "x": 7.5, "y": 2.5 },
603 { 246 { "label": "I", "x": 8.5, "y": 2.5 },
604 "label": "+", 247 { "label": "O", "x": 9.5, "y": 2.5 },
605 "x": 12, 248 { "label": "P", "x": 10.5, "y": 2.5 },
606 "y": 1.5 249 { "label": "{", "x": 11.5, "y": 2.5 },
607 }, 250 { "label": "}", "x": 12.5, "y": 2.5 },
608 { 251 { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
609 "label": "Backspace", 252 { "label": "Delete", "x": 15.25, "y": 2.5 },
610 "x": 13, 253 { "label": "End", "x": 16.25, "y": 2.5 },
611 "y": 1.5, 254 { "label": "PgDn", "x": 17.25, "y": 2.5 },
612 "w": 2 255
613 }, 256 { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
614 { 257 { "label": "A", "x": 1.75, "y": 3.5 },
615 "label": "Insert", 258 { "label": "S", "x": 2.75, "y": 3.5 },
616 "x": 15.25, 259 { "label": "D", "x": 3.75, "y": 3.5 },
617 "y": 1.5 260 { "label": "F", "x": 4.75, "y": 3.5 },
618 }, 261 { "label": "G", "x": 5.75, "y": 3.5 },
619 { 262 { "label": "H", "x": 6.75, "y": 3.5 },
620 "label": "Home", 263 { "label": "J", "x": 7.75, "y": 3.5 },
621 "x": 16.25, 264 { "label": "K", "x": 8.75, "y": 3.5 },
622 "y": 1.5 265 { "label": "L", "x": 9.75, "y": 3.5 },
623 }, 266 { "label": ":", "x": 10.75, "y": 3.5 },
624 { 267 { "label": "\"", "x": 11.75, "y": 3.5 },
625 "label": "PgUp", 268 { "label": "#", "x": 12.75, "y": 3.5 },
626 "x": 17.25, 269 { "label": "Enter", "x": 13.75, "y": 3.5, "w": 1.25 },
627 "y": 1.5 270
628 }, 271 { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
629 { 272 { "label": "\\", "x": 1.25, "y": 4.5 },
630 "label": "Tab", 273 { "label": "Z", "x": 2.25, "y": 4.5 },
631 "x": 0, 274 { "label": "X", "x": 3.25, "y": 4.5 },
632 "y": 2.5, 275 { "label": "C", "x": 4.25, "y": 4.5 },
633 "w": 1.5 276 { "label": "V", "x": 5.25, "y": 4.5 },
634 }, 277 { "label": "B", "x": 6.25, "y": 4.5 },
635 { 278 { "label": "N", "x": 7.25, "y": 4.5 },
636 "label": "Q", 279 { "label": "M", "x": 8.25, "y": 4.5 },
637 "x": 1.5, 280 { "label": "<", "x": 9.25, "y": 4.5 },
638 "y": 2.5 281 { "label": ">", "x": 10.25, "y": 4.5 },
639 }, 282 { "label": "?", "x": 11.25, "y": 4.5 },
640 { 283 { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
641 "label": "W", 284 { "label": "\u2191", "x": 16.25, "y": 4.5 },
642 "x": 2.5, 285
643 "y": 2.5 286 { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
644 }, 287 { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
645 { 288 { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
646 "label": "E", 289 { "x": 3.75, "y": 5.5, "w": 6.25 },
647 "x": 3.5, 290 { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
648 "y": 2.5 291 { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
649 }, 292 { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
650 { 293 { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
651 "label": "R", 294 { "label": "\u2190", "x": 15.25, "y": 5.5 },
652 "x": 4.5, 295 { "label": "\u2193", "x": 16.25, "y": 5.5 },
653 "y": 2.5 296 { "label": "\u2192", "x": 17.25, "y": 5.5 }
654 },
655 {
656 "label": "T",
657 "x": 5.5,
658 "y": 2.5
659 },
660 {
661 "label": "Y",
662 "x": 6.5,
663 "y": 2.5
664 },
665 {
666 "label": "U",
667 "x": 7.5,
668 "y": 2.5
669 },
670 {
671 "label": "I",
672 "x": 8.5,
673 "y": 2.5
674 },
675 {
676 "label": "O",
677 "x": 9.5,
678 "y": 2.5
679 },
680 {
681 "label": "P",
682 "x": 10.5,
683 "y": 2.5
684 },
685 {
686 "label": "{",
687 "x": 11.5,
688 "y": 2.5
689 },
690 {
691 "label": "}",
692 "x": 12.5,
693 "y": 2.5
694 },
695 {
696 "label": "Enter",
697 "x": 13.75,
698 "y": 2.5,
699 "w": 1.25,
700 "h": 2
701 },
702 {
703 "label": "Delete",
704 "x": 15.25,
705 "y": 2.5
706 },
707 {
708 "label": "End",
709 "x": 16.25,
710 "y": 2.5
711 },
712 {
713 "label": "PgDn",
714 "x": 17.25,
715 "y": 2.5
716 },
717 {
718 "label": "Caps Lock",
719 "x": 0,
720 "y": 3.5,
721 "w": 1.75
722 },
723 {
724 "label": "A",
725 "x": 1.75,
726 "y": 3.5
727 },
728 {
729 "label": "S",
730 "x": 2.75,
731 "y": 3.5
732 },
733 {
734 "label": "D",
735 "x": 3.75,
736 "y": 3.5
737 },
738 {
739 "label": "F",
740 "x": 4.75,
741 "y": 3.5
742 },
743 {
744 "label": "G",
745 "x": 5.75,
746 "y": 3.5
747 },
748 {
749 "label": "H",
750 "x": 6.75,
751 "y": 3.5
752 },
753 {
754 "label": "J",
755 "x": 7.75,
756 "y": 3.5
757 },
758 {
759 "label": "K",
760 "x": 8.75,
761 "y": 3.5
762 },
763 {
764 "label": "L",
765 "x": 9.75,
766 "y": 3.5
767 },
768 {
769 "label": ":",
770 "x": 10.75,
771 "y": 3.5
772 },
773 {
774 "label": "\"",
775 "x": 11.75,
776 "y": 3.5
777 },
778 {
779 "label": "#",
780 "x": 12.75,
781 "y": 3.5
782 },
783 {
784 "label": "Shift",
785 "x": 0,
786 "y": 4.5,
787 "w": 1.25
788 },
789 {
790 "label": "\\",
791 "x": 1.25,
792 "y": 4.5
793 },
794 {
795 "label": "Z",
796 "x": 2.25,
797 "y": 4.5
798 },
799 {
800 "label": "X",
801 "x": 3.25,
802 "y": 4.5
803 },
804 {
805 "label": "C",
806 "x": 4.25,
807 "y": 4.5
808 },
809 {
810 "label": "V",
811 "x": 5.25,
812 "y": 4.5
813 },
814 {
815 "label": "B",
816 "x": 6.25,
817 "y": 4.5
818 },
819 {
820 "label": "N",
821 "x": 7.25,
822 "y": 4.5
823 },
824 {
825 "label": "M",
826 "x": 8.25,
827 "y": 4.5
828 },
829 {
830 "label": "<",
831 "x": 9.25,
832 "y": 4.5
833 },
834 {
835 "label": ">",
836 "x": 10.25,
837 "y": 4.5
838 },
839 {
840 "label": "?",
841 "x": 11.25,
842 "y": 4.5
843 },
844 {
845 "label": "Shift",
846 "x": 12.25,
847 "y": 4.5,
848 "w": 2.75
849 },
850 {
851 "label": "\u2191",
852 "x": 16.25,
853 "y": 4.5
854 },
855 {
856 "label": "Ctrl",
857 "x": 0,
858 "y": 5.5,
859 "w": 1.25
860 },
861 {
862 "label": "Win",
863 "x": 1.25,
864 "y": 5.5,
865 "w": 1.25
866 },
867 {
868 "label": "Alt",
869 "x": 2.5,
870 "y": 5.5,
871 "w": 1.25
872 },
873 {
874 "x": 3.75,
875 "y": 5.5,
876 "w": 6.25
877 },
878 {
879 "label": "Alt",
880 "x": 10,
881 "y": 5.5,
882 "w": 1.25
883 },
884 {
885 "label": "Fn",
886 "x": 11.25,
887 "y": 5.5,
888 "w": 1.25
889 },
890 {
891 "label": "Menu",
892 "x": 12.5,
893 "y": 5.5,
894 "w": 1.25
895 },
896 {
897 "label": "Ctrl",
898 "x": 13.75,
899 "y": 5.5,
900 "w": 1.25
901 },
902 {
903 "label": "\u2190",
904 "x": 15.25,
905 "y": 5.5
906 },
907 {
908 "label": "\u2193",
909 "x": 16.25,
910 "y": 5.5
911 },
912 {
913 "label": "\u2192",
914 "x": 17.25,
915 "y": 5.5
916 }
917 ] 297 ]
918 } 298 }
919 } 299 }
diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c
index f5500ea83..42091f36c 100644
--- a/keyboards/durgod/k320/k320.c
+++ b/keyboards/durgod/k320/k320.c
@@ -40,3 +40,23 @@ void led_init_ports(void) {
40 off_all_leds(); 40 off_all_leds();
41} 41}
42 42
43
44#ifndef WINLOCK_DISABLED
45static bool win_key_locked = false;
46
47bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
48 switch (keycode) {
49 case KC_TGUI:
50 if (record->event.pressed) {
51 // Toggle GUI lock on key press
52 win_key_locked = !win_key_locked;
53 writePin(LED_WIN_LOCK_PIN, !win_key_locked);
54 }
55 break;
56 case KC_LGUI:
57 if (win_key_locked) { return false; }
58 break;
59 }
60 return process_record_user(keycode, record);
61}
62#endif /* WINLOCK_DISABLED */
diff --git a/keyboards/durgod/k320/k320.h b/keyboards/durgod/k320/k320.h
index 48da04841..c504f5a2b 100644
--- a/keyboards/durgod/k320/k320.h
+++ b/keyboards/durgod/k320/k320.h
@@ -17,6 +17,17 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20#ifndef WINLOCK_DISABLED
21// Define the TGUI key here so it is available in QMK configurator
22enum K320_keycodes {
23 KC_TGUI = SAFE_RANGE, // Toggle between GUI Lock or Unlock
24 NEW_SAFE_RANGE
25};
26
27#undef SAFE_RANGE
28#define SAFE_RANGE NEW_SAFE_RANGE
29#endif /* WINLOCK_DISABLED */
30
20/* Function Prototype */ 31/* Function Prototype */
21void off_all_leds(void); 32void off_all_leds(void);
22void on_all_leds(void); 33void on_all_leds(void);
@@ -26,12 +37,12 @@ void on_all_leds(void);
26 37
27// This a shortcut to help you visually see your layout. 38// This a shortcut to help you visually see your layout.
28#define LAYOUT_tkl_ansi( \ 39#define LAYOUT_tkl_ansi( \
29 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ 40 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
30 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K2E, K2F, K1F, \ 41 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K2E, K2F, K1F, \
31 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K3E, K3F, \ 42 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K3E, K3F, \
32 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K4E, \ 43 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K4E, \
33 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \ 44 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
34 K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K6F \ 45 K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K6F \
35) { \ 46) { \
36 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ 47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
37 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \ 48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
@@ -45,10 +56,10 @@ void on_all_leds(void);
45 56
46// This a shortcut to help you visually see your layout. 57// This a shortcut to help you visually see your layout.
47#define LAYOUT_tkl_iso( \ 58#define LAYOUT_tkl_iso( \
48 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ 59 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
49 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K2E, K2F, K1F, \ 60 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K2E, K2F, K1F, \
50 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4E, K3D, K3E, K3F, \ 61 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3D, K3E, K3F, \
51 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ 62 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K4E, \
52 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \ 63 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
53 K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K6F \ 64 K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K6F \
54) { \ 65) { \
@@ -64,7 +75,7 @@ void on_all_leds(void);
64 75
65// This a shortcut to help you visually see your layout. 76// This a shortcut to help you visually see your layout.
66#define LAYOUT_all( \ 77#define LAYOUT_all( \
67 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ 78 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
68 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K2E, K2F, K1F, \ 79 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K2E, K2F, K1F, \
69 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K3E, K3F, \ 80 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K3E, K3F, \
70 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K4E, \ 81 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K4E, \
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.c b/keyboards/durgod/k320/keymaps/default/keymap.c
deleted file mode 100644
index 49a14ec29..000000000
--- a/keyboards/durgod/k320/keymaps/default/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
1/* Copyright 2021 kuenhlee and Don Kjer
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18// Layer shorthand
19enum _layer {
20 _BASE,
21 _FUNC
22};
23
24static bool win_key_locked = false;
25
26// Defines the keycodes used by our macros in process_record_user
27enum custom_keycodes {
28 KC_TGUI = SAFE_RANGE // Toggle between GUI Lock or Unlock
29};
30
31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 /* Keymap _BASE: Base Layer (Default Layer)
33 * ,-----------------------------------------------------------. ,--------------.
34 * |Esc |f1| f2| f3| f4| | f5| f6| f7| f8| | f9|f10|f11|f12| |Prnt|ScLk|Paus|
35 * |-----------------------------------------------------------| |--------------|
36 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backsp | | Ins|Home|PgUp|
37 * |-----------------------------------------------------------| |--------------|
38 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | Del| End|PgDn|
39 * |-----------------------------------------------------------| `--------------'
40 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return |
41 * |-----------------------------------------------------------| ,----.
42 * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | | Up |
43 * |-----------------------------------------------------------| ,-------------.
44 * |Ctrl|Gui |Alt | Space |Alt |Func |App |Ctrl| |Lft| Dn |Rig |
45 * `-----------------------------------------------------------' `-------------'
46 */
47 [_BASE] = LAYOUT_tkl_ansi( /* Base Layer */
48 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
49 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
50 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
51 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
52 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
53 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
54 ),
55 /* Keymap _FUNC: Function Layer
56 * ,-----------------------------------------------------------. ,--------------.
57 * | |Play|Stop|Prev|Next| |Mute|Vol+|Vol-| | | | | | | | | | |
58 * |-----------------------------------------------------------| |--------------|
59 * | | | | | | | | | | | | | | | | | | |
60 * |-----------------------------------------------------------| |--------------|
61 * | | | | | | | | | | | | | | | | | | |
62 * |-----------------------------------------------------------| `--------------'
63 * | | | | | | | | | | | | | |
64 * |-----------------------------------------------------------| ,----.
65 * | | | | | | | | | | | | | | |
66 * |-----------------------------------------------------------| ,-------------.
67 * | |Lock| | | |Func | | | | | | |
68 * `-----------------------------------------------------------' `-------------'
69 */
70 [_FUNC] = LAYOUT_tkl_ansi( /* Function Layer */
71 _______, KC_MPLY, KC_MSTP, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
72 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
73 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
75 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
76 _______, KC_TGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______
77 )
78};
79
80bool process_record_user(uint16_t keycode, keyrecord_t *record) {
81 switch (keycode) {
82 case KC_TGUI:
83 if (!record->event.pressed) {
84 // Toggle GUI lock on key release
85 win_key_locked = !win_key_locked;
86 writePin(LED_WIN_LOCK_PIN, !win_key_locked);
87 }
88 break;
89 case KC_LGUI:
90 if (win_key_locked) { return false; }
91 break;
92 }
93 return true;
94}
95
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json
new file mode 100644
index 000000000..d8242ae76
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default/keymap.json
@@ -0,0 +1,26 @@
1{
2 "keyboard": "durgod/k320",
3 "keymap": "default",
4 "layout": "LAYOUT_all",
5 "layers": [
6 [
7 "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", "KC_SLCK", "KC_PAUS",
8 "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_INS", "KC_HOME", "KC_PGUP",
9 "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_END", "KC_PGDN",
10 "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",
11 "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP",
12 "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "MO(1)", "KC_APP", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
13 ],
14 [
15 "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
16 "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",
17 "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",
18 "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",
19 "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",
20 "KC_TRNS", "KC_TGUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
21 ]
22 ],
23 "author":"dkjer",
24 "notes":"",
25 "version":1
26}
diff --git a/keyboards/durgod/k320/keymaps/default/readme.md b/keyboards/durgod/k320/keymaps/default/readme.md
index e26c79c8a..c94943a83 100644
--- a/keyboards/durgod/k320/keymaps/default/readme.md
+++ b/keyboards/durgod/k320/keymaps/default/readme.md
@@ -1,6 +1,8 @@
1# The default keymap for Durgod Taurus K320. 1# The default keymap for Durgod Taurus K320.
2 2
3Layer 0 : Standard ANSI 87 Keys TKL layout (Windows) 3Supports both ANSI and ISO layouts.
4
5Layer 0 : Standard 87/88 keys TKL layout (Windows)
4 6
5Layer 1 : Media control and Windows lock key 7Layer 1 : Media control and Windows lock key
6- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7 8- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_iso/keymap.c b/keyboards/durgod/k320/keymaps/default_iso/keymap.c
deleted file mode 100644
index 559b6fe71..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
1/* Copyright 2021 kuenhlee and Don Kjer
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18// Layer shorthand
19enum _layer {
20 _BASE,
21 _FUNC
22};
23
24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 /* Keymap _BASE: Base Layer (Default Layer)
26 * ,-----------------------------------------------------------. ,--------------.
27 * |Esc |f1| f2| f3| f4| | f5| f6| f7| f8| | f9|f10|f11|f12| |Prnt|ScLk|Paus|
28 * |-----------------------------------------------------------| |--------------|
29 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backsp | | Ins|Home|PgUp|
30 * |-----------------------------------------------------------| |--------------|
31 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | Del| End|PgDn|
32 * |------------------------------------------------------ Ret | `--------------'
33 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| #| |
34 * |-----------------------------------------------------------| ,----.
35 * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | | Up |
36 * |-----------------------------------------------------------| ,-------------.
37 * |Ctrl|Gui |Alt | Space |Alt | Fn |App |Ctrl| |Lft| Dn |Rig |
38 * `-----------------------------------------------------------' `-------------'
39 */
40 [_BASE] = LAYOUT_tkl_iso( /* Base Layer */
41 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
42 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
43 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN,
44 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
45 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
46 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
47 ),
48 /* Keymap _FUNC: Function Layer
49 * ,-----------------------------------------------------------. ,--------------.
50 * | |Play|Stop|Prev|Next| |Mute|Vol+|Vol-| | | | | | | | | | |
51 * |-----------------------------------------------------------| |--------------|
52 * | | | | | | | | | | | | | | | | | | |
53 * |-----------------------------------------------------------| |--------------|
54 * | | | | | | | | | | | | | | | | | | |
55 * |------------------------------------------------------- | `--------------'
56 * | | | | | | | | | | | | | | |
57 * |-----------------------------------------------------------| ,----.
58 * | | | | | | | | | | | | | | | |
59 * |-----------------------------------------------------------| ,-------------.
60 * | | | | | |Func | | | | | | |
61 * `-----------------------------------------------------------' `-------------'
62 */
63 [_FUNC] = LAYOUT_tkl_iso( /* Function Layer */
64 _______, KC_MPLY, KC_MSTP, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
65 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
70 )
71};
72
diff --git a/keyboards/durgod/k320/keymaps/default_iso/readme.md b/keyboards/durgod/k320/keymaps/default_iso/readme.md
deleted file mode 100644
index a7d1d5f1d..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
1# The ISO keymap for Durgod Taurus K320.
2
3Layer 0 : Standard ISO 88 Keys TKL layout (Windows)
4
5Layer 1 : Media control and Windows lock key
6- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
7
diff --git a/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c b/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c
deleted file mode 100644
index 783fc45f1..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
1/* Copyright 2021 kuenhlee and Don Kjer
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18// Layer shorthand
19enum _layer {
20 _BASE,
21 _FUNC
22};
23
24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 /* Keymap _BASE: Base Layer (Default Layer)
26 * ,-----------------------------------------------------------. ,--------------.
27 * |Esc |f1| f2| f3| f4| | f5| f6| f7| f8| | f9|f10|f11|f12| |Prnt|ScLk|Paus|
28 * |-----------------------------------------------------------| |--------------|
29 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backsp | | Ins|Home|PgUp|
30 * |-----------------------------------------------------------| |--------------|
31 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | Del| End|PgDn|
32 * |------------------------------------------------------ Ret | `--------------'
33 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| #| |
34 * |-----------------------------------------------------------| ,----.
35 * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | | Up |
36 * |-----------------------------------------------------------| ,-------------.
37 * |Ctrl|Alt |Gui | Space |Alt | Fn |App |Ctrl| |Lft| Dn |Rig |
38 * `-----------------------------------------------------------' `-------------'
39 */
40 [_BASE] = LAYOUT_tkl_iso( /* Base Layer */
41 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
42 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
43 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN,
44 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
45 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
46 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
47 ),
48 /* Keymap _FUNC: Function Layer
49 * ,-----------------------------------------------------------. ,--------------.
50 * | |Play|Stop|Prev|Next| |Mute|Vol+|Vol-| | | | | | | | | | |
51 * |-----------------------------------------------------------| |--------------|
52 * | | | | | | | | | | | | | | | | | | |
53 * |-----------------------------------------------------------| |--------------|
54 * | | | | | | | | | | | | | | | | | | |
55 * |------------------------------------------------------- | `--------------'
56 * | | | | | | | | | | | | | | |
57 * |-----------------------------------------------------------| ,----.
58 * | | | | | | | | | | | | | | | |
59 * |-----------------------------------------------------------| ,-------------.
60 * | | | | | |Func | | | | | | |
61 * `-----------------------------------------------------------' `-------------'
62 */
63 [_FUNC] = LAYOUT_tkl_iso( /* Function Layer */
64 _______, KC_MPLY, KC_MSTP, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
65 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
70 )
71};
diff --git a/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md b/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md
deleted file mode 100644
index 354f7b4cb..000000000
--- a/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
1# The ISO (Mac) keymap for Durgod Taurus K320.
2
3Layer 0 : Standard ISO 88 Keys TKL layout (Mac)
4
5Layer 1 : Media control
6- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_mac/keymap.json b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
new file mode 100644
index 000000000..dc5d3d3fd
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
@@ -0,0 +1,26 @@
1{
2 "keyboard": "durgod/k320",
3 "keymap": "default_mac",
4 "layout": "LAYOUT_all",
5 "layers": [
6 [
7 "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_F13", "KC_F14", "KC_F15",
8 "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_INS", "KC_HOME", "KC_PGUP",
9 "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", "KC_END", "KC_PGDN",
10 "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",
11 "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP",
12 "KC_LCTL", "KC_LALT", "KC_LGUI", "KC_SPC", "KC_RGUI", "KC_RALT", "MO(1)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
13 ],
14 [
15 "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
16 "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",
17 "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",
18 "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",
19 "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",
20 "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
21 ]
22 ],
23 "author":"AlCutter",
24 "notes":"",
25 "version":1
26}
diff --git a/keyboards/durgod/k320/keymaps/default_mac/readme.md b/keyboards/durgod/k320/keymaps/default_mac/readme.md
new file mode 100644
index 000000000..2765f14f9
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_mac/readme.md
@@ -0,0 +1,8 @@
1# The default (Mac) keymap for Durgod Taurus K320.
2
3Supports both ANSI and ISO layouts.
4
5Layer 0 : Standard 87/88 keys TKL layout (Mac)
6
7Layer 1 : Media control
8- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c
index 834d2ca55..8494fbe03 100644
--- a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c
+++ b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/keymap.c
@@ -59,20 +59,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 * |-----------------------------------------------------------| |--------------| 59 * |-----------------------------------------------------------| |--------------|
60 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | Del| End|PgDn| 60 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | Del| End|PgDn|
61 * |-----------------------------------------------------------| `--------------' 61 * |-----------------------------------------------------------| `--------------'
62 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return | 62 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| #|Ret |
63 * |-----------------------------------------------------------| ,----. 63 * |-----------------------------------------------------------| ,----.
64 * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | | Up | 64 * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | | Up |
65 * |-----------------------------------------------------------| ,-------------. 65 * |-----------------------------------------------------------| ,-------------.
66 * |Ctrl|Gui |Alt | Space |Alt |Func |App|Ctrl | |Lft| Dn |Rig | 66 * |Ctrl|Gui |Alt | Space |Alt |Func |App|Ctrl | |Lft| Dn |Rig |
67 * `-----------------------------------------------------------' `-------------' 67 * `-----------------------------------------------------------' `-------------'
68 */ 68 */
69 [_WBL] = LAYOUT_tkl_ansi( /* Windows Base Layer */ 69 [_WBL] = LAYOUT_all( /* Windows Base Layer */
70 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 70 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
71 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 71 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
72 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 72 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
73 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 73 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
74 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 74 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
75 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_WFN, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 75 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_WFN, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
76 ), 76 ),
77 /* Keymap _WFL: Windows Function Layer 77 /* Keymap _WFL: Windows Function Layer
78 * ,-----------------------------------------------------------. ,--------------. 78 * ,-----------------------------------------------------------. ,--------------.
@@ -82,20 +82,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 * |-----------------------------------------------------------| |--------------| 82 * |-----------------------------------------------------------| |--------------|
83 * | | | | | | | | | | | | | | | | | | | 83 * | | | | | | | | | | | | | | | | | | |
84 * |-----------------------------------------------------------| `--------------' 84 * |-----------------------------------------------------------| `--------------'
85 * | | | | | | | | | | | | | | 85 * | | | | | | | | | | | | | | |
86 * |-----------------------------------------------------------| ,----. 86 * |-----------------------------------------------------------| ,----.
87 * | | | | | | | | | | | | | | | 87 * | | | | | | | | | | | | | | | |
88 * |-----------------------------------------------------------| ,-------------. 88 * |-----------------------------------------------------------| ,-------------.
89 * | |Lock| | | |Func |Sys| | | | | | 89 * | |Lock| | | |Func |Sys| | | | | |
90 * `-----------------------------------------------------------' `-------------' 90 * `-----------------------------------------------------------' `-------------'
91 */ 91 */
92 [_WFL] = LAYOUT_tkl_ansi( /* Windows First Layer */ 92 [_WFL] = LAYOUT_all( /* Windows First Layer */
93 _______, KC_MPLY, KC_MSTP, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, 93 _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
94 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 94 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
95 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 95 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
97 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 97 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
98 _______, KC_TGUI, _______, _______, _______, _______, MO_WSL, _______, _______, _______, _______ 98 _______, KC_TGUI, _______, _______, _______, _______, MO_WSL, _______, _______, _______, _______
99 ), 99 ),
100 /* Keymap _WSL: Windows System Layer 100 /* Keymap _WSL: Windows System Layer
101 * ,-----------------------------------------------------------. ,--------------. 101 * ,-----------------------------------------------------------. ,--------------.
@@ -105,20 +105,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
105 * |-----------------------------------------------------------| |--------------| 105 * |-----------------------------------------------------------| |--------------|
106 * | | | | | | | | | | | | | | | | | | | 106 * | | | | | | | | | | | | | | | | | | |
107 * |-----------------------------------------------------------| `--------------' 107 * |-----------------------------------------------------------| `--------------'
108 * | | | | | | | | | | | | | | 108 * | | | | | | | | | | | | | | |
109 * |-----------------------------------------------------------| ,----. 109 * |-----------------------------------------------------------| ,----.
110 * | | | | | | | | | | | | | | | 110 * | | | | | | | | | | | | | | | |
111 * |-----------------------------------------------------------| ,-------------. 111 * |-----------------------------------------------------------| ,-------------.
112 * | | | | | |Func |Sys| | | | | | 112 * | | | | | |Func |Sys| | | | | |
113 * `-----------------------------------------------------------' `-------------' 113 * `-----------------------------------------------------------' `-------------'
114 */ 114 */
115 [_WSL] = LAYOUT_tkl_ansi( /* Windows Second / System Layer */ 115 [_WSL] = LAYOUT_all( /* Windows Second / System Layer */
116 RESET, KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL, XXXXXXX, XXXXXXX, XXXXXXX, 116 RESET, KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL, XXXXXXX, XXXXXXX, XXXXXXX,
117 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 117 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
118 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 118 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
119 XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 119 XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
120 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 120 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
121 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 121 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
122 ), 122 ),
123 123
124 /* Keymap _MBL: Mac Base Layer (Alternate Layout) 124 /* Keymap _MBL: Mac Base Layer (Alternate Layout)
@@ -129,20 +129,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
129 * |-----------------------------------------------------------| |--------------| 129 * |-----------------------------------------------------------| |--------------|
130 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | Del| End|PgDn| 130 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | Del| End|PgDn|
131 * |-----------------------------------------------------------| `--------------' 131 * |-----------------------------------------------------------| `--------------'
132 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return | 132 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| #|Ret |
133 * |-----------------------------------------------------------| ,----. 133 * |-----------------------------------------------------------| ,----.
134 * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | | Up | 134 * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | | Up |
135 * |-----------------------------------------------------------| ,-------------. 135 * |-----------------------------------------------------------| ,-------------.
136 * |Ctrl|Alt |Gui | Space |Gui |Alt|Func |Ctrl | |Lft| Dn |Rig | 136 * |Ctrl|Alt |Gui | Space |Gui |Alt|Func |Ctrl | |Lft| Dn |Rig |
137 * `-----------------------------------------------------------' `-------------' 137 * `-----------------------------------------------------------' `-------------'
138 */ 138 */
139 [_MBL] = LAYOUT_tkl_ansi( /* Mac Base Layer */ 139 [_MBL] = LAYOUT_all( /* Mac Base Layer */
140 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, 140 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
141 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 141 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
142 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 142 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
143 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 143 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
144 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 144 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
145 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_MFN, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 145 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_MFN, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
146 ), 146 ),
147 /* Keymap _MFL: Mac Function Layer 147 /* Keymap _MFL: Mac Function Layer
148 * ,-----------------------------------------------------------. ,--------------. 148 * ,-----------------------------------------------------------. ,--------------.
@@ -152,20 +152,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
152 * |-----------------------------------------------------------| |--------------| 152 * |-----------------------------------------------------------| |--------------|
153 * | | | | | | | | | | | | | | | | | | | 153 * | | | | | | | | | | | | | | | | | | |
154 * |-----------------------------------------------------------| `--------------' 154 * |-----------------------------------------------------------| `--------------'
155 * | | | | | | | | | | | | | | 155 * | | | | | | | | | | | | | | |
156 * |-----------------------------------------------------------| ,----. 156 * |-----------------------------------------------------------| ,----.
157 * | | | | | | | | | | | | | | | 157 * | | | | | | | | | | | | | | | |
158 * |-----------------------------------------------------------| ,-------------. 158 * |-----------------------------------------------------------| ,-------------.
159 * | | | | | |Sys|Func | | | | | | 159 * | | | | | |Sys|Func | | | | | |
160 * `-----------------------------------------------------------' `-------------' 160 * `-----------------------------------------------------------' `-------------'
161 */ 161 */
162 [_MFL] = LAYOUT_tkl_ansi( /* Mac First Layer */ 162 [_MFL] = LAYOUT_all( /* Mac First Layer */
163 _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_TMED, _______, _______, 163 _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TMED, _______, _______,
164 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 164 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
165 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 165 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
166 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 166 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
167 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 167 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
168 _______, _______, _______, _______, _______, MO_MSL, _______, _______, _______, _______, _______ 168 _______, _______, _______, _______, _______, MO_MSL, _______, _______, _______, _______, _______
169 ), 169 ),
170 /* Keymap _MSL: Mac System Layer 170 /* Keymap _MSL: Mac System Layer
171 * ,-----------------------------------------------------------. ,--------------. 171 * ,-----------------------------------------------------------. ,--------------.
@@ -175,20 +175,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
175 * |-----------------------------------------------------------| |--------------| 175 * |-----------------------------------------------------------| |--------------|
176 * | | | | | | | | | | | | | | | | | | | 176 * | | | | | | | | | | | | | | | | | | |
177 * |-----------------------------------------------------------| `--------------' 177 * |-----------------------------------------------------------| `--------------'
178 * | | | | | | | | | | | | | | 178 * | | | | | | | | | | | | | | |
179 * |-----------------------------------------------------------| ,----. 179 * |-----------------------------------------------------------| ,----.
180 * | | | | | | | | | | | | | | | 180 * | | | | | | | | | | | | | | | |
181 * |-----------------------------------------------------------| ,-------------. 181 * |-----------------------------------------------------------| ,-------------.
182 * | | | | | |Sys|Func | | | | | | 182 * | | | | | |Sys|Func | | | | | |
183 * `-----------------------------------------------------------' `-------------' 183 * `-----------------------------------------------------------' `-------------'
184 */ 184 */
185 [_MSL] = LAYOUT_tkl_ansi( /* Mac Second / System Layer */ 185 [_MSL] = LAYOUT_all( /* Mac Second / System Layer */
186 RESET, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL, XXXXXXX, XXXXXXX, XXXXXXX, 186 RESET, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL, XXXXXXX, XXXXXXX, XXXXXXX,
187 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 187 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
188 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 188 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
189 XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 189 XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
190 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 190 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
191 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 191 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
192 ) 192 )
193}; 193};
194 194
diff --git a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md
index 821c8b26a..0eef77fd4 100644
--- a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md
+++ b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/readme.md
@@ -1,6 +1,8 @@
1# A keymap for Durgod Taurus K320 that supports toggling between Mac and Windows 1# A keymap for Durgod Taurus K320 that supports toggling between Mac and Windows
2 2
3Layer 0 : Standard ANSI 87 Keys TKL layout (Windows) 3Supports both ANSI and ISO layouts.
4
5Layer 0 : Standard 87/88 keys TKL layout (Windows)
4 6
5Layer 1 : Media control and Windows lock key (Windows) 7Layer 1 : Media control and Windows lock key (Windows)
6- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7 8- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
@@ -12,7 +14,7 @@ Layer 2 : System layer (Windows)
12- Fn + Menu + F4 : Turning Off System 14- Fn + Menu + F4 : Turning Off System
13- Fn + Menu + F12 : Switch to Mac layout 15- Fn + Menu + F12 : Switch to Mac layout
14 16
15Layer 3 : Mac 87 Keys TKL layout 17Layer 3 : Mac 87/88 keys TKL layout
16 18
17Layer 4 : Media control and Media lock key (Mac) 19Layer 4 : Media control and Media lock key (Mac)
18 - Standard Mac Media keys for Fn + F1 ~ Fn + F12. 20 - Standard Mac Media keys for Fn + F1 ~ Fn + F12.
@@ -61,4 +63,3 @@ For repeating Flashing you have two options with this keymap:
612. Use key combination if using default keymap 632. Use key combination if using default keymap
62- Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout) (These are the same physical keys) 64- Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout) (These are the same physical keys)
63- Press Esc. Keyboard should go into booloader state. 65- Press Esc. Keyboard should go into booloader state.
64
diff --git a/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk
new file mode 100644
index 000000000..19843e8a2
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/default_toggle_mac_windows/rules.mk
@@ -0,0 +1 @@
OPT_DEFS += -DWINLOCK_DISABLED
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
index bf79f24db..866e522fc 100644
--- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
+++ b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
@@ -35,11 +35,6 @@
35#define KC_STOP LCTL(LSFT(KC_HOME)) // Select from Cursor to Home 35#define KC_STOP LCTL(LSFT(KC_HOME)) // Select from Cursor to Home
36#define KC_SEND LCTL(LSFT(KC_END)) // Select from Cursor to End 36#define KC_SEND LCTL(LSFT(KC_END)) // Select from Cursor to End
37 37
38// Defines the keycodes used by our macros in process_record_user
39enum custom_keycodes {
40 KC_TGUI = SAFE_RANGE // Toggle between GUI Lock or Unlock
41};
42
43// °±²³µ©ΩθΩ√∞∆≈≠→↓←↑≡■□●○∴«»÷≤≥Σ 38// °±²³µ©ΩθΩ√∞∆≈≠→↓←↑≡■□●○∴«»÷≤≥Σ
44// Defines the Enumeration for Unicode Map 39// Defines the Enumeration for Unicode Map
45enum unicode_names { 40enum unicode_names {
diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c
index 9a4d9ff38..fc46e3860 100644
--- a/keyboards/durgod/k320/keymaps/via/keymap.c
+++ b/keyboards/durgod/k320/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
1/* Copyright 2021 kuenhlee and Don Kjer 1/* Copyright 2021 Maxime Coirault
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,8 @@
19enum _layer { 19enum _layer {
20 _BASE, 20 _BASE,
21 _FUNC, 21 _FUNC,
22 _LAYER3 22 _LAYER3,
23 _LAYER4
23}; 24};
24 25
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -39,12 +40,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 * `-----------------------------------------------------------' `-------------' 40 * `-----------------------------------------------------------' `-------------'
40 */ 41 */
41 [_BASE] = LAYOUT_all( /* Base Layer */ 42 [_BASE] = LAYOUT_all( /* Base Layer */
42 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 43 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
43 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, 44 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
44 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, 45 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
45 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, 46 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
46 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, 47 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
47 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 48 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
48 ), 49 ),
49 /* Keymap _FUNC: Function Layer 50 /* Keymap _FUNC: Function Layer
50 * ,-----------------------------------------------------------. ,--------------. 51 * ,-----------------------------------------------------------. ,--------------.
@@ -62,20 +63,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
62 * `-----------------------------------------------------------' `-------------' 63 * `-----------------------------------------------------------' `-------------'
63 */ 64 */
64 [_FUNC] = LAYOUT_all( /* Function Layer */ 65 [_FUNC] = LAYOUT_all( /* Function Layer */
65 _______, KC_MPLY, KC_MSTP, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, 66 _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 70 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
70 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 71 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
71 ), 72 ),
72 [_LAYER3] = LAYOUT_all( /* Function Layer */ 73 [_LAYER3] = LAYOUT_all( /* Layer 3 */
73 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
74 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 75 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
75 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 77 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
77 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 78 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
78 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 79 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
79 ), 80 ),
81 [_LAYER4] = LAYOUT_all( /* Layer 4 */
82 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
84 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
85 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
86 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
87 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
88 )
80}; 89};
81 90
diff --git a/keyboards/durgod/k320/keymaps/via/readme.md b/keyboards/durgod/k320/keymaps/via/readme.md
index 1ed99238c..d1b2ac191 100644
--- a/keyboards/durgod/k320/keymaps/via/readme.md
+++ b/keyboards/durgod/k320/keymaps/via/readme.md
@@ -1,6 +1,6 @@
1# The default keymap for Durgod Taurus K320. 1# The default keymap for Durgod Taurus K320.
2 2
3Layer 0 : Standard Keys TKL layout 3Layer 0 : Standard 87/88 keys TKL layout
4 4
5Layer 1 : Media control 5Layer 1 : Media control
6- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7 6- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
diff --git a/keyboards/durgod/k320/keymaps/via/rules.mk b/keyboards/durgod/k320/keymaps/via/rules.mk
index 36b7ba9cb..8815b6a0a 100644
--- a/keyboards/durgod/k320/keymaps/via/rules.mk
+++ b/keyboards/durgod/k320/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
1OPT_DEFS += -DWINLOCK_DISABLED
2
1VIA_ENABLE = yes 3VIA_ENABLE = yes
2LTO_ENABLE = yes 4LTO_ENABLE = yes
diff --git a/keyboards/durgod/k320/readme.md b/keyboards/durgod/k320/readme.md
index 115029435..551a29282 100644
--- a/keyboards/durgod/k320/readme.md
+++ b/keyboards/durgod/k320/readme.md
@@ -1,6 +1,6 @@
1# K320 1# K320
2 2
3This is a standard fixed ANSI TKL from off the shelf Durgod Taurus K320 without Backlight. 3This is a standard off-the-shelf Durgod Taurus K320 TKL (87/88-key) keyboard without backlight.
4 4
5* Keyboard Maintainer: [dkjer](https://github.com/dkjer) 5* Keyboard Maintainer: [dkjer](https://github.com/dkjer)
6* Hardware Supported: Durgod Taurus K320 board with STM32F070RBT6 6* Hardware Supported: Durgod Taurus K320 board with STM32F070RBT6
@@ -30,7 +30,7 @@ For first Flashing from initial Stock's Firmware
30- Plug In USB 30- Plug In USB
31- Make a Flash Image's Backup in case you wanted to restore the Keyboard to Stock's Image: 31- Make a Flash Image's Backup in case you wanted to restore the Keyboard to Stock's Image:
32 - Using DFUseDemo.exe from ST's STSW-STM32080: https://www.st.com/en/development-tools/stsw-stm32080.html 32 - Using DFUseDemo.exe from ST's STSW-STM32080: https://www.st.com/en/development-tools/stsw-stm32080.html
33 - Using dfu-util (thanks to [tylert](https://github.com/tylert) for instructions!): 33 - Using dfu-util:
34 34
35 dfu-util --list 35 dfu-util --list
36 dfu-util --alt 0 --dfuse-address 0x08000000 --upload ${OLD_STOCK_BIN} 36 dfu-util --alt 0 --dfuse-address 0x08000000 --upload ${OLD_STOCK_BIN}
@@ -55,4 +55,3 @@ For repeating Flashing you can use BootMagic:
55- Unplug USB Cable 55- Unplug USB Cable
56- Holding Esc Button 56- Holding Esc Button
57- Plug in USB Cable, Keyboard should be in ST-Bootloader state 57- Plug in USB Cable, Keyboard should be in ST-Bootloader state
58
diff --git a/keyboards/durgod/k320/rules.mk b/keyboards/durgod/k320/rules.mk
index 040ea2dc8..7e910174f 100644
--- a/keyboards/durgod/k320/rules.mk
+++ b/keyboards/durgod/k320/rules.mk
@@ -2,7 +2,7 @@
2# Actually F070, but close enough 2# Actually F070, but close enough
3MCU = STM32F072 3MCU = STM32F072
4 4
5BOARD = ST_NUCLEO64_F070RB 5BOARD = DURGOD_STM32_F070
6 6
7# Do not put the microcontroller into power saving mode 7# Do not put the microcontroller into power saving mode
8OPT_DEFS += -DNO_SUSPEND_POWER_DOWN 8OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk
index 0709f341b..e5785270b 100644
--- a/keyboards/handwired/ck4x4/rules.mk
+++ b/keyboards/handwired/ck4x4/rules.mk
@@ -10,7 +10,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
10EXTRAKEY_ENABLE = yes # Audio control and System control 10EXTRAKEY_ENABLE = yes # Audio control and System control
11CONSOLE_ENABLE = yes # Console for debug 11CONSOLE_ENABLE = yes # Console for debug
12COMMAND_ENABLE = yes # Commands for debug and configuration 12COMMAND_ENABLE = yes # Commands for debug and configuration
13SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 13SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
14NKRO_ENABLE = yes # USB Nkey Rollover 14NKRO_ENABLE = yes # USB Nkey Rollover
15CUSTOM_MATRIX = no # Custom matrix file 15CUSTOM_MATRIX = no # Custom matrix file
16 16
diff --git a/keyboards/handwired/onekey/rules.mk b/keyboards/handwired/onekey/rules.mk
index 259050d55..df2ec1ecf 100644
--- a/keyboards/handwired/onekey/rules.mk
+++ b/keyboards/handwired/onekey/rules.mk
@@ -7,9 +7,9 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
7CONSOLE_ENABLE = yes # Console for debug(+400) 7CONSOLE_ENABLE = yes # Console for debug(+400)
8COMMAND_ENABLE = no # Commands for debug and configuration 8COMMAND_ENABLE = no # Commands for debug and configuration
9# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 9# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
10SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 10SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
11# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 11# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
12NKRO_ENABLE = yes # USB Nkey Rollover 12NKRO_ENABLE = yes # USB Nkey Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default 13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 15MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
diff --git a/keyboards/projectkb/alice/config.h b/keyboards/projectkb/alice/config.h
new file mode 100644
index 000000000..95fb682e1
--- /dev/null
+++ b/keyboards/projectkb/alice/config.h
@@ -0,0 +1,3 @@
1#pragma once
2
3#define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/projectkb/alice/halconf.h b/keyboards/projectkb/alice/halconf.h
index b17808ffe..0016e53ba 100644
--- a/keyboards/projectkb/alice/halconf.h
+++ b/keyboards/projectkb/alice/halconf.h
@@ -27,5 +27,7 @@
27 27
28#define HAL_USE_SPI TRUE 28#define HAL_USE_SPI TRUE
29 29
30#define HAL_USE_GPT TRUE
31
30#include_next <halconf.h> 32#include_next <halconf.h>
31 33
diff --git a/keyboards/projectkb/alice/mcuconf.h b/keyboards/projectkb/alice/mcuconf.h
index 4bfc7f946..6e0f1a50d 100644
--- a/keyboards/projectkb/alice/mcuconf.h
+++ b/keyboards/projectkb/alice/mcuconf.h
@@ -32,3 +32,5 @@
32#undef STM32_SPI_USE_SPI2 32#undef STM32_SPI_USE_SPI2
33#define STM32_SPI_USE_SPI2 TRUE 33#define STM32_SPI_USE_SPI2 TRUE
34 34
35#undef STM32_GPT_USE_TIM1
36#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/projectkb/signature87/rules.mk b/keyboards/projectkb/signature87/rules.mk
index fe0d976d1..caad4c83c 100644
--- a/keyboards/projectkb/signature87/rules.mk
+++ b/keyboards/projectkb/signature87/rules.mk
@@ -9,7 +9,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control 9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug 10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration 11COMMAND_ENABLE = yes # Commands for debug and configuration
12SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 12SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
13NKRO_ENABLE = yes # USB Nkey Rollover 13NKRO_ENABLE = yes # USB Nkey Rollover
14BACKLIGHT_ENABLE = no 14BACKLIGHT_ENABLE = no
15 15
diff --git a/keyboards/ramonimbao/wete/config.h b/keyboards/ramonimbao/wete/config.h
index 5d68a7efd..3d8955009 100644
--- a/keyboards/ramonimbao/wete/config.h
+++ b/keyboards/ramonimbao/wete/config.h
@@ -46,6 +46,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
46#define RGBLED_NUM 24 46#define RGBLED_NUM 24
47#define RGBLIGHT_ANIMATIONS 47#define RGBLIGHT_ANIMATIONS
48 48
49#define SLEEP_LED_GPT_DRIVER GPTD1
50
49/* define if matrix has ghost */ 51/* define if matrix has ghost */
50//#define MATRIX_HAS_GHOST 52//#define MATRIX_HAS_GHOST
51 53
diff --git a/keyboards/ramonimbao/wete/halconf.h b/keyboards/ramonimbao/wete/halconf.h
index c43440a45..b3de873be 100644
--- a/keyboards/ramonimbao/wete/halconf.h
+++ b/keyboards/ramonimbao/wete/halconf.h
@@ -23,5 +23,7 @@
23 23
24#define HAL_USE_PWM TRUE 24#define HAL_USE_PWM TRUE
25 25
26#define HAL_USE_GPT TRUE
27
26#include_next <halconf.h> 28#include_next <halconf.h>
27 29
diff --git a/keyboards/ramonimbao/wete/mcuconf.h b/keyboards/ramonimbao/wete/mcuconf.h
index b7f2c481c..7a2e87776 100644
--- a/keyboards/ramonimbao/wete/mcuconf.h
+++ b/keyboards/ramonimbao/wete/mcuconf.h
@@ -35,3 +35,5 @@
35#undef STM32_SPI_USE_SPI2 35#undef STM32_SPI_USE_SPI2
36#define STM32_SPI_USE_SPI2 TRUE 36#define STM32_SPI_USE_SPI2 TRUE
37 37
38#undef STM32_GPT_USE_TIM1
39#define STM32_GPT_USE_TIM1 TRUE
diff --git a/keyboards/readme.md b/keyboards/readme.md
index 6b7b92e0c..a23d0845b 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -63,4 +63,4 @@ These keyboards are part of the QMK repository, but their manufacturers are not
63* [Vision Division](/keyboards/vision_division) &mdash; Full Size / Split Linear Keyboard by IBNobody. 63* [Vision Division](/keyboards/vision_division) &mdash; Full Size / Split Linear Keyboard by IBNobody.
64* [XD004](/keyboards/xd004) &mdash; 1x4 macro keyboard sold by KPrepublic. 64* [XD004](/keyboards/xd004) &mdash; 1x4 macro keyboard sold by KPrepublic.
65* [XD75](/keyboards/xd75) &mdash; 15x5 ortholinear keyboard by XIUDI. 65* [XD75](/keyboards/xd75) &mdash; 15x5 ortholinear keyboard by XIUDI.
66* [YMDK NP21](/keyboards/ymdk_np21) &mdash; ps2avrGB based number pad (numpad) sold by YMDK on Aliexpress. 66* [YMDK NP21](/keyboards/ymdk_np21) &mdash; ps2avrGB based number pad (numpad) sold by YMDK on Aliexpress.
diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
index 78969ad7a..d7d50e137 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
@@ -8,11 +8,13 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
8CONSOLE_ENABLE = no # Console for debug 8CONSOLE_ENABLE = no # Console for debug
9COMMAND_ENABLE = no # Commands for debug and configuration 9COMMAND_ENABLE = no # Commands for debug and configuration
10NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
11RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not enable with RGB Matrix 11RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not enable with RGB Matrix
12RGBLIGHT_ANIMATIONS = yes # LED animations 12RGBLIGHT_ANIMATIONS = no # LED animations
13RGBLIGHT_SPLIT_ENABLE = yes # Split RGBLight Support 13RGBLIGHT_SPLIT_ENABLE = no # Split RGBLight Support
14RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight 14RGB_MATRIX_ENABLE = yes # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
15RGB_MATRIX_DRIVER = WS2812
15RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. 16RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects.
17SPLIT_RGB_MATRIX_ENABLE = yes # For split RGB Matrix support
16RGBLIGHT_FULL_POWER = yes # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port 18RGBLIGHT_FULL_POWER = yes # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
17UNICODE_ENABLE = no # Unicode 19UNICODE_ENABLE = no # Unicode
18SWAP_HANDS_ENABLE = no # Enable one-hand typing 20SWAP_HANDS_ENABLE = no # Enable one-hand typing
@@ -40,3 +42,7 @@ endif
40ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes) 42ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
41 OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE 43 OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
42endif 44endif
45
46ifeq ($(strip $(SPLIT_RGB_MATRIX_ENABLE)), yes)
47 OPT_DEFS += -DSPLIT_TRANSPORT_MIRROR
48endif
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 667b68f73..190a8bbe3 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -55,7 +55,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
55 #define RGBLED_NUM 60 55 #define RGBLED_NUM 60
56 #define RGBLED_SPLIT { 30, 30 } 56 #define RGBLED_SPLIT { 30, 30 }
57#endif 57#endif
58#define DRIVER_LED_TOTAL 30 58
59#define DRIVER_LED_TOTAL 60
60#define RGB_MATRIX_SPLIT { 30, 30 }
59 61
60#ifdef IOS_DEVICE_ENABLE 62#ifdef IOS_DEVICE_ENABLE
61 #define RGBLIGHT_LIMIT_VAL 40 63 #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c
index 3edf48c5d..1fb1716a0 100644
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.c
+++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c
@@ -2,72 +2,42 @@
2 2
3 3
4#ifdef RGB_MATRIX_ENABLE 4#ifdef RGB_MATRIX_ENABLE
5#define RGB_LEFT_HAND { { 0 | ( 5 << 4) }, { 102, 0 }, 4}, \ 5led_config_t g_led_config = { {
6 { { 0 | ( 4 << 4) }, { 81, 0 }, 4}, \ 6 { 5, 4, 3, 2, 1, 0 },
7 { { 0 | ( 3 << 4) }, { 61, 0 }, 4}, \ 7 { 11, 10, 9, 8, 7, 6 },
8 { { 0 | ( 2 << 4) }, { 41, 0 }, 4}, \ 8 { 17, 16, 15, 14, 13, 12 },
9 { { 0 | ( 1 << 4) }, { 20, 0 }, 4}, \ 9 { 23, 22, 21, 20, 19, 18 },
10 { { 0 | ( 0 << 4) }, { 0, 0 }, 1}, \ 10 { 29, 28, 27, 26, 25, 24 },
11 { { 1 | ( 5 << 4) }, { 102, 16 }, 4}, \ 11 { 35, 34, 33, 32, 31, 30 },
12 { { 1 | ( 4 << 4) }, { 81, 16 }, 4}, \ 12 { 41, 40, 39, 38, 37, 36 },
13 { { 1 | ( 3 << 4) }, { 61, 16 }, 4}, \ 13 { 47, 46, 45, 44, 43, 42 },
14 { { 1 | ( 2 << 4) }, { 41, 16 }, 4}, \ 14 { 53, 52, 51, 50, 49, 48 },
15 { { 1 | ( 1 << 4) }, { 20, 16 }, 4}, \ 15 { 59, 58, 57, 56, 55, 54 }
16 { { 1 | ( 0 << 4) }, { 0, 16 }, 1}, \ 16}, {
17 { { 2 | ( 5 << 4) }, { 102, 32 }, 4}, \ 17// Left Hand
18 { { 2 | ( 4 << 4) }, { 81, 32 }, 4}, \ 18 { 102, 0 }, { 81, 0 }, { 61, 0 }, { 41, 0 }, { 20, 0 }, { 0, 0 },
19 { { 2 | ( 3 << 4) }, { 61, 32 }, 4}, \ 19 { 102, 16 }, { 81, 16 }, { 61, 16 }, { 41, 16 }, { 20, 16 }, { 0, 16 },
20 { { 2 | ( 2 << 4) }, { 41, 32 }, 4}, \ 20 { 102, 32 }, { 81, 32 }, { 61, 32 }, { 41, 32 }, { 20, 32 }, { 0, 32 },
21 { { 2 | ( 1 << 4) }, { 20, 32 }, 4}, \ 21 { 102, 48 }, { 81, 48 }, { 61, 48 }, { 41, 48 }, { 20, 48 }, { 0, 48 },
22 { { 2 | ( 0 << 4) }, { 0, 32 }, 1}, \ 22 { 102, 64 }, { 81, 64 }, { 61, 64 }, { 41, 64 }, { 20, 64 }, { 0, 64 },
23 { { 3 | ( 5 << 4) }, { 102, 48 }, 4}, \ 23// Right Hand
24 { { 3 | ( 4 << 4) }, { 81, 48 }, 4}, \ 24 { 224, 0 }, { 204, 0 }, { 183, 0 }, { 163, 0 }, { 143, 0 }, { 122, 0 },
25 { { 3 | ( 3 << 4) }, { 61, 48 }, 4}, \ 25 { 224, 16 }, { 204, 16 }, { 183, 16 }, { 163, 16 }, { 143, 16 }, { 122, 16 },
26 { { 3 | ( 2 << 4) }, { 41, 48 }, 4}, \ 26 { 224, 32 }, { 204, 32 }, { 183, 32 }, { 163, 32 }, { 143, 32 }, { 122, 32 },
27 { { 3 | ( 1 << 4) }, { 20, 48 }, 4}, \ 27 { 224, 48 }, { 204, 48 }, { 183, 48 }, { 163, 48 }, { 143, 48 }, { 122, 48 },
28 { { 3 | ( 0 << 4) }, { 0, 48 }, 1}, \ 28 { 224, 64 }, { 204, 64 }, { 183, 64 }, { 163, 64 }, { 143, 64 }, { 122, 64 }
29 { { 4 | ( 5 << 4) }, { 102, 64 }, 1}, \ 29}, {
30 { { 4 | ( 4 << 4) }, { 81, 64 }, 1}, \
31 { { 4 | ( 3 << 4) }, { 61, 64 }, 1}, \
32 { { 4 | ( 2 << 4) }, { 41, 64 }, 1}, \
33 { { 4 | ( 1 << 4) }, { 20, 64 }, 1}, \
34 { { 4 | ( 0 << 4) }, { 0, 64 }, 1}
35
36#define RGB_RIGHT_HAND { { 0 | (11 << 4) }, { 224, 0 }, 1}, \
37 { { 0 | (10 << 4) }, { 204, 0 }, 4}, \
38 { { 0 | ( 9 << 4) }, { 183, 0 }, 4}, \
39 { { 0 | ( 8 << 4) }, { 163, 0 }, 4}, \
40 { { 0 | ( 7 << 4) }, { 143, 0 }, 4}, \
41 { { 0 | ( 6 << 4) }, { 122, 0 }, 4}, \
42 { { 1 | (11 << 4) }, { 224, 16 }, 1}, \
43 { { 1 | (10 << 4) }, { 204, 16 }, 4}, \
44 { { 1 | ( 9 << 4) }, { 183, 16 }, 4}, \
45 { { 1 | ( 8 << 4) }, { 163, 16 }, 4}, \
46 { { 1 | ( 7 << 4) }, { 143, 16 }, 4}, \
47 { { 1 | ( 6 << 4) }, { 122, 16 }, 4}, \
48 { { 2 | (11 << 4) }, { 224, 32 }, 1}, \
49 { { 2 | (10 << 4) }, { 204, 32 }, 4}, \
50 { { 2 | ( 9 << 4) }, { 183, 32 }, 4}, \
51 { { 2 | ( 8 << 4) }, { 163, 32 }, 4}, \
52 { { 2 | ( 7 << 4) }, { 143, 32 }, 4}, \
53 { { 2 | ( 6 << 4) }, { 122, 32 }, 4}, \
54 { { 3 | (11 << 4) }, { 224, 48 }, 1}, \
55 { { 3 | (10 << 4) }, { 204, 48 }, 4}, \
56 { { 3 | ( 9 << 4) }, { 183, 48 }, 4}, \
57 { { 3 | ( 8 << 4) }, { 163, 48 }, 4}, \
58 { { 3 | ( 7 << 4) }, { 143, 48 }, 4}, \
59 { { 3 | ( 6 << 4) }, { 122, 48 }, 4}, \
60 { { 4 | (11 << 4) }, { 224, 64 }, 1}, \
61 { { 4 | (10 << 4) }, { 204, 64 }, 1}, \
62 { { 4 | ( 9 << 4) }, { 183, 64 }, 1}, \
63 { { 4 | ( 8 << 4) }, { 163, 64 }, 1}, \
64 { { 4 | ( 7 << 4) }, { 143, 64 }, 1}, \
65 { { 4 | ( 6 << 4) }, { 122, 64 }, 1}
66
67rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
68// Left Hand 30// Left Hand
69RGB_LEFT_HAND 31 4, 4, 4, 4, 4, 1,
32 4, 4, 4, 4, 4, 1,
33 4, 4, 4, 4, 4, 1,
34 4, 4, 4, 4, 4, 1,
35 1, 1, 1, 1, 1, 1,
70// Right Hand 36// Right Hand
71//RGB_RIGHT_HAND 37 4, 4, 4, 4, 4, 4,
72}; 38 1, 4, 4, 4, 4, 4,
39 1, 4, 4, 4, 4, 4,
40 1, 4, 4, 4, 4, 4,
41 1, 1, 1, 1, 1, 1
42} };
73#endif 43#endif
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index f079ded4d..2afda085b 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -17,7 +17,6 @@
17#include "terrazzo.h" 17#include "terrazzo.h"
18 18
19#ifdef LED_MATRIX_ENABLE 19#ifdef LED_MATRIX_ENABLE
20 #include "is31fl3731-simple.h"
21 #include <math.h> 20 #include <math.h>
22 #include "print.h" 21 #include "print.h"
23 #include "quantum.h" 22 #include "quantum.h"
diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h
index 4f447e4ca..0f2ddc1dc 100644
--- a/keyboards/westfoxtrot/prophet/config.h
+++ b/keyboards/westfoxtrot/prophet/config.h
@@ -30,3 +30,5 @@
30#define LOCKING_SUPPORT_ENABLE 30#define LOCKING_SUPPORT_ENABLE
31/* Locking resynchronize hack */ 31/* Locking resynchronize hack */
32#define LOCKING_RESYNC_ENABLE 32#define LOCKING_RESYNC_ENABLE
33
34#define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/durgod/k320/keymaps/via/config.h b/keyboards/westfoxtrot/prophet/halconf.h
index 2ae6fca9d..cbfd1307f 100644
--- a/keyboards/durgod/k320/keymaps/via/config.h
+++ b/keyboards/westfoxtrot/prophet/halconf.h
@@ -1,5 +1,4 @@
1/* 1/* Copyright 2020 QMK
2 * Copyright 2021 Maxime Coirault
3 * 2 *
4 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
@@ -15,6 +14,14 @@
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 15 */
17 16
17/*
18 * This file was auto-generated by:
19 * `qmk chibios-confmigrate -i keyboards/projectkb/alice/halconf.h -r platforms/chibios/common/configs/halconf.h`
20 */
21
18#pragma once 22#pragma once
19 23
20#define DYNAMIC_KEYMAP_LAYER_COUNT 3 24#define HAL_USE_GPT TRUE
25
26#include_next <halconf.h>
27
diff --git a/keyboards/westfoxtrot/prophet/mcuconf.h b/keyboards/westfoxtrot/prophet/mcuconf.h
index 2665f9c9e..550141af6 100644
--- a/keyboards/westfoxtrot/prophet/mcuconf.h
+++ b/keyboards/westfoxtrot/prophet/mcuconf.h
@@ -23,6 +23,5 @@
23 23
24#include_next <mcuconf.h> 24#include_next <mcuconf.h>
25 25
26#undef STM32_PWM_USE_TIM3 26#undef STM32_GPT_USE_TIM1
27#define STM32_PWM_USE_TIM3 TRUE 27#define STM32_GPT_USE_TIM1 TRUE
28
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 10:51:47 +0000