From c1c579c554839b5bea1b23480837d9b67faf87d4 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Wed, 22 Apr 2020 15:26:51 -0500 Subject: [Keymap] Clean up my ergo keymaps and userspace (#8857) * Remove more mouse keys settings missed in #8836 * Turn off more unwanted make options * clang-format my userspace * Reword ergo layout docs so Crkbd is canonical * Add a basic readme to my userspace * Tweak Crkbd readme wording and fix typos * Enable SPLIT_USB_DETECT for Lily58 w/ Elite-C bug --- users/bcat/bcat.c | 4 +-- users/bcat/config.h | 82 ++++++++++++++++++++-------------------------------- users/bcat/readme.md | 13 +++++++++ users/bcat/rules.mk | 28 +++++++++++++----- 4 files changed, 66 insertions(+), 61 deletions(-) create mode 100644 users/bcat/readme.md (limited to 'users') diff --git a/users/bcat/bcat.c b/users/bcat/bcat.c index bea64dbaa..2b250c10f 100644 --- a/users/bcat/bcat.c +++ b/users/bcat/bcat.c @@ -1,6 +1,6 @@ #include "quantum.h" #if defined(RGBLIGHT_ENABLE) - /* Adjust RGB static hue ranges for shorter gradients than default. */ - const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 127, 63, 31, 15}; +/* Adjust RGB static hue ranges for shorter gradients than default. */ +const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 127, 63, 31, 15}; #endif diff --git a/users/bcat/config.h b/users/bcat/config.h index da74cb0a0..b0d556186 100644 --- a/users/bcat/config.h +++ b/users/bcat/config.h @@ -26,65 +26,45 @@ #define TAPPING_FORCE_HOLD #if defined(RGB_MATRIX_ENABLE) - /* Turn off per-key RGB when the host goes to sleep. */ - #define RGB_DISABLE_WHEN_USB_SUSPENDED true - - /* Keep per-key RGB increments consistent across keyboards. */ - #undef RGB_MATRIX_HUE_STEP - #undef RGB_MATRIX_SAT_STEP - #undef RGB_MATRIX_VAL_STEP - #undef RGB_MATRIX_SPD_STEP - - #define RGB_MATRIX_HUE_STEP 8 - #define RGB_MATRIX_SAT_STEP 17 - #define RGB_MATRIX_VAL_STEP 17 - #define RGB_MATRIX_SPD_STEP 17 - - /* Turn on additional RGB animations. */ - #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - #define RGB_MATRIX_KEYPRESSES +/* Turn off per-key RGB when the host goes to sleep. */ +# define RGB_DISABLE_WHEN_USB_SUSPENDED true + +/* Keep per-key RGB increments consistent across keyboards. */ +# undef RGB_MATRIX_HUE_STEP +# undef RGB_MATRIX_SAT_STEP +# undef RGB_MATRIX_VAL_STEP +# undef RGB_MATRIX_SPD_STEP + +# define RGB_MATRIX_HUE_STEP 8 +# define RGB_MATRIX_SAT_STEP 17 +# define RGB_MATRIX_VAL_STEP 17 +# define RGB_MATRIX_SPD_STEP 17 + +/* Turn on additional RGB animations. */ +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES #endif #if defined(RGBLIGHT_ENABLE) - /* Turn off RGB underglow when the host goes to sleep. */ - #define RGBLIGHT_SLEEP +/* Turn off RGB underglow when the host goes to sleep. */ +# define RGBLIGHT_SLEEP - /* Keep RGB underglow level increments consistent across keyboards. */ - #undef RGBLIGHT_HUE_STEP - #undef RGBLIGHT_SAT_STEP - #undef RGBLIGHT_VAL_STEP +/* Keep RGB underglow level increments consistent across keyboards. */ +# undef RGBLIGHT_HUE_STEP +# undef RGBLIGHT_SAT_STEP +# undef RGBLIGHT_VAL_STEP - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 17 - #define RGBLIGHT_VAL_STEP 17 +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 17 +# define RGBLIGHT_VAL_STEP 17 #endif #if defined(BACKLIGHT_ENABLE) - /* Enable backlight breathing across the board. */ - #define BACKLIGHT_BREATHING - - /* Keep backlight level increments consistent across keyboards. */ - #undef BACKLIGHT_LEVELS - - #define BACKLIGHT_LEVELS 7 -#endif - -#if defined(MOUSEKEY_ENABLE) - /* Make mouse operation smoother. */ - #undef MOUSEKEY_DELAY - #undef MOUSEKEY_INTERVAL - - #define MOUSEKEY_DELAY 0 - #define MOUSEKEY_INTERVAL 16 +/* Enable backlight breathing across the board. */ +# define BACKLIGHT_BREATHING - /* Lower mouse speed to adjust for reduced MOUSEKEY_INTERVAL. */ - #undef MOUSEKEY_MAX_SPEED - #undef MOUSEKEY_TIME_TO_MAX - #undef MOUSEKEY_WHEEL_MAX_SPEED - #undef MOUSEKEY_WHEEL_TIME_TO_MAX +/* Keep backlight level increments consistent across keyboards. */ +# undef BACKLIGHT_LEVELS - #define MOUSEKEY_MAX_SPEED 7 - #define MOUSEKEY_TIME_TO_MAX 150 - #define MOUSEKEY_WHEEL_MAX_SPEED 3 - #define MOUSEKEY_WHEEL_TIME_TO_MAX 150 +# define BACKLIGHT_LEVELS 7 #endif diff --git a/users/bcat/readme.md b/users/bcat/readme.md new file mode 100644 index 000000000..49fbea1ac --- /dev/null +++ b/users/bcat/readme.md @@ -0,0 +1,13 @@ +# bcat's userspace + +This is some code and config shared by all of [my](https://github.com/bcat) +keyboards. I have a few different keymaps spread throughout the repo; however, +they are all derived from two "canonical" keymaps for my preferred layouts: + +* For typing, my canonical layout is my +[Crkbd](https://github.com/qmk/qmk_firmware/tree/master/keyboards/crkbd/keymaps/bcat) +(split ergo, columnar-staggered) layout. + +* For gaming, my canonical layout is my +[Tsangan](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsangan_hhkb/bcat) +(row-staggered) layout. diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk index 585e8092e..f3c6f9ab2 100644 --- a/users/bcat/rules.mk +++ b/users/bcat/rules.mk @@ -6,18 +6,30 @@ BOOTMAGIC_ENABLE = lite # Enable media keys on all keyboards. EXTRAKEY_ENABLE = yes -# Disable some unwanted features on all keyboards. -API_SYSEX_ENABLE = no +# Enable link-time optimization to reduce binary size. +LINK_TIME_OPTIMIZATION_ENABLE = yes + +# Disable unused build options on all keyboards. COMMAND_ENABLE = no CONSOLE_ENABLE = no -FAUXCLICKY_ENABLE = no -MIDI_ENABLE = no MOUSEKEY_ENABLE = no NKRO_ENABLE = no +TERMINAL_ENABLE = no + +# Disable unused hardware options on all keyboards. +FAUXCLICKY_ENABLE = no +MIDI_ENABLE = no SLEEP_LED_ENABLE = no + +# Disable unused other options. +API_SYSEX_ENABLE = no +AUTO_SHIFT_ENABLE = no +COMBO_ENABLE = no +KEYBOARD_LOCK_ENABLE = no +KEY_LOCK_ENABLE = no +LEADER_ENABLE = no +SWAP_HANDS_ENABLE = no +TAP_DANCE_ENABLE = no UCIS_ENABLE = no -UNICODE_ENABLE = no UNICODEMAP_ENABLE = no - -# Enable link-time optimization to reduce binary size. -LINK_TIME_OPTIMIZATION_ENABLE = yes +UNICODE_ENABLE = no -- cgit v1.2.3