From 4267f0e0d4b4fb4d4954405d156ebe6c50de48b1 Mon Sep 17 00:00:00 2001 From: csc027 Date: Sun, 7 Aug 2022 19:40:16 +0000 Subject: [PATCH] csc027/keymap-updates (#17881) * Reverted to most usable configuration for RDP usage. * Added some HSV color definitions without the value portion to allow using the existing value. * Switched to using HSV and HS color definitions. * Added media keys to the convenience layer. * Updated make rules to enable media keys. * Cleaned up planck make rules. --- keyboards/keebio/iris/keymaps/csc027/config.h | 7 ----- keyboards/keebio/iris/keymaps/csc027/rules.mk | 2 +- keyboards/planck/keymaps/csc027/config.h | 7 ----- keyboards/planck/keymaps/csc027/rules.mk | 6 ++-- users/csc027/custom_rgb.c | 6 ++-- users/csc027/defines.h | 28 +++++++++++++++++-- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/keyboards/keebio/iris/keymaps/csc027/config.h b/keyboards/keebio/iris/keymaps/csc027/config.h index ec4c2bbc65a..80a8c57cbad 100644 --- a/keyboards/keebio/iris/keymaps/csc027/config.h +++ b/keyboards/keebio/iris/keymaps/csc027/config.h @@ -28,10 +28,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - -#define USB_POLLING_INTERVAL_MS 1 - -#if defined(TAP_CODE_DELAY) -# undef TAP_CODE_DELAY -#endif -#define TAP_CODE_DELAY 10 diff --git a/keyboards/keebio/iris/keymaps/csc027/rules.mk b/keyboards/keebio/iris/keymaps/csc027/rules.mk index e922161e3c2..6fff152f60a 100644 --- a/keyboards/keebio/iris/keymaps/csc027/rules.mk +++ b/keyboards/keebio/iris/keymaps/csc027/rules.mk @@ -1,6 +1,6 @@ BACKLIGHT_ENABLE = yes CONSOLE_ENABLE = no -EXTRAKEY_ENABLE = no +EXTRAKEY_ENABLE = yes LTO_ENABLE = yes MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes diff --git a/keyboards/planck/keymaps/csc027/config.h b/keyboards/planck/keymaps/csc027/config.h index a3b69beb5a7..2a620db279f 100644 --- a/keyboards/planck/keymaps/csc027/config.h +++ b/keyboards/planck/keymaps/csc027/config.h @@ -19,10 +19,3 @@ along with this program. If not, see . #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION - -#define USB_POLLING_INTERVAL_MS 1 - -#if defined(TAP_CODE_DELAY) -# undef TAP_CODE_DELAY -#endif -#define TAP_CODE_DELAY 10 diff --git a/keyboards/planck/keymaps/csc027/rules.mk b/keyboards/planck/keymaps/csc027/rules.mk index d6b6894bf1e..0c35b2c28fd 100644 --- a/keyboards/planck/keymaps/csc027/rules.mk +++ b/keyboards/planck/keymaps/csc027/rules.mk @@ -1,6 +1,8 @@ -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = no COMMAND_ENABLE = no CONSOLE_ENABLE = no -EXTRAKEY_ENABLE = no +EXTRAKEY_ENABLE = yes LTO_ENABLE = no +MOUSEKEY_ENABLE = yes +NKRO_ENABLE = yes RGBLIGHT_ENABLE = no diff --git a/users/csc027/custom_rgb.c b/users/csc027/custom_rgb.c index 1d3232d72ca..657d40d7af6 100644 --- a/users/csc027/custom_rgb.c +++ b/users/csc027/custom_rgb.c @@ -28,15 +28,15 @@ void keyboard_post_init_user(void) { rgblight_sethsv_noeeprom((i + user_hue) % 256, 255, 255); wait_ms(5); } - rgblight_sethsv_noeeprom(0, 0, 0); + rgblight_sethsv_noeeprom(HSV_BLACK); } void on_usb_led_off(void) { - rgblight_sethsv_noeeprom(0, 0, rgblight_get_val() - 85); + rgblight_sethsv_noeeprom(HS_GRAY, rgblight_get_val() - 85); } void on_usb_led_on(void) { - rgblight_sethsv_noeeprom(0, 0, rgblight_get_val() + 85); + rgblight_sethsv_noeeprom(HS_GRAY, rgblight_get_val() + 85); } #endif diff --git a/users/csc027/defines.h b/users/csc027/defines.h index 9654cd9f025..85d7d065b7a 100644 --- a/users/csc027/defines.h +++ b/users/csc027/defines.h @@ -183,7 +183,7 @@ along with this program. If not, see . * |-----------------------------------| |-----------------------------------| * | | | App | LCAD|MRDCC|NmLck| |MVTDL|MVTDC|MVTDN|MVTDR| | | * |-----------------------------------| |-----------------------------------| - * | | | | | | | | | | | | | | + * | | |MStop|MPrev|MPlay|MNext| |MMute|MVolD|MVolD| | | | * |-----------------------------------| |-----------------------------------| * | | | | | | | | | | | | | | * `-----------------------------------' `-----------------------------------' @@ -191,12 +191,12 @@ along with this program. If not, see . #define ___________________CONVENIENCE_L1__________________ XXXXXXX, XXXXXXX, KC_INS, KC_SLCK, KC_PSCR, XXXXXXX #define ___________________CONVENIENCE_L2__________________ _______, XXXXXXX, KC_APP, MC_lcad, MC_rdcc, KC_NLCK -#define ___________________CONVENIENCE_L3__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX +#define ___________________CONVENIENCE_L3__________________ _______, XXXXXXX, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT #define ___________________CONVENIENCE_L4__________________ _______, _______, _______, _______, _______, _______ #define ___________________CONVENIENCE_R1__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC #define ___________________CONVENIENCE_R2__________________ MC_vtdl, MC_vtdc, MC_vtdn, MC_vtdr, XXXXXXX, XXXXXXX -#define ___________________CONVENIENCE_R3__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______ +#define ___________________CONVENIENCE_R3__________________ KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, _______ #define ___________________CONVENIENCE_R4__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX /* Windows Terminal Layer @@ -321,3 +321,25 @@ along with this program. If not, see . CUSTOM_NAME(vtdc) CUSTOM_STRING(SS_LCTL(SS_LGUI(SS_TAP(X_F4)))) CUSTOM_DELIM() \ CUSTOM_NAME(vtdn) CUSTOM_STRING(SS_LCTL(SS_LGUI("d"))) CUSTOM_DELIM() \ CUSTOM_NAME(vtdr) CUSTOM_STRING(SS_LCTL(SS_LGUI(SS_TAP(X_RIGHT)))) + +// Additional color definitions for simplicity +#define HS_AZURE 132, 102 +#define HS_BLACK 0, 0 +#define HS_BLUE 170, 255 +#define HS_CHARTREUSE 64, 255 +#define HS_CORAL 11, 176 +#define HS_CYAN 128, 255 +#define HS_GOLD 36, 255 +#define HS_GOLDENROD 30, 218 +#define HS_GRAY 0, 0 +#define HS_GREEN 85, 255 +#define HS_MAGENTA 213, 255 +#define HS_ORANGE 28, 255 +#define HS_PINK 234, 128 +#define HS_PURPLE 191, 255 +#define HS_RED 0, 255 +#define HS_SPRINGGREEN 106, 255 +#define HS_TEAL 128, 255 +#define HS_TURQUOISE 123, 90 +#define HS_WHITE 0, 0 +#define HS_YELLOW 43, 255