summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-02-28 11:37:34 -0800
committerDrashna Jaelre <drashna@live.com>2019-02-28 11:37:34 -0800
commita872faa53e1b9b9651d3f6ffe6d671e0e211309c (patch)
treee51e072580b64d1d989b62825ede4ca73e1796f7 /users
parent3ac3bb9b5e5fb2363983f9b0d0fcb38d7148ac16 (diff)
[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')
-rw-r--r--users/mechmerlin/changelog.md5
-rw-r--r--users/mechmerlin/config.h24
-rw-r--r--users/mechmerlin/readme.md10
-rw-r--r--users/mechmerlin/rules.mk2
4 files changed, 38 insertions, 3 deletions
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md
index 11b3ba708f..d5877cfdfe 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.2.0] - 2019-02-27
+### Changed
+- Moved `AUDIO_CLICKY` from community layout `66_ansi` into user space.
+-
+
## [0.1.1] - 2018-10-26
### Added
- Added a changelog, aka THIS VERY FILE!
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index 3d58c230af..3c45162bcc 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -1,5 +1,27 @@
#pragma once
#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SLEEP
+ #define RGBLIGHT_SLEEP
+ #define RGBLIGHT_ANIMATIONS
#endif // RGBLIGHT_ENABLE
+
+#ifdef AUDIO_CLICKY
+ #define AUDIO_CLICKY_ON
+ #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
+
+// Enable features depending on keyboard
+#if defined(KEYBOARD_clueboard_66_hotswap_prototype)
+ #define RGBLIGHT_ENABLE
+ #define AUDIO_CLICKY
+#elif defined(KEYBOARD_clueboard_66_hotswap_gen1)
+ #define AUDIO_CLICKY
+#else
+ #define RGBLIGHT_ENABLE
+#endif
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md
index 1e86a64107..24335a7ce2 100644
--- a/users/mechmerlin/readme.md
+++ b/users/mechmerlin/readme.md
@@ -1,4 +1,4 @@
-# MechMerlin's Userspace v0.1.1
+# MechMerlin's Userspace v0.2.0
This is a collection of my most commonly used QMK features.
@@ -38,3 +38,11 @@ This is just a wrapper for `CTL_T(KC_CAPS)`. This is a hold for control and tap
### RGBLIGHT_SLEEP
Ensures that when my computer is in sleep mode, the keyboard underglow lights will also be off.
+
+### Audio Clicky
+
+If a board has a speaker, enable beeps and boops per switch actuation. This is currently only available on prototype/gen1 clueboard 66_hotswaps.
+
+### 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.
diff --git a/users/mechmerlin/rules.mk b/users/mechmerlin/rules.mk
index 70c20ec71e..088743c467 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