[Keymap] Updates to existing keymaps and userspace (#14503)

Co-authored-by: Drashna Jaelre <drashna@live.com>
master
Konstantin Đorđević 2021-09-19 20:47:40 +02:00 committed by GitHub
parent e83fb69ae8
commit 4348e2ffc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 295 additions and 113 deletions

View File

@ -1,6 +1,4 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define LAYER_FN
#define LAYER_NUMPAD

View File

@ -1,5 +1,5 @@
# Generic features
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
BOOTMAGIC_ENABLE = yes
COMMAND_ENABLE = yes
CONSOLE_ENABLE = yes
EXTRAKEY_ENABLE = yes

View File

@ -1,13 +1,21 @@
BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
USER_NAME := konstantin
# Generic features
BOOTMAGIC_ENABLE = yes
COMMAND_ENABLE = yes
CONSOLE_ENABLE = yes
EXTRAKEY_ENABLE = yes
MOUSEKEY_ENABLE = yes
NKRO_ENABLE = yes
RGBLIGHT_ENABLE = no
SPACE_CADET_ENABLE = no
TAP_DANCE_ENABLE = yes
UNICODEMAP_ENABLE = no
USER_NAME = konstantin
# Keyboard-specific features
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = no
VIA_ENABLE = yes
# Firmware size reduction
GRAVE_ESC_ENABLE = no
MAGIC_ENABLE = no
SPACE_CADET_ENABLE = no

View File

@ -1,6 +1,4 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define LAYER_FN
#define LAYER_NUMPAD

View File

@ -1,5 +1,5 @@
# Generic features
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
BOOTMAGIC_ENABLE = yes
COMMAND_ENABLE = yes
CONSOLE_ENABLE = yes
EXTRAKEY_ENABLE = yes

View File

@ -1,5 +1,3 @@
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define LAYER_FN

View File

@ -1,70 +1,38 @@
#include QMK_KEYBOARD_H
#include "konstantin.h"
enum keycodes_keymap {
RCTRL = RANGE_KEYMAP,
};
enum layers_keymap {
L_RCTRL = LAYERS_KEYMAP,
};
void eeconfig_init_keymap(void) {
rgblight_sethsv(MODERN_DOLCH_RED);
enum keycodes_keymap {
RCTRL = RANGE_KEYMAP,
};
static inline void reset_light(void) {
rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
}
bool indicator_light = false;
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case RGB_TOG ... RGB_SPD:
// Disable RGB controls when Fn/Caps indicator lights are on
if (indicator_light) {
return false;
}
// Shift+Toggle = reset RGB
if (record->event.pressed && keycode == RGB_TOG && get_mods() & MOD_MASK_SHIFT) {
eeconfig_init_keymap();
return false;
}
break;
// Combined RCtrl and layer
case RCTRL:
if (record->event.pressed) {
register_code(KC_RCTRL);
layer_on(L_RCTRL);
} else {
unregister_code(KC_RCTRL);
layer_off(L_RCTRL);
}
break;
}
return true;
rgblight_sethsv(MODERN_DOLCH_RED);
}
static inline void fn_light(void) {
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
rgblight_sethsv_noeeprom(modern_dolch_red.h, modern_dolch_red.s, rgblight_get_val());
indicator_light = true;
}
static inline void caps_light(void) {
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
rgblight_sethsv_noeeprom(modern_dolch_cyan.h, modern_dolch_cyan.s, rgblight_get_val());
indicator_light = true;
}
static inline void restore_light(void) {
rgblight_config_t saved = { .raw = eeconfig_read_rgblight() };
rgblight_sethsv_noeeprom(saved.hue, saved.sat, saved.val);
rgblight_mode_noeeprom(saved.mode);
indicator_light = false;
rgblight_sethsv_noeeprom(saved.hue, saved.sat, saved.val);
}
static void check_light_layer(uint32_t state) {
static bool last_checked_layer;
static void check_light_layer(layer_state_t state) {
if (IS_LAYER_ON_STATE(state, L_FN)) {
fn_light();
} else if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
@ -72,22 +40,34 @@ static void check_light_layer(uint32_t state) {
} else {
restore_light();
}
last_checked_layer = true;
}
static void check_light_led(uint8_t usb_led) {
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
static void check_light_led(uint8_t leds) {
if (IS_LED_ON(leds, USB_LED_CAPS_LOCK)) {
caps_light();
} else if (IS_LAYER_ON(L_FN)) {
fn_light();
} else {
restore_light();
}
last_checked_layer = false;
}
static void inline check_light(void) {
last_checked_layer
? check_light_layer(layer_state)
: check_light_led(host_keyboard_leds());
}
void eeconfig_init_keymap(void) {
reset_light();
}
static bool skip_led = false;
uint32_t layer_state_set_keymap(uint32_t state) {
static uint32_t prev_state = L_BASE;
layer_state_t layer_state_set_keymap(layer_state_t state) {
static layer_state_t prev_state = L_BASE;
if (IS_LAYER_ON_STATE(state, L_FN) != IS_LAYER_ON_STATE(prev_state, L_FN)) {
check_light_layer(state); // Fn state changed since last time
skip_led = IS_LAYER_ON_STATE(state, L_FN);
@ -104,6 +84,37 @@ void led_set_keymap(uint8_t usb_led) {
check_light_led(usb_led);
}
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case RGB_TOG ... RGB_SPD:
if (record->event.pressed) {
// Shift+Toggle = reset RGB
if (keycode == RGB_TOG && get_mods() & MOD_MASK_SHIFT) {
reset_light();
return false;
}
restore_light();
} else {
check_light();
}
break;
// Combined RCtrl and layer
// Cannot use LM(L_RCTRL, MOD_RCTL) because it sends LCtrl instead of RCtrl
case RCTRL:
if (record->event.pressed) {
register_code(KC_RCTRL);
layer_on(L_RCTRL);
} else {
unregister_code(KC_RCTRL);
layer_off(L_RCTRL);
}
break;
}
return true;
}
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base layer
*
@ -157,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*
* RTgRV-RV+RMd
*
* DPRDstNA
* DPRDstNA RGui
*
*/
[L_RCTRL] = LAYOUT(
@ -165,6 +176,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, TOP, MV_UP, BOTTOM, TAB_PRV, _______, _______, _______, _______, _______, _______, _______, _______, DEL_NXT,
_______, MV_LEFT, MV_DOWN, MV_RGHT, TAB_NXT, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_TOG, RGB_VAD, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
XXXXXXX, DST_P_R, DST_N_A, _______, _______, _______, XXXXXXX
XXXXXXX, DST_P_R, DST_N_A, _______, KC_RGUI, _______, XXXXXXX
),
};

View File

@ -1,7 +1,7 @@
# Generic features
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
BOOTMAGIC_ENABLE = yes
COMMAND_ENABLE = yes
CONSOLE_ENABLE = no
CONSOLE_ENABLE = yes
EXTRAKEY_ENABLE = yes
MOUSEKEY_ENABLE = yes
NKRO_ENABLE = yes

View File

@ -1,5 +1,5 @@
# Generic features
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
BOOTMAGIC_ENABLE = yes
COMMAND_ENABLE = yes
CONSOLE_ENABLE = yes
EXTRAKEY_ENABLE = yes
@ -11,6 +11,7 @@ UNICODEMAP_ENABLE = yes
# Keyboard-specific features
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = yes
VIA_ENABLE = yes
# Firmware size reduction
GRAVE_ESC_ENABLE = no

View File

@ -1,5 +1,5 @@
# Generic features
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
BOOTMAGIC_ENABLE = yes
COMMAND_ENABLE = yes
CONSOLE_ENABLE = yes
EXTRAKEY_ENABLE = yes

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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
// Keyboard reports
@ -24,7 +40,7 @@
// Tapping
#define PERMISSIVE_HOLD
#define TAPPING_TERM 200
#define TAPPING_TOGGLE 3
#define TAPPING_TOGGLE 2
// Unicode
#define UNICODE_CYCLE_PERSIST false

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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/>.
*/
#include "konstantin.h"
__attribute__((weak))
@ -21,6 +37,41 @@ void keyboard_post_init_user(void) {
keyboard_post_init_keymap();
}
__attribute__((weak))
layer_state_t layer_state_set_keymap(layer_state_t state) {
return state;
}
layer_state_t layer_state_set_user(layer_state_t state) {
state = layer_state_set_keymap(state);
#ifdef LAYER_NUMPAD
bool numpad = IS_LAYER_ON_STATE(state, L_NUMPAD);
bool num_lock = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
if (numpad != num_lock) {
tap_code(KC_NLCK); // Toggle Num Lock to match Numpad layer state
}
#endif
return state;
}
__attribute__((weak))
void led_set_keymap(uint8_t usb_led) {}
void led_set_user(uint8_t usb_led) {
led_set_keymap(usb_led);
}
__attribute__((weak))
bool led_update_keymap(led_t led_state) {
return true;
}
bool led_update_user(led_t led_state) {
return led_update_keymap(led_state);
}
__attribute__((weak))
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
return true;
@ -91,38 +142,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
__attribute__((weak))
uint32_t layer_state_set_keymap(uint32_t state) {
return state;
}
layer_state_t layer_state_set_user(layer_state_t state) {
state = layer_state_set_keymap(state);
#ifdef LAYER_NUMPAD
bool numpad = IS_LAYER_ON_STATE(state, L_NUMPAD);
bool num_lock = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
if (numpad != num_lock) {
tap_code(KC_NLCK); // Toggle Num Lock to match Numpad layer state
}
#endif
return state;
}
__attribute__((weak))
void led_set_keymap(uint8_t usb_led) {}
void led_set_user(uint8_t usb_led) {
led_set_keymap(usb_led);
}
__attribute__((weak))
bool led_update_keymap(led_t led_state) {
return true;
}
bool led_update_user(led_t led_state) {
return led_update_keymap(led_state);
}

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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 "quantum.h"
@ -56,14 +72,6 @@
set_mods(mods); \
}
enum keycodes_user {
CLEAR = SAFE_RANGE,
DST_P_R,
DST_N_A,
RANGE_KEYMAP,
};
enum layers_user {
L_BASE,
#ifdef LAYER_FN
@ -76,11 +84,21 @@ enum layers_user {
LAYERS_KEYMAP,
};
enum keycodes_user {
CLEAR = SAFE_RANGE,
DST_P_R,
DST_N_A,
RANGE_KEYMAP,
};
void keyboard_pre_init_keymap(void);
void eeconfig_init_keymap(void);
void keyboard_post_init_keymap(void);
bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
uint32_t layer_state_set_keymap(uint32_t state);
void led_set_keymap(uint8_t usb_led);
bool led_update_keymap(led_t led_state);
layer_state_t layer_state_set_keymap(layer_state_t state);
void led_set_keymap(uint8_t usb_led);
bool led_update_keymap(led_t led_state);
bool process_record_keymap(uint16_t keycode, keyrecord_t *record);

View File

@ -0,0 +1,22 @@
/* Copyright 2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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
// VIA
#ifndef DYNAMIC_KEYMAP_LAYER_COUNT
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#endif

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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/>.
*/
#include "rgb.h"
#ifdef RGBLIGHT_EFFECT_BREATHING

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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 "quantum.h"

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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/>.
*/
#include "tap_dance.h"
#include "konstantin.h"

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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 "quantum.h"

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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/>.
*/
#include "unicode.h"
#ifdef UNICODEMAP_ENABLE

View File

@ -1,3 +1,19 @@
/* Copyright 2019-2021 Konstantin Đorđević <vomindoraan@gmail.com>
*
* 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 "quantum.h"