summaryrefslogtreecommitdiffstats
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-05-09 03:46:29 +0200
committerskullydazed <skullydazed@users.noreply.github.com>2018-09-25 22:28:36 +0200
commite72e4b6920299176a322a2862f930b7ee5f73dff (patch)
tree1bd34f2b6fe46d08589699d5b47c984fc66d26f7 /quantum/process_keycode
parentb7e25f9ec4203670f2434e82608554ba284cf1f3 (diff)
downloadqmk_firmware-e72e4b6920299176a322a2862f930b7ee5f73dff.tar.gz
qmk_firmware-e72e4b6920299176a322a2862f930b7ee5f73dff.tar.xz
Store Clicky status in EEPROM
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_clicky.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index 1e950d111..bd2f1b3b3 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -3,11 +3,6 @@
#ifdef AUDIO_CLICKY
-#ifdef AUDIO_CLICKY_ON
-bool clicky_enable = true;
-#else // AUDIO_CLICKY_ON
-bool clicky_enable = false;
-#endif // AUDIO_CLICKY_ON
#ifndef AUDIO_CLICKY_FREQ_DEFAULT
#define AUDIO_CLICKY_FREQ_DEFAULT 440.0f
#endif // !AUDIO_CLICKY_FREQ_DEFAULT
@@ -27,6 +22,8 @@ bool clicky_enable = false;
float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;
float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations
+extern audio_config_t audio_config;
+
#ifndef NO_MUSIC_MODE
extern bool music_activated;
extern bool midi_activated;
@@ -42,7 +39,10 @@ void clicky_play(void) {
}
bool process_clicky(uint16_t keycode, keyrecord_t *record) {
- if (keycode == CLICKY_TOGGLE && record->event.pressed) { clicky_enable = !clicky_enable; }
+ if (keycode == CLICKY_TOGGLE && record->event.pressed) {
+ audio_config.clicky ^= 1;
+ eeconfig_update_audio(audio_config.raw);
+ }
if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; }
@@ -60,7 +60,7 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {
}
- if ( clicky_enable ) {
+ if ( audio_config.clicky ) {
if (record->event.pressed) {
clicky_play();;
}