aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-08-11 16:45:29 -0700
committerDrashna Jaelre <drashna@live.com>2018-08-11 16:45:29 -0700
commitf0e0ca402c10fe2ade7129b28a0066bdf10d018d (patch)
treeeb57f7877b80a14be800776f721c9ebb4bdc2096
parent2a49832db33598b8acee822fa7b3a6c6af48de0d (diff)
downloadfirmware-f0e0ca402c10fe2ade7129b28a0066bdf10d018d.tar.gz
firmware-f0e0ca402c10fe2ade7129b28a0066bdf10d018d.tar.bz2
firmware-f0e0ca402c10fe2ade7129b28a0066bdf10d018d.zip
Keymap: copy skully's faux clicky mods (#3628)
-rw-r--r--layouts/community/66_ansi/mechmerlin/config.h12
-rw-r--r--layouts/community/66_ansi/mechmerlin/keymap.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/layouts/community/66_ansi/mechmerlin/config.h b/layouts/community/66_ansi/mechmerlin/config.h
new file mode 100644
index 000000000..f51361866
--- /dev/null
+++ b/layouts/community/66_ansi/mechmerlin/config.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#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
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 9baf238c7..b8142f967 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_66_ansi(
BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, _______, RGB_VAI, \
RGB_TOG,_______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, \
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
+ CK_TOGG,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, \
_______,_______,_______, RGB_MOD, _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
};