diff options
Diffstat (limited to 'users/mechmerlin')
| -rw-r--r-- | users/mechmerlin/changelog.md | 5 | ||||
| -rw-r--r-- | users/mechmerlin/config.h | 4 | ||||
| -rw-r--r-- | users/mechmerlin/mechmerlin.c | 8 | ||||
| -rw-r--r-- | users/mechmerlin/mechmerlin.h | 4 | ||||
| -rw-r--r-- | users/mechmerlin/readme.md | 7 | ||||
| -rw-r--r-- | users/mechmerlin/rules.mk | 1 |
6 files changed, 23 insertions, 6 deletions
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md index f1116b2d2..2f8fa687a 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.3.0] - 2020-02-02 | ||
| 5 | ### Changed | ||
| 6 | - Added the `_CL` layer to all the boards for access to `EEP_RST` and `RESET` keycodes. This was done primarily to avoid triggering `RESET` accidentally. | ||
| 7 | - Added a placeholder text macro under the custom keycode `KC_MAC`. Currently set to "meow", but will change as needed in the future. | ||
| 8 | |||
| 4 | ## [0.2.2] - 2019-04-22 | 9 | ## [0.2.2] - 2019-04-22 |
| 5 | ### Fixed | 10 | ### Fixed |
| 6 | - `config.h` usage of turning on `RGBLIGHT_ENABLE` when it is not enabled on boards other than my two clueboards were causing issues with boards that didn't have RGB underglow on it. | 11 | - `config.h` usage of turning on `RGBLIGHT_ENABLE` when it is not enabled on boards other than my two clueboards were causing issues with boards that didn't have RGB underglow on it. |
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h index fe8f9c9ff..698e237b0 100644 --- a/users/mechmerlin/config.h +++ b/users/mechmerlin/config.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f | 10 | #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f |
| 11 | #define AUDIO_CLICKY_FREQ_MIN 65.41f | 11 | #define AUDIO_CLICKY_FREQ_MIN 65.41f |
| 12 | #define AUDIO_CLICKY_FREQ_MAX 1046.5f | 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 | 13 | #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio |
| 16 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f | 14 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f |
| 17 | #endif | 15 | #endif |
| @@ -24,7 +22,7 @@ | |||
| 24 | #ifndef AUDIO_CLICKY | 22 | #ifndef AUDIO_CLICKY |
| 25 | #define AUDIO_CLICKY | 23 | #define AUDIO_CLICKY |
| 26 | #endif | 24 | #endif |
| 27 | #elif defined(KEYBOARD_clueboard_66_hotswap_gen1) | 25 | #elif defined(KEYBOARD_clueboard_66_hotswap_gen1) || defined(KEYBOARD_clueboard_66_rev4) |
| 28 | #ifndef AUDIO_CLICKY | 26 | #ifndef AUDIO_CLICKY |
| 29 | #define AUDIO_CLICKY | 27 | #define AUDIO_CLICKY |
| 30 | #endif | 28 | #endif |
diff --git a/users/mechmerlin/mechmerlin.c b/users/mechmerlin/mechmerlin.c index 8d6cecd18..ad60bd196 100644 --- a/users/mechmerlin/mechmerlin.c +++ b/users/mechmerlin/mechmerlin.c | |||
| @@ -14,7 +14,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 14 | layer_invert(_AL); | 14 | layer_invert(_AL); |
| 15 | } | 15 | } |
| 16 | } | 16 | } |
| 17 | return false; | 17 | break; |
| 18 | case KC_MAC: | ||
| 19 | if (record->event.pressed) { | ||
| 20 | SEND_STRING("meow"); | ||
| 21 | } else { | ||
| 22 | } | ||
| 23 | break; | ||
| 18 | } | 24 | } |
| 19 | return true; | 25 | return true; |
| 20 | } \ No newline at end of file | 26 | } \ No newline at end of file |
diff --git a/users/mechmerlin/mechmerlin.h b/users/mechmerlin/mechmerlin.h index 6b4d50edc..9802c3ecd 100644 --- a/users/mechmerlin/mechmerlin.h +++ b/users/mechmerlin/mechmerlin.h | |||
| @@ -5,12 +5,14 @@ | |||
| 5 | enum userspace_layers { | 5 | enum userspace_layers { |
| 6 | _BL = 0, // Base Layer | 6 | _BL = 0, // Base Layer |
| 7 | _FL, // Function Layer | 7 | _FL, // Function Layer |
| 8 | _AL // Arrow Layer | 8 | _AL, // Arrow Layer |
| 9 | _CL // Control Layer | ||
| 9 | }; | 10 | }; |
| 10 | 11 | ||
| 11 | // Enum of custom keycodes defined in process_record_user | 12 | // Enum of custom keycodes defined in process_record_user |
| 12 | enum keycodes { | 13 | enum keycodes { |
| 13 | KC_FNX, // Hold for FN layer, tap to toggle ARROWS layer. | 14 | KC_FNX, // Hold for FN layer, tap to toggle ARROWS layer. |
| 15 | KC_MAC, // Text macro. | ||
| 14 | }; | 16 | }; |
| 15 | 17 | ||
| 16 | // Custom #defined keycodes | 18 | // Custom #defined keycodes |
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md index 24335a7ce..14a86f055 100644 --- a/users/mechmerlin/readme.md +++ b/users/mechmerlin/readme.md | |||
| @@ -17,7 +17,7 @@ This layer is commonly accessed via `MO(_FL)` on the base layer. It consists of | |||
| 17 | This layer is only present on my 60% boards. I habitually use the bottom right modifiers as arrows. | 17 | This layer is only present on my 60% boards. I habitually use the bottom right modifiers as arrows. |
| 18 | 18 | ||
| 19 | ### _CL (Control Layer) | 19 | ### _CL (Control Layer) |
| 20 | This is not defined in here as it's present only on `LAYOUT_66` boards, or to be specific, my clueboard. It currently uses the default clueboard controls. | 20 | This layer is used for the `RESET` and `EEP_RST` keycodes. |
| 21 | 21 | ||
| 22 | ## Custom Keycodes | 22 | ## Custom Keycodes |
| 23 | ---- | 23 | ---- |
| @@ -46,3 +46,8 @@ If a board has a speaker, enable beeps and boops per switch actuation. This is c | |||
| 46 | ### Velocikey | 46 | ### Velocikey |
| 47 | 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. | 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. |
| 49 | |||
| 50 | ### Macros | ||
| 51 | |||
| 52 | Basic text macro implemented for future use | ||
| 53 | |||
diff --git a/users/mechmerlin/rules.mk b/users/mechmerlin/rules.mk index 088743c46..043c70fb4 100644 --- a/users/mechmerlin/rules.mk +++ b/users/mechmerlin/rules.mk | |||
| @@ -1 +1,2 @@ | |||
| 1 | SRC += mechmerlin.c | 1 | SRC += mechmerlin.c |
| 2 | LTO_ENABLE = yes | ||
