diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-02-28 11:37:34 -0800 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-02-28 11:37:34 -0800 |
| commit | a872faa53e1b9b9651d3f6ffe6d671e0e211309c (patch) | |
| tree | e51e072580b64d1d989b62825ede4ca73e1796f7 /users/mechmerlin | |
| parent | 3ac3bb9b5e5fb2363983f9b0d0fcb38d7148ac16 (diff) | |
| download | qmk_firmware-a872faa53e1b9b9651d3f6ffe6d671e0e211309c.tar.gz qmk_firmware-a872faa53e1b9b9651d3f6ffe6d671e0e211309c.zip | |
[Keymap] Userspace Keymap Updates (#5215)
* enable velocikey for my userspace and explicitly for my 75% layout
* add guards to only turn on RGB stuff if the RGB pin is actually defined
* update 60_ansi keymap
* update the 60_ansi_split_bs_rshift keymap
* update 66_ansi keymap
* update docs
* Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* Update layouts/community/66_ansi/mechmerlin/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* remove my attempt to find a good way to detect this
* move audio clicky into user space and do feature setting per keyboard
* fixup 66_ansi keymap
* update changelog
* update readme
Diffstat (limited to 'users/mechmerlin')
| -rw-r--r-- | users/mechmerlin/changelog.md | 5 | ||||
| -rw-r--r-- | users/mechmerlin/config.h | 24 | ||||
| -rw-r--r-- | users/mechmerlin/readme.md | 10 | ||||
| -rw-r--r-- | users/mechmerlin/rules.mk | 2 |
4 files changed, 38 insertions, 3 deletions
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md index 11b3ba708..d5877cfdf 100644 --- a/users/mechmerlin/changelog.md +++ b/users/mechmerlin/changelog.md | |||
| @@ -1,6 +1,11 @@ | |||
| 1 | # Changelog | 1 | # Changelog |
| 2 | All notable changes to my userspace will be documented in this file. | 2 | All notable changes to my userspace will be documented in this file. |
| 3 | 3 | ||
| 4 | ## [0.2.0] - 2019-02-27 | ||
| 5 | ### Changed | ||
| 6 | - Moved `AUDIO_CLICKY` from community layout `66_ansi` into user space. | ||
| 7 | - | ||
| 8 | |||
| 4 | ## [0.1.1] - 2018-10-26 | 9 | ## [0.1.1] - 2018-10-26 |
| 5 | ### Added | 10 | ### Added |
| 6 | - Added a changelog, aka THIS VERY FILE! | 11 | - Added a changelog, aka THIS VERY FILE! |
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h index 3d58c230a..3c45162bc 100644 --- a/users/mechmerlin/config.h +++ b/users/mechmerlin/config.h | |||
| @@ -1,5 +1,27 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #ifdef RGBLIGHT_ENABLE | 3 | #ifdef RGBLIGHT_ENABLE |
| 4 | #define RGBLIGHT_SLEEP | 4 | #define RGBLIGHT_SLEEP |
| 5 | #define RGBLIGHT_ANIMATIONS | ||
| 5 | #endif // RGBLIGHT_ENABLE | 6 | #endif // RGBLIGHT_ENABLE |
| 7 | |||
| 8 | #ifdef AUDIO_CLICKY | ||
| 9 | #define AUDIO_CLICKY_ON | ||
| 10 | #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f | ||
| 11 | #define AUDIO_CLICKY_FREQ_MIN 65.41f | ||
| 12 | #define AUDIO_CLICKY_FREQ_MAX 1046.5f | ||
| 13 | //#define AUDIO_CLICKY_FREQ_FACTOR 1.18921f | ||
| 14 | //#define AUDIO_CLICKY_FREQ_FACTOR 2.71828f // e | ||
| 15 | #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio | ||
| 16 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f | ||
| 17 | #endif | ||
| 18 | |||
| 19 | // Enable features depending on keyboard | ||
| 20 | #if defined(KEYBOARD_clueboard_66_hotswap_prototype) | ||
| 21 | #define RGBLIGHT_ENABLE | ||
| 22 | #define AUDIO_CLICKY | ||
| 23 | #elif defined(KEYBOARD_clueboard_66_hotswap_gen1) | ||
| 24 | #define AUDIO_CLICKY | ||
| 25 | #else | ||
| 26 | #define RGBLIGHT_ENABLE | ||
| 27 | #endif | ||
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md index 1e86a6410..24335a7ce 100644 --- a/users/mechmerlin/readme.md +++ b/users/mechmerlin/readme.md | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # MechMerlin's Userspace v0.1.1 | 1 | # MechMerlin's Userspace v0.2.0 |
| 2 | 2 | ||
| 3 | This is a collection of my most commonly used QMK features. | 3 | This is a collection of my most commonly used QMK features. |
| 4 | 4 | ||
| @@ -38,3 +38,11 @@ This is just a wrapper for `CTL_T(KC_CAPS)`. This is a hold for control and tap | |||
| 38 | ### RGBLIGHT_SLEEP | 38 | ### RGBLIGHT_SLEEP |
| 39 | 39 | ||
| 40 | Ensures that when my computer is in sleep mode, the keyboard underglow lights will also be off. | 40 | Ensures that when my computer is in sleep mode, the keyboard underglow lights will also be off. |
| 41 | |||
| 42 | ### Audio Clicky | ||
| 43 | |||
| 44 | If a board has a speaker, enable beeps and boops per switch actuation. This is currently only available on prototype/gen1 clueboard 66_hotswaps. | ||
| 45 | |||
| 46 | ### Velocikey | ||
| 47 | |||
| 48 | [Velocikey](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_velocikey.md) is an RGBLIGHT feature in which the faster you type, the faster the ARE GEE BEES. | ||
diff --git a/users/mechmerlin/rules.mk b/users/mechmerlin/rules.mk index 70c20ec71..088743c46 100644 --- a/users/mechmerlin/rules.mk +++ b/users/mechmerlin/rules.mk | |||
| @@ -1 +1 @@ | |||
| SRC += mechmerlin.c \ No newline at end of file | SRC += mechmerlin.c | ||
