diff options
author | Drashna Jaelre <drashna@live.com> | 2018-05-08 18:46:29 -0700 |
---|---|---|
committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-09-25 13:28:36 -0700 |
commit | e72e4b6920299176a322a2862f930b7ee5f73dff (patch) | |
tree | 1bd34f2b6fe46d08589699d5b47c984fc66d26f7 /quantum/process_keycode/process_clicky.c | |
parent | b7e25f9ec4203670f2434e82608554ba284cf1f3 (diff) | |
download | qmk_firmware-e72e4b6920299176a322a2862f930b7ee5f73dff.tar.gz qmk_firmware-e72e4b6920299176a322a2862f930b7ee5f73dff.zip |
Store Clicky status in EEPROM
Diffstat (limited to 'quantum/process_keycode/process_clicky.c')
-rw-r--r-- | quantum/process_keycode/process_clicky.c | 14 |
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 @@ | |||
3 | 3 | ||
4 | #ifdef AUDIO_CLICKY | 4 | #ifdef AUDIO_CLICKY |
5 | 5 | ||
6 | #ifdef AUDIO_CLICKY_ON | ||
7 | bool clicky_enable = true; | ||
8 | #else // AUDIO_CLICKY_ON | ||
9 | bool clicky_enable = false; | ||
10 | #endif // AUDIO_CLICKY_ON | ||
11 | #ifndef AUDIO_CLICKY_FREQ_DEFAULT | 6 | #ifndef AUDIO_CLICKY_FREQ_DEFAULT |
12 | #define AUDIO_CLICKY_FREQ_DEFAULT 440.0f | 7 | #define AUDIO_CLICKY_FREQ_DEFAULT 440.0f |
13 | #endif // !AUDIO_CLICKY_FREQ_DEFAULT | 8 | #endif // !AUDIO_CLICKY_FREQ_DEFAULT |
@@ -27,6 +22,8 @@ bool clicky_enable = false; | |||
27 | float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; | 22 | float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; |
28 | float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations | 23 | float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations |
29 | 24 | ||
25 | extern audio_config_t audio_config; | ||
26 | |||
30 | #ifndef NO_MUSIC_MODE | 27 | #ifndef NO_MUSIC_MODE |
31 | extern bool music_activated; | 28 | extern bool music_activated; |
32 | extern bool midi_activated; | 29 | extern bool midi_activated; |
@@ -42,7 +39,10 @@ void clicky_play(void) { | |||
42 | } | 39 | } |
43 | 40 | ||
44 | bool process_clicky(uint16_t keycode, keyrecord_t *record) { | 41 | bool process_clicky(uint16_t keycode, keyrecord_t *record) { |
45 | if (keycode == CLICKY_TOGGLE && record->event.pressed) { clicky_enable = !clicky_enable; } | 42 | if (keycode == CLICKY_TOGGLE && record->event.pressed) { |
43 | audio_config.clicky ^= 1; | ||
44 | eeconfig_update_audio(audio_config.raw); | ||
45 | } | ||
46 | 46 | ||
47 | if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; } | 47 | if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; } |
48 | 48 | ||
@@ -60,7 +60,7 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) { | |||
60 | } | 60 | } |
61 | 61 | ||
62 | 62 | ||
63 | if ( clicky_enable ) { | 63 | if ( audio_config.clicky ) { |
64 | if (record->event.pressed) { | 64 | if (record->event.pressed) { |
65 | clicky_play();; | 65 | clicky_play();; |
66 | } | 66 | } |