summaryrefslogtreecommitdiffstats
path: root/keyboards/dztech/dz65rgb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dztech/dz65rgb')
-rw-r--r--keyboards/dztech/dz65rgb/config.h18
-rw-r--r--keyboards/dztech/dz65rgb/info.json1
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c4
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c20
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c165
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h2
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c52
-rw-r--r--keyboards/dztech/dz65rgb/v1/config.h1
-rw-r--r--keyboards/dztech/dz65rgb/v1/info.json6
-rw-r--r--keyboards/dztech/dz65rgb/v1/rules.mk9
-rw-r--r--keyboards/dztech/dz65rgb/v2/config.h1
-rw-r--r--keyboards/dztech/dz65rgb/v2/info.json5
-rw-r--r--keyboards/dztech/dz65rgb/v2/rules.mk8
-rwxr-xr-xkeyboards/dztech/dz65rgb/v3/config.h4
-rw-r--r--keyboards/dztech/dz65rgb/v3/info.json4
-rwxr-xr-xkeyboards/dztech/dz65rgb/v3/rules.mk5
16 files changed, 129 insertions, 176 deletions
diff --git a/keyboards/dztech/dz65rgb/config.h b/keyboards/dztech/dz65rgb/config.h
deleted file mode 100644
index 71487efbd9..0000000000
--- a/keyboards/dztech/dz65rgb/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * 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
-#include "config_common.h"
diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json
index 32171cd74a..f57c879ed7 100644
--- a/keyboards/dztech/dz65rgb/info.json
+++ b/keyboards/dztech/dz65rgb/info.json
@@ -6,6 +6,7 @@
"usb": {
"vid": "0x445A"
},
+ "community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index 8bc5edf937..d4e1851f68 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -86,7 +86,7 @@ enum unicode_names {
UC_THUMBSUP, // 👎
};
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
[UC_GRINNING_FACE] = 0x1F603,
[UC_BEAMING_FACE] = 0x1F601,
[UC_GRINNING_FACE_WITH_SWEAT] = 0x1F605,
@@ -233,7 +233,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool rgb_matrix_indicators_user(void) {
// CapsLock Light
- if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+ if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(30, MAIN_COLOR[0], MAIN_COLOR[1], MAIN_COLOR[2]);
}
diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
index 731f287a27..735ceef722 100644
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
@@ -9,17 +9,17 @@ enum tofu68_layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_65_ansi(
- QK_GESC, 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_GRV, \
- 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_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \
- 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, KC_PGDN, \
- KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, FNM, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \
+ QK_GESC, 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_GRV,
+ 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_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ 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, KC_PGDN,
+ KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, FNM, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FNM] = LAYOUT_65_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_MUTE, KC_VOLU, \
- _______, RGB_TOG, RGB_MOD, RGB_HUI ,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, KC_VOLD, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AG_TOGG, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, _______, \
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R \
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_MUTE, KC_VOLU,
+ _______, RGB_TOG, RGB_MOD, RGB_HUI ,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, KC_VOLD,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AG_TOGG, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
)
};
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index d0d22f28b4..3870c6aae3 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -142,7 +142,7 @@ bool rgb_matrix_indicators_user(void) {
const uint8_t led_constant_val = rgb_matrix_config.hsv.v < 100 ? 100 : rgb_matrix_config.hsv.v;
/* CapsLock LED indicator */
- if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+ if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color_hsv(30, 999, 0, led_constant_val, 0.75); // WHITE
}
@@ -343,7 +343,7 @@ void send_french_accent(uint8_t letter, uint8_t accent) {
}
}
- isCaps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? true : false;
+ isCaps = host_keyboard_led_state().caps_lock ? true : false;
if (onMac) {
if (isCaps) {
@@ -418,302 +418,291 @@ void ldrkey_send_curlybrace_wrap_selection(void) {
onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "{}" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "{}" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT));
}
-LEADER_EXTERNS();
+void leader_start_user(void) {
+ isLeader = true;
+}
-void matrix_scan_user(void)
-{
- LEADER_DICTIONARY()
- {
- leading = false;
- leader_end();
+void leader_end_user(void) {
+ isLeader = false;
- /* Sequences on layer _MAIN & _MAC */
+ /* Sequences on layer _MAIN & _MAC */
/* éÉ => LdrKey > / */
- SEQ_ONE_KEY(KC_SLSH) {
+ if (leader_sequence_one_key(KC_SLSH)) {
send_french_accent(_E, _ACUTE);
}
/* àÀ => LdrKey > A */
- SEQ_ONE_KEY(KC_A) {
+ if (leader_sequence_one_key(KC_A)) {
send_french_accent(_A, _GRAVE);
}
/* èÈ => LdrKey > E */
- SEQ_ONE_KEY(KC_E) {
+ if (leader_sequence_one_key(KC_E)) {
send_french_accent(_E, _GRAVE);
}
/* ùÙ => LdrKey > U */
- SEQ_ONE_KEY(KC_U) {
+ if (leader_sequence_one_key(KC_U)) {
send_french_accent(_U, _GRAVE);
}
/* â => LdrKey > A > A */
- SEQ_TWO_KEYS(KC_A, KC_A) {
+ if (leader_sequence_two_keys(KC_A, KC_A)) {
send_french_accent(_A, _CIRCUMFLEX);
}
/* êÊ => LdrKey > E > E */
- SEQ_TWO_KEYS(KC_E, KC_E) {
+ if (leader_sequence_two_keys(KC_E, KC_E)) {
send_french_accent(_E, _CIRCUMFLEX);
}
/* îÎ => LdrKey > I > I */
- SEQ_TWO_KEYS(KC_I, KC_I) {
+ if (leader_sequence_two_keys(KC_I, KC_I)) {
send_french_accent(_I, _CIRCUMFLEX);
}
/* ôÔ => LdrKey > O > O */
- SEQ_TWO_KEYS(KC_O, KC_O) {
+ if (leader_sequence_two_keys(KC_O, KC_O)) {
send_french_accent(_O, _CIRCUMFLEX);
}
/* ûÛ => LdrKey > U > U */
- SEQ_TWO_KEYS(KC_U, KC_U) {
+ if (leader_sequence_two_keys(KC_U, KC_U)) {
send_french_accent(_U, _CIRCUMFLEX);
}
/* çÇ => LdrKey > C */
- SEQ_ONE_KEY(KC_C) {
+ if (leader_sequence_one_key(KC_C)) {
if (onMac) {
SEND_STRING(SS_LALT("c"));
} else {
- IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P2) SS_TAP(X_P8) SS_UP(X_LALT)) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P3) SS_TAP(X_P5) SS_UP(X_LALT));
+ host_keyboard_led_state().caps_lock ? SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P2) SS_TAP(X_P8) SS_UP(X_LALT)) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P3) SS_TAP(X_P5) SS_UP(X_LALT));
}
}
/* CapsLock */
- SEQ_ONE_KEY(QK_LEAD) {
+ if (leader_sequence_one_key(QK_LEAD)) {
tap_code(KC_CAPS);
}
/* ± => LdrKey > = > - */
- SEQ_TWO_KEYS(KC_EQL, KC_MINS) {
+ if (leader_sequence_two_keys(KC_EQL, KC_MINS)) {
onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_EQL)))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P1) SS_UP(X_LALT));
}
/* ≤ => LdrKey > - > = */
- SEQ_TWO_KEYS(KC_MINS, KC_EQL) {
+ if (leader_sequence_two_keys(KC_MINS, KC_EQL)) {
onMac ? SEND_STRING(SS_LALT(SS_TAP(X_COMM))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P3) SS_UP(X_LALT));
}
/* ≥ => LdrKey > = > = */
- SEQ_TWO_KEYS(KC_EQL, KC_EQL) {
+ if (leader_sequence_two_keys(KC_EQL, KC_EQL)) {
onMac ? SEND_STRING(SS_LALT(SS_TAP(X_DOT))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P2) SS_UP(X_LALT));
}
/* <= => LdrKey > , > , */
- SEQ_TWO_KEYS(KC_COMM, KC_COMM) {
+ if (leader_sequence_two_keys(KC_COMM, KC_COMM)) {
SEND_STRING(SS_LSFT(SS_TAP(X_COMM)) SS_TAP(X_SPC) SS_TAP(X_EQL) SS_TAP(X_LEFT) SS_TAP(X_BSPC) SS_TAP(X_RIGHT));
}
/* => => LdrKey > . > . */
- SEQ_TWO_KEYS(KC_DOT, KC_DOT) {
+ if (leader_sequence_two_keys(KC_DOT, KC_DOT)) {
SEND_STRING("=>");
}
/* ", " => LdrKey > " " */
- SEQ_ONE_KEY(KC_SPC) {
+ if (leader_sequence_one_key(KC_SPC)) {
SEND_STRING(", ");
}
/* ". " => LdrKey > " " > " " */
- SEQ_TWO_KEYS(KC_SPC, KC_SPC) {
+ if (leader_sequence_two_keys(KC_SPC, KC_SPC)) {
SEND_STRING(". ");
}
/* Backward delete current word (on cursor) */
- SEQ_TWO_KEYS(KC_BSPC, KC_BSPC) {
+ if (leader_sequence_two_keys(KC_BSPC, KC_BSPC)) {
onMac ? SEND_STRING(SS_LALT(SS_TAP(X_RIGHT)) SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_TAP(X_RIGHT)) SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC));
}
/* Previous word delete */
- SEQ_ONE_KEY(KC_BSPC) {
+ if (leader_sequence_one_key(KC_BSPC)) {
onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC));
}
/* Forward delete current word (on cursor) */
- SEQ_TWO_KEYS(KC_DEL, KC_DEL) {
+ if (leader_sequence_two_keys(KC_DEL, KC_DEL)) {
onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)) : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
}
/* Next word delete */
- SEQ_ONE_KEY(KC_DEL) {
+ if (leader_sequence_one_key(KC_DEL)) {
onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)): SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
}
/* ` => LdrKey > Escape */
- SEQ_ONE_KEY(QK_GESC) {
+ if (leader_sequence_one_key(QK_GESC)) {
SEND_STRING("`");
}
/* ``` => LdrKey > Escape > Escape > Escape */
- SEQ_THREE_KEYS(QK_GESC, QK_GESC, QK_GESC) {
+ if (leader_sequence_three_keys(QK_GESC, QK_GESC, QK_GESC)) {
SEND_STRING("```");
}
/* Printscreen => LdrKey > Insert */
- SEQ_ONE_KEY(KC_INS) {
+ if (leader_sequence_one_key(KC_INS)) {
onMac ? SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_4)))) : SEND_STRING(SS_TAP(X_PSCR));
}
/* Home => LdrKey > Page Up */
- SEQ_ONE_KEY(KC_PGUP) {
+ if (leader_sequence_one_key(KC_PGUP)) {
onMac ? SEND_STRING(SS_TAP(X_HOME)) : SEND_STRING(SS_LCTL(SS_TAP(X_HOME)));
}
/* End => LdrKey > Page Down */
- SEQ_ONE_KEY(KC_PGDN) {
+ if (leader_sequence_one_key(KC_PGDN)) {
onMac ? SEND_STRING(SS_TAP(X_END)) : SEND_STRING(SS_LCTL(SS_TAP(X_END)));
}
/* Close Curernt File/Tab => LdrKey > W */
- SEQ_ONE_KEY(KC_W) {
+ if (leader_sequence_one_key(KC_W)) {
onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_W))) : SEND_STRING(SS_LCTL(SS_TAP(X_W)));
}
/* Close Current App => LdrKey > Q */
- SEQ_ONE_KEY(KC_Q) {
+ if (leader_sequence_one_key(KC_Q)) {
onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_Q))) : SEND_STRING(SS_LALT(SS_TAP(X_F4)));
}
/* " => LdrKey > ' */
- SEQ_ONE_KEY(KC_QUOT) {
+ if (leader_sequence_one_key(KC_QUOT)) {
SEND_STRING("\"");
}
/* "|" => LdrKey > ' > ' */
- SEQ_TWO_KEYS(KC_QUOT, KC_QUOT) {
+ if (leader_sequence_two_keys(KC_QUOT, KC_QUOT)) {
SEND_STRING("\"\"" SS_TAP(X_LEFT));
}
/* "X" wrap => LdrKey > ' > ' > ' */
- SEQ_THREE_KEYS(KC_QUOT, KC_QUOT, KC_QUOT) {
+ if (leader_sequence_three_keys(KC_QUOT, KC_QUOT, KC_QUOT)) {
onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "\"" SS_LALT(SS_TAP(X_RIGHT)) "\"") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "\"" SS_LCTL(SS_TAP(X_RIGHT)) "\"");
}
/* ( => LdrKey > Left Shift */
- SEQ_ONE_KEY(KC_LSFT) {
+ if (leader_sequence_one_key(KC_LSFT)) {
SEND_STRING("(");
}
/* ) => LdrKey > Right Shift */
- SEQ_ONE_KEY(KC_RSFT) {
+ if (leader_sequence_one_key(KC_RSFT)) {
SEND_STRING(")");
}
/* (|) => LdrKey > Left Shift > Left Shift */
- SEQ_TWO_KEYS(KC_LSFT, KC_LSFT) {
+ if (leader_sequence_two_keys(KC_LSFT, KC_LSFT)) {
ldrkey_send_paranthesis_wrap_ini();
}
/* (|) => LdrKey > Right Shift > Right Shift */
- SEQ_TWO_KEYS(KC_RSFT, KC_RSFT) {
+ if (leader_sequence_two_keys(KC_RSFT, KC_RSFT)) {
ldrkey_send_paranthesis_wrap_ini();
}
/* (X) wrap => LdrKey > Left Shift > W */
- SEQ_TWO_KEYS(KC_LSFT, KC_W) {
+ if (leader_sequence_two_keys(KC_LSFT, KC_W)) {
ldrkey_send_paranthesis_wrap_word();
}
/* (X) wrap => LdrKey > Right Shift > W */
- SEQ_TWO_KEYS(KC_RSFT, KC_W) {
+ if (leader_sequence_two_keys(KC_RSFT, KC_W)) {
ldrkey_send_paranthesis_wrap_word();
}
/* (X) wrap selection => LdrKey > Left Shift > W > W */
- SEQ_THREE_KEYS(KC_LSFT, KC_W, KC_W) {
+ if (leader_sequence_three_keys(KC_LSFT, KC_W, KC_W)) {
ldrkey_send_paranthesis_wrap_selection();
}
/* (X) wrap selection => LdrKey > Right Shift > W > W */
- SEQ_THREE_KEYS(KC_RSFT, KC_W, KC_W) {
+ if (leader_sequence_three_keys(KC_RSFT, KC_W, KC_W)) {
ldrkey_send_paranthesis_wrap_selection();
}
/* [ => LdrKey > Left CTL */
- SEQ_ONE_KEY(KC_LCTL) {
+ if (leader_sequence_one_key(KC_LCTL)) {
SEND_STRING("[");
}
/* ] => LdrKey > Right CTL */
- SEQ_ONE_KEY(KC_RCTL) {
+ if (leader_sequence_one_key(KC_RCTL)) {
SEND_STRING("]");
}
/* [|] => LdrKey > Left CTL > Left CTL */
- SEQ_TWO_KEYS(KC_LCTL, KC_LCTL) {
+ if (leader_sequence_two_keys(KC_LCTL, KC_LCTL)) {
ldrkey_send_bracket_wrap_ini();
}
/* [|] => LdrKey > Right CTL > Right CTL */
- SEQ_TWO_KEYS(KC_RCTL, KC_RCTL) {
+ if (leader_sequence_two_keys(KC_RCTL, KC_RCTL)) {
ldrkey_send_bracket_wrap_ini();
}
/* [X] wrap => LdrKey > Left CTL > W */
- SEQ_TWO_KEYS(KC_LCTL, KC_W) {
+ if (leader_sequence_two_keys(KC_LCTL, KC_W)) {
ldrkey_send_bracket_wrap_word();
}
/* [X] wrap => LdrKey > Right CTL > W */
- SEQ_TWO_KEYS(KC_RCTL, KC_W) {
+ if (leader_sequence_two_keys(KC_RCTL, KC_W)) {
ldrkey_send_bracket_wrap_word();
}
/* [X] wrap selection => LdrKey > Left CTL > W > W */
- SEQ_THREE_KEYS(KC_LCTL, KC_W, KC_W) {
+ if (leader_sequence_three_keys(KC_LCTL, KC_W, KC_W)) {
ldrkey_send_bracket_wrap_selection();
}
/* [X] wrap selection => LdrKey > Right CTL > W > W */
- SEQ_THREE_KEYS(KC_RCTL, KC_W, KC_W) {
+ if (leader_sequence_three_keys(KC_RCTL, KC_W, KC_W)) {
ldrkey_send_bracket_wrap_selection();
}
/* { => LdrKey > Left ALT */
- SEQ_ONE_KEY(KC_LALT) {
+ if (leader_sequence_one_key(KC_LALT)) {
SEND_STRING("{");
}
/* } => LdrKey > Right ALT */
- SEQ_ONE_KEY(KC_RALT) {
+ if (leader_sequence_one_key(KC_RALT)) {
SEND_STRING("}");
}
/* {|} => LdrKey > Left ALT > Left ALT */
- SEQ_TWO_KEYS(KC_LALT, KC_LALT) {
+ if (leader_sequence_two_keys(KC_LALT, KC_LALT)) {
ldrkey_send_curlybrace_wrap_ini();
}
/* {|} => LdrKey > Right ALT > Right ALT */
- SEQ_TWO_KEYS(KC_RALT, KC_RALT) {
+ if (leader_sequence_two_keys(KC_RALT, KC_RALT)) {
ldrkey_send_curlybrace_wrap_ini();
}
/* {X} wrap => LdrKey > Left ALT > W */
- SEQ_TWO_KEYS(KC_LALT, KC_W) {
+ if (leader_sequence_two_keys(KC_LALT, KC_W)) {
ldrkey_send_curlybrace_wrap_word();
}
/* {X} wrap => LdrKey > Right ALT > W */
- SEQ_TWO_KEYS(KC_RALT, KC_W) {
+ if (leader_sequence_two_keys(KC_RALT, KC_W)) {
ldrkey_send_curlybrace_wrap_word();
}
/* {X} wrap selection => LdrKey > Left ALT > W > W */
- SEQ_THREE_KEYS(KC_LALT, KC_W, KC_W) {
+ if (leader_sequence_three_keys(KC_LALT, KC_W, KC_W)) {
ldrkey_send_curlybrace_wrap_selection();
}
/* {X} wrap selection => LdrKey > Right ALT > W > W */
- SEQ_THREE_KEYS(KC_RALT, KC_W, KC_W) {
+ if (leader_sequence_three_keys(KC_RALT, KC_W, KC_W)) {
ldrkey_send_curlybrace_wrap_selection();
}
/* Select everything on this line before cursor => LdrKey > Left */
- SEQ_ONE_KEY(KC_LEFT) {
+ if (leader_sequence_one_key(KC_LEFT)) {
onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_LEFT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_HOME)));
}
/* Select everything on this line after cursor => LdrKey > Right */
- SEQ_ONE_KEY(KC_RIGHT) {
+ if (leader_sequence_one_key(KC_RIGHT)) {
onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_END)));
}
/* Select everything on this line before cursor and bring on previous line => LdrKey > Left > Left */
- SEQ_TWO_KEYS(KC_LEFT, KC_LEFT) {
+ if (leader_sequence_two_keys(KC_LEFT, KC_LEFT)) {
onMac ? SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_TAP(X_END)));
}
/* Select everything on this line => LdrKey > Right > Left */
- SEQ_TWO_KEYS(KC_RIGHT, KC_LEFT) {
+ if (leader_sequence_two_keys(KC_RIGHT, KC_LEFT)) {
onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_RIGHT) SS_LSFT(SS_LGUI(SS_TAP(X_LEFT))))) : SEND_STRING(SS_TAP(X_END) SS_LSFT(SS_TAP(X_HOME)));
}
/* Select 1x Page Up on the page before the cursor => LdrKey > Up */
- SEQ_ONE_KEY(KC_UP) {
+ if (leader_sequence_one_key(KC_UP)) {
SEND_STRING(SS_LSFT(SS_TAP(X_PGUP)));
}
/* Select 1x Page Down on the page after the cursor => LdrKey > Down */
- SEQ_ONE_KEY(KC_DOWN) {
+ if (leader_sequence_one_key(KC_DOWN)) {
SEND_STRING(SS_LSFT(SS_TAP(X_PGDN)));
}
/* Select everything on the page before the cursor => LdrKey > Up > Up */
- SEQ_TWO_KEYS(KC_UP, KC_UP) {
+ if (leader_sequence_two_keys(KC_UP, KC_UP)) {
onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_UP)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_HOME))));
}
/* Select everything on the page after the cursor => LdrKey > Down > Down */
- SEQ_TWO_KEYS(KC_DOWN, KC_DOWN) {
+ if (leader_sequence_two_keys(KC_DOWN, KC_DOWN)) {
onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_DOWN)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_END))));
}
/* HELPER => spit out the url of the layout description page on github */
- SEQ_FIVE_KEYS(QK_GESC, QK_GESC, QK_GESC, QK_GESC, QK_GESC) {
+ if (leader_sequence_five_keys(QK_GESC, QK_GESC, QK_GESC, QK_GESC, QK_GESC)) {
SEND_STRING("https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz65rgb/keymaps/drootz");
}
/* google.ca => LdrKey > G > G */
- SEQ_TWO_KEYS(KC_G, KC_G) {
+ if (leader_sequence_two_keys(KC_G, KC_G)) {
SEND_STRING("https://google.ca" SS_TAP(X_ENT));
}
/* @gmail => LdrKey > M > L > T */
- SEQ_THREE_KEYS(KC_M, KC_L, KC_T) {
+ if (leader_sequence_three_keys(KC_M, KC_L, KC_T)) {
SEND_STRING("mailto." SS_TAP(X_D) SS_TAP(X_A) SS_TAP(X_N) SS_TAP(X_I) SS_TAP(X_E) SS_TAP(X_L) SS_TAP(X_R) SS_TAP(X_A) SS_TAP(X_C) SS_TAP(X_I) SS_TAP(X_N) SS_TAP(X_E) "@gmail.com");
}
/* Show Desktop => LdrKey > D */
- SEQ_ONE_KEY(KC_D) {
+ if (leader_sequence_one_key(KC_D)) {
onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_SPC)) "Mission" SS_TAP(X_ENT)) : SEND_STRING(SS_LGUI(SS_TAP(X_D)));
}
- }
-}
-
-void leader_start(void) {
- isLeader = true;
-}
-
-void leader_end(void) {
- isLeader = false;
}
#endif /* LEADER */
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index 6586ab58e4..93e6990950 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -59,7 +59,7 @@
#endif // !NO_PRINT
#define NO_ACTION_ONESHOT
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define IGNORE_MOD_TAP_INTERRUPT
// #include "config_led.h"
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index bcd04a622b..d283d0ba1e 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -31,40 +31,40 @@ extern bool autoshift_enabled;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_65_ansi(
- QK_GESC, 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_DEL, \
- 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_PGUP, \
- LT_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, KC_PGDN, \
- SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_UP, KC_END, \
- KC_LCTL, KC_LGUI, LM_LALT, KC_SPC, KC_RALT, MO(_FNC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \
+ QK_GESC, 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_DEL,
+ 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_PGUP,
+ LT_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, KC_PGDN,
+ SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, LM_LALT, KC_SPC, KC_RALT, MO(_FNC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FNM] = LAYOUT_65_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _V_V_V_, _______, _______, _______, _______, _______, _______, _______ \
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _V_V_V_, _______, _______, _______, _______, _______, _______, _______
),
[_NAV] = LAYOUT_65_ansi(
- KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, \
- _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, _______, KC_P4, KC_P5, KC_P6, KC_PSLS, KC_PSCR, KC_SCRL, KC_INS, KC_PMNS, \
- _V_V_V_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, KC_PENT, KC_PPLS, \
- _______, _______, _______, _______, _______, _______, KC_P0, KC_P0, KC_P0, KC_PDOT, KC_PSLS, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PMNS, KC_PPLS, _______, _______,
+ _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, _______, KC_P4, KC_P5, KC_P6, KC_PSLS, KC_PSCR, KC_SCRL, KC_INS, KC_PMNS,
+ _V_V_V_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, KC_PENT, KC_PPLS,
+ _______, _______, _______, _______, _______, _______, KC_P0, KC_P0, KC_P0, KC_PDOT, KC_PSLS, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_FNC] = LAYOUT_65_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, AS_TOGG, \
- _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT, RGB_RMOD, RGB_MOD, _______, KC_MPRV, \
- _______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP, _______, EE_CLR, KC_MNXT, \
- _______, RGB_TOG, _______, _______, REEPROM, REBOOT, TG_NKRO, MAS_YEL, MAS_GRN, MAS_CRM, _______, _______, KC_VOLU, KC_MUTE, \
- _______, _______, _______, _______, _______, _V_V_V_, _______, RGB_SPD, KC_VOLD, RGB_SPI \
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, AS_TOGG,
+ _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT, RGB_RMOD, RGB_MOD, _______, KC_MPRV,
+ _______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP, _______, EE_CLR, KC_MNXT,
+ _______, RGB_TOG, _______, _______, REEPROM, REBOOT, TG_NKRO, MAS_YEL, MAS_GRN, MAS_CRM, _______, _______, KC_VOLU, KC_MUTE,
+ _______, _______, _______, _______, _______, _V_V_V_, _______, RGB_SPD, KC_VOLD, RGB_SPI
),
/*
[_LEDS] = LAYOUT_65_ansi(
- 17, 16, 15, 14, 13, 12, 11, 10, 9, 18, 19, 20, 21, 22, 23, \
- 7, 6, 5, 4, 3, 2, 1, 0, 26, 27, 28, 29, 30, 31, 24, \
- 8, 48, 47, 46, 45, 44, 43, 51, 52, 53, 54, 55, 56, 25, \
- 49, 40, 39, 38, 37, 36, 60, 61, 62, 63, 57, 58, 59, 32, \
- 50, 42, 41, 35, 64, 65, 66, 67, 34, 33 \
+ 17, 16, 15, 14, 13, 12, 11, 10, 9, 18, 19, 20, 21, 22, 23,
+ 7, 6, 5, 4, 3, 2, 1, 0, 26, 27, 28, 29, 30, 31, 24,
+ 8, 48, 47, 46, 45, 44, 43, 51, 52, 53, 54, 55, 56, 25,
+ 49, 40, 39, 38, 37, 36, 60, 61, 62, 63, 57, 58, 59, 32,
+ 50, 42, 41, 35, 64, 65, 66, 67, 34, 33
),
*/
};
@@ -83,7 +83,7 @@ SFT, Z, X, C, V, B, N, M, COM, DOT, SLS, SHIFT, UP, 0
CTL, GUI, ALT, SPACEBAR, ALT, FN, CTL, LFT, DWN, RIT
*/
bool rgb_matrix_indicators_user(void) {
- if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+ if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF);
}
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index 97b61473ad..eec189fef2 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -38,7 +38,6 @@
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_PROCESS_LIMIT 4
# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-# define DEBOUNCE 3
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
index 752d361728..9e88a65fe4 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -2,5 +2,9 @@
"usb": {
"pid": "0x1420",
"device_version": "1.0.0"
- }
+ },
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
+ "debounce": 3
}
diff --git a/keyboards/dztech/dz65rgb/v1/rules.mk b/keyboards/dztech/dz65rgb/v1/rules.mk
index 2773046964..7d73c4db84 100644
--- a/keyboards/dztech/dz65rgb/v1/rules.mk
+++ b/keyboards/dztech/dz65rgb/v1/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
@@ -19,5 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Use RGB matrix
RGB_MATRIX_DRIVER = IS31FL3731
-
-LAYOUTS = 65_ansi
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index 44616090b9..81b81548c5 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -38,7 +38,6 @@
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_PROCESS_LIMIT 4
# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-# define DEBOUNCE 3
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES
// RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
index 1cfb5abdbb..502b498e92 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -2,5 +2,8 @@
"usb": {
"pid": "0x1421",
"device_version": "2.0.0"
- }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3
}
diff --git a/keyboards/dztech/dz65rgb/v2/rules.mk b/keyboards/dztech/dz65rgb/v2/rules.mk
index ca3b0e72b5..7d73c4db84 100644
--- a/keyboards/dztech/dz65rgb/v2/rules.mk
+++ b/keyboards/dztech/dz65rgb/v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -18,5 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Use RGB matrix
RGB_MATRIX_DRIVER = IS31FL3731
-
-LAYOUTS = 65_ansi
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index a3ea0973ee..f62aeab98a 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/