mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-19 03:36:28 +00:00
[Keymap] Add missing tap dance action and fix RGB hues in personal keymaps (#6312)
* Add missing TD_RSF_RCT tap dance * Use standard QMK HSV and RGB structs, fix Godspeed colors * Move PROGMEM after the type in RGB intervals * Add MODERN_DOLCH_RED color, use it on KBD6X * Use 255 instead of RGBLIGHT_LIMIT_VAL in color definitions * Remove IS_COMMAND override on Whitefox
This commit is contained in:
parent
663ca6ba9d
commit
38fdf7a2d2
7 changed files with 18 additions and 26 deletions
|
@ -10,6 +10,7 @@ enum layers_keymap {
|
||||||
};
|
};
|
||||||
|
|
||||||
void eeconfig_init_keymap(void) {
|
void eeconfig_init_keymap(void) {
|
||||||
|
rgblight_sethsv(MODERN_DOLCH_RED.h, MODERN_DOLCH_RED.s, MODERN_DOLCH_RED.v);
|
||||||
rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
|
rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
|
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
|
||||||
* │ │Mv←│Mv↓│Mv→│TNx│ │ │ │ │ │ │ │ │
|
* │ │Mv←│Mv↓│Mv→│TNx│ │ │ │ │ │ │ │ │
|
||||||
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
|
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
|
||||||
* │ │RTg│RV-│RV+│ │ │ │ │M4 │M5 │ │ │ │
|
* │ │RTg│RV-│RV+│RMd│ │ │ │M4 │M5 │ │ │ │
|
||||||
* └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
|
* └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
|
||||||
* │DPR│DstNA│ │ │ │
|
* │DPR│DstNA│ │ │ │
|
||||||
* └───┴─────┴───────────────────────────┴─────┴───┘
|
* └───┴─────┴───────────────────────────┴─────┴───┘
|
||||||
|
@ -90,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLEAR,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLEAR,
|
||||||
_______, TOP, MV_UP, BOTTOM, TAB_PRV, _______, _______, _______, _______, _______, _______, _______, _______, DEL_NXT,
|
_______, TOP, MV_UP, BOTTOM, TAB_PRV, _______, _______, _______, _______, _______, _______, _______, _______, DEL_NXT,
|
||||||
_______, MV_LEFT, MV_DOWN, MV_RGHT, TAB_NXT, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, MV_LEFT, MV_DOWN, MV_RGHT, TAB_NXT, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_BTN4, KC_BTN5, _______, _______, _______,
|
_______, RGB_TOG, RGB_VAD, RGB_VAI, RGB_MOD, _______, _______, _______, KC_BTN4, KC_BTN5, _______, _______, _______,
|
||||||
XXXXXXX, DST_P_R, DST_N_A, _______, _______, _______, XXXXXXX
|
XXXXXXX, DST_P_R, DST_N_A, _______, _______, _______, XXXXXXX
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
#include "konstantin.h"
|
#include "konstantin.h"
|
||||||
|
|
||||||
static const hsv_t *colors[] = { &GODSPEED_BLUE, &GODSPEED_YELLOW };
|
static const HSV *colors[] = { &GODSPEED_BLUE, &GODSPEED_YELLOW };
|
||||||
static const size_t cnum = sizeof colors / sizeof *colors;
|
static const size_t cnum = sizeof colors / sizeof *colors;
|
||||||
static size_t cidx = 0;
|
static size_t cidx = 0;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))
|
|
||||||
|
|
||||||
#define LAYER_FN
|
#define LAYER_FN
|
||||||
#define LAYER_NUMPAD
|
#define LAYER_NUMPAD
|
||||||
|
|
|
@ -1,24 +1,25 @@
|
||||||
#include "rgb.h"
|
#include "rgb.h"
|
||||||
|
|
||||||
#ifdef RGBLIGHT_EFFECT_BREATHING
|
#ifdef RGBLIGHT_EFFECT_BREATHING
|
||||||
const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {20, 30, 5, 10};
|
const uint8_t PROGMEM RGBLED_BREATHING_INTERVALS[] = { 20, 30, 5, 10 };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
|
#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {20, 50, 100};
|
const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 20, 50, 100 };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 50, 100};
|
const uint8_t PROGMEM RGBLED_RAINBOW_SWIRL_INTERVALS[] = { 20, 50, 100 };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGBLIGHT_EFFECT_SNAKE
|
#ifdef RGBLIGHT_EFFECT_SNAKE
|
||||||
const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {20, 50, 100};
|
const uint8_t PROGMEM RGBLED_SNAKE_INTERVALS[] = { 20, 50, 100 };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGBLIGHT_EFFECT_KNIGHT
|
#ifdef RGBLIGHT_EFFECT_KNIGHT
|
||||||
const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {20, 50, 100};
|
const uint8_t PROGMEM RGBLED_KNIGHT_INTERVALS[] = { 20, 50, 100 };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const hsv_t GODSPEED_BLUE = { .h = 280, .s = 68, .v = RGBLIGHT_LIMIT_VAL };
|
const HSV GODSPEED_BLUE = { .h = 198, .s = 68, .v = 255 };
|
||||||
const hsv_t GODSPEED_YELLOW = { .h = 38, .s = 153, .v = RGBLIGHT_LIMIT_VAL };
|
const HSV GODSPEED_YELLOW = { .h = 27, .s = 153, .v = 255 };
|
||||||
|
const HSV MODERN_DOLCH_RED = { .h = 252, .s = 255, .v = 144 };
|
||||||
|
|
|
@ -2,17 +2,6 @@
|
||||||
|
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
typedef struct {
|
extern const HSV GODSPEED_BLUE;
|
||||||
uint16_t h; // 0–360
|
extern const HSV GODSPEED_YELLOW;
|
||||||
uint8_t s; // 0–255
|
extern const HSV MODERN_DOLCH_RED;
|
||||||
uint8_t v; // 0–255
|
|
||||||
} hsv_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
uint8_t r; // 0–255
|
|
||||||
uint8_t g; // 0–255
|
|
||||||
uint8_t b; // 0–255
|
|
||||||
} rgb_t;
|
|
||||||
|
|
||||||
extern const hsv_t GODSPEED_BLUE;
|
|
||||||
extern const hsv_t GODSPEED_YELLOW;
|
|
||||||
|
|
|
@ -110,6 +110,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
|
||||||
[TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_LALT),
|
[TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_LALT),
|
||||||
[TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_RGUI),
|
[TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_RGUI),
|
||||||
[TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RCTL, KC_RSFT),
|
[TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RCTL, KC_RSFT),
|
||||||
|
[TD_RSF_RCT] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RSFT, KC_RCTL),
|
||||||
|
|
||||||
[TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
|
[TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
|
||||||
[TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
|
[TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#define RAL_LAL TD(TD_RAL_LAL)
|
#define RAL_LAL TD(TD_RAL_LAL)
|
||||||
#define RAL_RGU TD(TD_RAL_RGU)
|
#define RAL_RGU TD(TD_RAL_RGU)
|
||||||
#define RCT_RSF TD(TD_RCT_RSF)
|
#define RCT_RSF TD(TD_RCT_RSF)
|
||||||
|
#define RSF_RCT TD(TD_RSF_RCT)
|
||||||
|
|
||||||
#define LSFT_FN TD(TD_LSFT_FN)
|
#define LSFT_FN TD(TD_LSFT_FN)
|
||||||
#define RCTL_FN TD(TD_RCTL_FN)
|
#define RCTL_FN TD(TD_RCTL_FN)
|
||||||
|
@ -18,6 +19,7 @@ enum tap_dance {
|
||||||
TD_RAL_LAL,
|
TD_RAL_LAL,
|
||||||
TD_RAL_RGU,
|
TD_RAL_RGU,
|
||||||
TD_RCT_RSF,
|
TD_RCT_RSF,
|
||||||
|
TD_RSF_RCT,
|
||||||
|
|
||||||
TD_LSFT_FN,
|
TD_LSFT_FN,
|
||||||
TD_RCTL_FN,
|
TD_RCTL_FN,
|
||||||
|
|
Loading…
Reference in a new issue