diff options
| author | stanrc85 <47038504+stanrc85@users.noreply.github.com> | 2019-02-28 15:02:22 -0500 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-02-28 12:02:22 -0800 |
| commit | 32b63d676fbfd3a71764459cd89c428ccbde7ddd (patch) | |
| tree | 0cb082ab96b990bf732d1ba536ad24610301f390 | |
| parent | a872faa53e1b9b9651d3f6ffe6d671e0e211309c (diff) | |
| download | qmk_firmware-32b63d676fbfd3a71764459cd89c428ccbde7ddd.tar.gz qmk_firmware-32b63d676fbfd3a71764459cd89c428ccbde7ddd.zip | |
[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
| -rw-r--r-- | keyboards/hs60/v2/keymaps/stanrc85/config.h | 24 | ||||
| -rw-r--r-- | keyboards/hs60/v2/keymaps/stanrc85/keymap.c | 16 | ||||
| -rw-r--r-- | keyboards/hs60/v2/keymaps/stanrc85/rules.mk | 3 | ||||
| -rw-r--r-- | users/stanrc85/config.h | 4 | ||||
| -rw-r--r-- | users/stanrc85/rules.mk | 1 |
5 files changed, 23 insertions, 25 deletions
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 @@ | |||
| 1 | #define TAPPING_TERM 200 | 1 | #pragma once |
| 2 | #define RETRO_TAPPING | 2 | |
| 3 | // Include overwrites for specific keymap | ||
| 4 | #define HS60_ANSI | ||
| 5 | #undef PRODUCT_ID | ||
| 6 | #define PRODUCT_ID 0x4854 | ||
| 7 | |||
| 8 | // disable backlight after timeout in minutes, 0 = no timeout | ||
| 9 | #undef RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT | ||
| 10 | #define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 10 | ||
| 11 | |||
| 12 | #undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 | ||
| 13 | #undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 | ||
| 14 | #undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 | ||
| 15 | #undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 | ||
| 16 | #undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 | ||
| 17 | |||
| 18 | #define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0010000000000001 | ||
| 19 | #define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001 | ||
| 20 | #define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001 //Setting \ key to "MOD" instead of "ALPHA" for lighting | ||
| 21 | #define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0010000000000001 | ||
| 22 | #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 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | #include "stanrc85.h" | |
| 18 | #define DEFAULT 0 //Custom ANSI | ||
| 19 | #define LAYER1 1 //Default ANSI (enable with Fn2+D) | ||
| 20 | #define LAYER2 2 //Function keys, arrows, custom shortcuts, volume control | ||
| 21 | #define LAYER3 3 //RGB Underglow controls and RESET | ||
| 22 | |||
| 23 | //Aliases for longer keycodes | ||
| 24 | #define KC_CAD LALT(LCTL(KC_DEL)) | ||
| 25 | #define KC_LOCK LGUI(KC_L) | ||
| 26 | #define CA_QUOT LCA(KC_QUOT) | ||
| 27 | #define CA_SCLN LCA(KC_SCLN) | ||
| 28 | #define KC_CTLE LCTL_T(KC_ESC) | ||
| 29 | #define LT_SPCF LT(2, KC_SPC) | ||
| 30 | #define TD_TESC TD(TD_ESC) | ||
| 31 | #define TD_TWIN TD(TD_WIN) | ||
| 32 | 18 | ||
| 33 | //Tap Dance Declarations | 19 | //Tap Dance Declarations |
| 34 | enum { | 20 | 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 @@ | |||
| 1 | TAP_DANCE_ENABLE = yes | ||
| 2 | DYNAMIC_KEYMAP_ENABLE = no | ||
| 3 | |||
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 @@ | |||
| 2 | 2 | ||
| 3 | #define TAPPING_TERM 200 | 3 | #define TAPPING_TERM 200 |
| 4 | #define RETRO_TAPPING | 4 | #define RETRO_TAPPING |
| 5 | |||
| 6 | #ifdef RGBLIGHT_ENABLE | ||
| 7 | #define RGBLIGHT_SLEEP | ||
| 8 | #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 @@ | |||
| 1 | TAP_DANCE_ENABLE = yes | 1 | TAP_DANCE_ENABLE = yes |
| 2 | EXTRAKEY_ENABLE = yes | 2 | EXTRAKEY_ENABLE = yes |
| 3 | RGBLIGHT_ENABLE = yes | ||
| 4 | BACKLIGHT_ENABLE = no | 3 | BACKLIGHT_ENABLE = no |
| 5 | COMMAND_ENABLE = no | 4 | COMMAND_ENABLE = no |
| 6 | BOOTMAGIC_ENABLE = no | 5 | BOOTMAGIC_ENABLE = no |
