Merlin's userspace updates (#8074)

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 @@
 # Changelog
 All notable changes to my userspace will be documented in this file.
 
+## [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. 
+- Added a placeholder text macro under the custom keycode `KC_MAC`. Currently set to "meow", but will change as needed in the future. 
+
 ## [0.2.2] - 2019-04-22
 ### Fixed
 - `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 @@
     #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f
     #define AUDIO_CLICKY_FREQ_MIN 65.41f
     #define AUDIO_CLICKY_FREQ_MAX 1046.5f
-    //#define AUDIO_CLICKY_FREQ_FACTOR 1.18921f
-    //#define AUDIO_CLICKY_FREQ_FACTOR 2.71828f  // e
     #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio
     #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f
 #endif
@@ -24,7 +22,7 @@
     #ifndef AUDIO_CLICKY
         #define AUDIO_CLICKY
     #endif
-#elif defined(KEYBOARD_clueboard_66_hotswap_gen1)
+#elif defined(KEYBOARD_clueboard_66_hotswap_gen1) || defined(KEYBOARD_clueboard_66_rev4)
     #ifndef AUDIO_CLICKY
         #define AUDIO_CLICKY
     #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) {
                     layer_invert(_AL);
                 }
             }
-        return false;
+        break;
+        case KC_MAC:
+            if (record->event.pressed) {
+                SEND_STRING("meow");
+            } else {
+            }
+        break;
     }
     return true;
 }
\ 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 @@
 enum userspace_layers {
   _BL = 0, // Base Layer
   _FL,     // Function Layer
-  _AL      // Arrow Layer
+  _AL,     // Arrow Layer
+  _CL      // Control Layer
 };
 
 // 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.
 };
 
 // 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
 This layer is only present on my 60% boards. I habitually use the bottom right modifiers as arrows. 
 
 ### _CL (Control Layer)
-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.
+This layer is used for the `RESET` and `EEP_RST` keycodes. 
 
 ## Custom Keycodes
 ----
@@ -46,3 +46,8 @@ If a board has a speaker, enable beeps and boops per switch actuation. This is c
 ### Velocikey
 
 [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. 
+
+### Macros
+
+Basic text macro implemented for future use
+
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 @@
 SRC += mechmerlin.c
+LTO_ENABLE = yes