diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2021-10-05 16:49:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 16:49:50 -0700 |
| commit | e8db309613c99d1ffe25320680368d41bf5c8535 (patch) | |
| tree | 8ffa09d1e15c3281eeac370cf3c3ffd664fec16f /users | |
| parent | e762db44bae46c631186c807a9c10fd8e4684535 (diff) | |
| download | qmk_firmware-e8db309613c99d1ffe25320680368d41bf5c8535.tar.gz qmk_firmware-e8db309613c99d1ffe25320680368d41bf5c8535.zip | |
[Keymap] Some updates to mechmerlin userspace and keymaps (#14711)
Diffstat (limited to 'users')
| -rw-r--r-- | users/mechmerlin/changelog.md | 9 | ||||
| -rw-r--r-- | users/mechmerlin/mechmerlin.c | 7 | ||||
| -rw-r--r-- | users/mechmerlin/mechmerlin.h | 2 | ||||
| -rw-r--r-- | users/mechmerlin/readme.md | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md index 2f8fa687a..dc98e2af0 100644 --- a/users/mechmerlin/changelog.md +++ b/users/mechmerlin/changelog.md | |||
| @@ -1,6 +1,15 @@ | |||
| 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.4.0] - 2021-10-05 | ||
| 5 | |||
| 6 | ### Added | ||
| 7 | - Introduced new keycode KV_VER to output the version of QMK. Thanks to drashna for this. | ||
| 8 | |||
| 9 | ### Changed | ||
| 10 | - Updated keymaps to use underscores instead of KC_TRNS as it was getting hard to read for my tired eyes. | ||
| 11 | - Updated readmes on my preferred layouts. | ||
| 12 | |||
| 4 | ## [0.3.0] - 2020-02-02 | 13 | ## [0.3.0] - 2020-02-02 |
| 5 | ### Changed | 14 | ### 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. | 15 | - 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. |
diff --git a/users/mechmerlin/mechmerlin.c b/users/mechmerlin/mechmerlin.c index ad60bd196..23def968d 100644 --- a/users/mechmerlin/mechmerlin.c +++ b/users/mechmerlin/mechmerlin.c | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | #include "mechmerlin.h" | 1 | #include "mechmerlin.h" |
| 2 | #include "version.h" | ||
| 3 | |||
| 4 | #define TAP_CODE_DELAY 10 | ||
| 2 | 5 | ||
| 3 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 6 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 4 | static uint16_t fnx_layer_timer; | 7 | static uint16_t fnx_layer_timer; |
| @@ -15,9 +18,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 15 | } | 18 | } |
| 16 | } | 19 | } |
| 17 | break; | 20 | break; |
| 18 | case KC_MAC: | 21 | case KC_VER: |
| 19 | if (record->event.pressed) { | 22 | if (record->event.pressed) { |
| 20 | SEND_STRING("meow"); | 23 | send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY); |
| 21 | } else { | 24 | } else { |
| 22 | } | 25 | } |
| 23 | break; | 26 | break; |
diff --git a/users/mechmerlin/mechmerlin.h b/users/mechmerlin/mechmerlin.h index 9802c3ecd..79386e766 100644 --- a/users/mechmerlin/mechmerlin.h +++ b/users/mechmerlin/mechmerlin.h | |||
| @@ -12,7 +12,7 @@ enum userspace_layers { | |||
| 12 | // Enum of custom keycodes defined in process_record_user | 12 | // Enum of custom keycodes defined in process_record_user |
| 13 | enum keycodes { | 13 | enum keycodes { |
| 14 | 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. | 15 | KC_VER, // Version macro. |
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | // Custom #defined keycodes | 18 | // Custom #defined keycodes |
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md index 14a86f055..c0b1c54c5 100644 --- a/users/mechmerlin/readme.md +++ b/users/mechmerlin/readme.md | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # MechMerlin's Userspace v0.2.0 | 1 | # MechMerlin's Userspace v0.4.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 | ||
| @@ -32,6 +32,10 @@ It is used primarily on my `LAYOUT_60_ansi` boards as my regular toggle (the 1u | |||
| 32 | 32 | ||
| 33 | This is just a wrapper for `CTL_T(KC_CAPS)`. This is a hold for control and tap for caps lock. | 33 | This is just a wrapper for `CTL_T(KC_CAPS)`. This is a hold for control and tap for caps lock. |
| 34 | 34 | ||
| 35 | ### KC_VER | ||
| 36 | |||
| 37 | Output the version of QMK Firmware on device. | ||
| 38 | |||
| 35 | ## QMK Features | 39 | ## QMK Features |
| 36 | ---- | 40 | ---- |
| 37 | 41 | ||
