From 32b63d676fbfd3a71764459cd89c428ccbde7ddd Mon Sep 17 00:00:00 2001 From: stanrc85 <47038504+stanrc85@users.noreply.github.com> Date: Thu, 28 Feb 2019 15:02:22 -0500 Subject: [PATCH] [Keymap] Cleaning up my config and userspace files (#5265) * Removed since options are in userspace * Removed RGB option that was breaking one of my builds * Remove unused options * Removed options present in userspace, add board specific options here * Removed code also present in userspace * Turns out those lines were needed, added them back * Testing changes * Added code to ensure board read as ANSI instead of default ISO for HS60 * Setting \ key to "MOD" instead of "ALPHA" for lighting --- keyboards/hs60/v2/keymaps/stanrc85/config.h | 24 +++++++++++++++++++-- keyboards/hs60/v2/keymaps/stanrc85/keymap.c | 16 +------------- keyboards/hs60/v2/keymaps/stanrc85/rules.mk | 3 --- users/stanrc85/config.h | 4 ---- users/stanrc85/rules.mk | 1 - 5 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 keyboards/hs60/v2/keymaps/stanrc85/rules.mk diff --git a/keyboards/hs60/v2/keymaps/stanrc85/config.h b/keyboards/hs60/v2/keymaps/stanrc85/config.h index 4443dcd50..4576211f1 100644 --- a/keyboards/hs60/v2/keymaps/stanrc85/config.h +++ b/keyboards/hs60/v2/keymaps/stanrc85/config.h @@ -1,2 +1,22 @@ -#define TAPPING_TERM 200 -#define RETRO_TAPPING +#pragma once + +// Include overwrites for specific keymap +#define HS60_ANSI +#undef PRODUCT_ID +#define PRODUCT_ID 0x4854 + +// disable backlight after timeout in minutes, 0 = no timeout +#undef RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT +#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 10 + +#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 +#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 +#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 +#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 +#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 + +#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0010000000000001 +#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001 +#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001 //Setting \ key to "MOD" instead of "ALPHA" for lighting +#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0010000000000001 +#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011110000000111 diff --git a/keyboards/hs60/v2/keymaps/stanrc85/keymap.c b/keyboards/hs60/v2/keymaps/stanrc85/keymap.c index add060903..8d8d895f6 100644 --- a/keyboards/hs60/v2/keymaps/stanrc85/keymap.c +++ b/keyboards/hs60/v2/keymaps/stanrc85/keymap.c @@ -14,21 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H - -#define DEFAULT 0 //Custom ANSI -#define LAYER1 1 //Default ANSI (enable with Fn2+D) -#define LAYER2 2 //Function keys, arrows, custom shortcuts, volume control -#define LAYER3 3 //RGB Underglow controls and RESET - -//Aliases for longer keycodes -#define KC_CAD LALT(LCTL(KC_DEL)) -#define KC_LOCK LGUI(KC_L) -#define CA_QUOT LCA(KC_QUOT) -#define CA_SCLN LCA(KC_SCLN) -#define KC_CTLE LCTL_T(KC_ESC) -#define LT_SPCF LT(2, KC_SPC) -#define TD_TESC TD(TD_ESC) -#define TD_TWIN TD(TD_WIN) +#include "stanrc85.h" //Tap Dance Declarations enum { diff --git a/keyboards/hs60/v2/keymaps/stanrc85/rules.mk b/keyboards/hs60/v2/keymaps/stanrc85/rules.mk deleted file mode 100644 index 2a173b316..000000000 --- a/keyboards/hs60/v2/keymaps/stanrc85/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -TAP_DANCE_ENABLE = yes -DYNAMIC_KEYMAP_ENABLE = no - diff --git a/users/stanrc85/config.h b/users/stanrc85/config.h index 628ec994b..904a7f524 100644 --- a/users/stanrc85/config.h +++ b/users/stanrc85/config.h @@ -2,7 +2,3 @@ #define TAPPING_TERM 200 #define RETRO_TAPPING - -#ifdef RGBLIGHT_ENABLE -#define RGBLIGHT_SLEEP -#endif // RGBLIGHT_ENABLE diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk index 324e52674..19ad62475 100644 --- a/users/stanrc85/rules.mk +++ b/users/stanrc85/rules.mk @@ -1,6 +1,5 @@ TAP_DANCE_ENABLE = yes EXTRAKEY_ENABLE = yes -RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = no COMMAND_ENABLE = no BOOTMAGIC_ENABLE = no