summaryrefslogtreecommitdiffstats
path: root/keyboards/durgod/k320/keymaps/via
diff options
context:
space:
mode:
authorDonald Kjer <don.kjer@gmail.com>2021-03-20 17:11:22 -0700
committerGitHub <noreply@github.com>2021-03-21 11:11:22 +1100
commit00a0c81f8ea0d0ae3e8fe794370e218a42f93800 (patch)
tree40ecf685afc53f5786ec46295bb59ccdbd60acf3 /keyboards/durgod/k320/keymaps/via
parent945b7a0613860e4d95b6a421467ee0e337b6d89f (diff)
Durgod keyboard refactor in preparation for adding additional durgod keyboards (#11978)
* Durgod keyboard refactor in preparation for adding additional durgod keyboards * Moving Durgod board configuration into a common location * Reformatting layout macro whitespace * Moving TGUI key functionality to the keyboard level * Replacing default keymap.c with keymap.json * Changing default and default_toggle_mac_windows keymaps to LAYOUT_all * Increasing EEPROM size to support more VIA layers * Fixing media keys; KC_MRWD/KC_MFFD => KC_MPRV/KC_NXT * Move ISO Enter key to the correct row in Durgod K320 * Minor whitespace and readme cleanup for K320 * Changing durgod/k320 debounce back to default * Simplifying DURGOD_STM32_F070's chconf.h Co-authored-by: Simon Arlott <sa.me.uk> Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
Diffstat (limited to 'keyboards/durgod/k320/keymaps/via')
-rw-r--r--keyboards/durgod/k320/keymaps/via/config.h20
-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
4 files changed, 22 insertions, 31 deletions
diff --git a/keyboards/durgod/k320/keymaps/via/config.h b/keyboards/durgod/k320/keymaps/via/config.h
deleted file mode 100644
index 2ae6fca9d9..0000000000
--- a/keyboards/durgod/k320/keymaps/via/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2021 Maxime Coirault
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c
index 9a4d9ff38c..fc46e3860f 100644
--- a/keyboards/durgod/k320/keymaps/via/keymap.c
+++ b/keyboards/durgod/k320/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 kuenhlee and Don Kjer
+/* Copyright 2021 Maxime Coirault
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,7 +19,8 @@
enum _layer {
_BASE,
_FUNC,
- _LAYER3
+ _LAYER3,
+ _LAYER4
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -39,12 +40,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------' `-------------'
*/
[_BASE] = LAYOUT_all( /* Base Layer */
- 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,
- 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,
- 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,
+ 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,
+ 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,
+ 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,
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,
- 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,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNC),KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
/* Keymap _FUNC: Function Layer
* ,-----------------------------------------------------------. ,--------------.
@@ -62,20 +63,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------' `-------------'
*/
[_FUNC] = LAYOUT_all( /* Function Layer */
- _______, KC_MPLY, KC_MSTP, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [_LAYER3] = LAYOUT_all( /* Function Layer */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ [_LAYER3] = LAYOUT_all( /* Layer 3 */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
+ [_LAYER4] = LAYOUT_all( /* Layer 4 */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
diff --git a/keyboards/durgod/k320/keymaps/via/readme.md b/keyboards/durgod/k320/keymaps/via/readme.md
index 1ed99238c6..d1b2ac191d 100644
--- a/keyboards/durgod/k320/keymaps/via/readme.md
+++ b/keyboards/durgod/k320/keymaps/via/readme.md
@@ -1,6 +1,6 @@
# The default keymap for Durgod Taurus K320.
-Layer 0 : Standard Keys TKL layout
+Layer 0 : Standard 87/88 keys TKL layout
Layer 1 : Media control
- 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 36b7ba9cbc..8815b6a0a6 100644
--- a/keyboards/durgod/k320/keymaps/via/rules.mk
+++ b/keyboards/durgod/k320/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
+OPT_DEFS += -DWINLOCK_DISABLED
+
VIA_ENABLE = yes
LTO_ENABLE = yes