summaryrefslogtreecommitdiff
path: root/users/mechmerlin
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2021-10-05 16:49:50 -0700
committerGitHub <noreply@github.com>2021-10-05 16:49:50 -0700
commite8db309613c99d1ffe25320680368d41bf5c8535 (patch)
tree8ffa09d1e15c3281eeac370cf3c3ffd664fec16f /users/mechmerlin
parente762db44bae46c631186c807a9c10fd8e4684535 (diff)
downloadqmk_firmware-e8db309613c99d1ffe25320680368d41bf5c8535.tar.gz
qmk_firmware-e8db309613c99d1ffe25320680368d41bf5c8535.zip
[Keymap] Some updates to mechmerlin userspace and keymaps (#14711)
Diffstat (limited to 'users/mechmerlin')
-rw-r--r--users/mechmerlin/changelog.md9
-rw-r--r--users/mechmerlin/mechmerlin.c7
-rw-r--r--users/mechmerlin/mechmerlin.h2
-rw-r--r--users/mechmerlin/readme.md6
4 files changed, 20 insertions, 4 deletions
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md
index 2f8fa687a9..dc98e2af01 100644
--- a/users/mechmerlin/changelog.md
+++ b/users/mechmerlin/changelog.md
@@ -1,6 +1,15 @@
# Changelog
All notable changes to my userspace will be documented in this file.
+## [0.4.0] - 2021-10-05
+
+### Added
+- Introduced new keycode KV_VER to output the version of QMK. Thanks to drashna for this.
+
+### Changed
+- Updated keymaps to use underscores instead of KC_TRNS as it was getting hard to read for my tired eyes.
+- Updated readmes on my preferred layouts.
+
## [0.3.0] - 2020-02-02
### Changed
- 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 ad60bd1966..23def968d4 100644
--- a/users/mechmerlin/mechmerlin.c
+++ b/users/mechmerlin/mechmerlin.c
@@ -1,4 +1,7 @@
#include "mechmerlin.h"
+#include "version.h"
+
+#define TAP_CODE_DELAY 10
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static uint16_t fnx_layer_timer;
@@ -15,9 +18,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
break;
- case KC_MAC:
+ case KC_VER:
if (record->event.pressed) {
- SEND_STRING("meow");
+ send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
} else {
}
break;
diff --git a/users/mechmerlin/mechmerlin.h b/users/mechmerlin/mechmerlin.h
index 9802c3ecd2..79386e7663 100644
--- a/users/mechmerlin/mechmerlin.h
+++ b/users/mechmerlin/mechmerlin.h
@@ -12,7 +12,7 @@ enum userspace_layers {
// Enum of custom keycodes defined in process_record_user
enum keycodes {
KC_FNX, // Hold for FN layer, tap to toggle ARROWS layer.
- KC_MAC, // Text macro.
+ KC_VER, // Version macro.
};
// Custom #defined keycodes
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md
index 14a86f055b..c0b1c54c55 100644
--- a/users/mechmerlin/readme.md
+++ b/users/mechmerlin/readme.md
@@ -1,4 +1,4 @@
-# MechMerlin's Userspace v0.2.0
+# MechMerlin's Userspace v0.4.0
This is a collection of my most commonly used QMK features.
@@ -32,6 +32,10 @@ It is used primarily on my `LAYOUT_60_ansi` boards as my regular toggle (the 1u
This is just a wrapper for `CTL_T(KC_CAPS)`. This is a hold for control and tap for caps lock.
+### KC_VER
+
+Output the version of QMK Firmware on device.
+
## QMK Features
----