summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quantum/audio/audio.h3
-rw-r--r--quantum/process_keycode/process_clicky.c60
-rw-r--r--quantum/process_keycode/process_clicky.h9
3 files changed, 53 insertions, 19 deletions
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index da09b2bcd..8136c5b25 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -40,7 +40,8 @@ typedef union {
uint8_t raw;
struct {
bool enable :1;
- uint8_t level :7;
+ bool clicky_enable :1;
+ uint8_t level :6;
};
} audio_config_t;
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index bd2f1b3b3..b3c8d890e 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -38,29 +38,53 @@ void clicky_play(void) {
PLAY_SONG(clicky_song);
}
+void clicky_freq_up(void) {
+ float new_freq = clicky_freq * AUDIO_CLICKY_FREQ_FACTOR;
+ if (new_freq < AUDIO_CLICKY_FREQ_MAX) {
+ clicky_freq = new_freq;
+ }
+}
+
+void clicky_freq_down(void) {
+ float new_freq = clicky_freq / AUDIO_CLICKY_FREQ_FACTOR;
+ if (new_freq > AUDIO_CLICKY_FREQ_MIN) {
+ clicky_freq = new_freq;
+ }
+}
+
+void clicky_freq_reset(void) {
+ clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;
+}
+
+void clicky_freq_toggle(void) {
+ audio_config.clicky_enable ^= 1;
+ eeconfig_update_audio(audio_config.raw);
+}
+
+void clicky_freq_on(void) {
+ audio_config.clicky_enable = 1;
+ eeconfig_update_audio(audio_config.raw);
+}
+
+void clicky_freq_off(void) {
+ audio_config.clicky_enable = 0;
+ eeconfig_update_audio(audio_config.raw);
+}
+
+bool is_clicky_on(void) {
+ return (audio_config.clicky_enable != 0);
+}
+
bool process_clicky(uint16_t keycode, keyrecord_t *record) {
- if (keycode == CLICKY_TOGGLE && record->event.pressed) {
- audio_config.clicky ^= 1;
- eeconfig_update_audio(audio_config.raw);
- }
+ if (keycode == CLICKY_TOGGLE && record->event.pressed) { clicky_freq_toggle(); }
- if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; }
+ if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq_reset(); }
- if (keycode == CLICKY_UP && record->event.pressed) {
- float new_freq = clicky_freq * AUDIO_CLICKY_FREQ_FACTOR;
- if (new_freq < AUDIO_CLICKY_FREQ_MAX) {
- clicky_freq = new_freq;
- }
- }
- if (keycode == CLICKY_DOWN && record->event.pressed) {
- float new_freq = clicky_freq / AUDIO_CLICKY_FREQ_FACTOR;
- if (new_freq > AUDIO_CLICKY_FREQ_MIN) {
- clicky_freq = new_freq;
- }
- }
+ if (keycode == CLICKY_UP && record->event.pressed) { clicky_freq_up(); }
+ if (keycode == CLICKY_DOWN && record->event.pressed) { clicky_freq_down(); }
- if ( audio_config.clicky ) {
+ if ( audio_config.clicky_enable ) {
if (record->event.pressed) {
clicky_play();;
}
diff --git a/quantum/process_keycode/process_clicky.h b/quantum/process_keycode/process_clicky.h
index e274af56f..6ee3cc5d9 100644
--- a/quantum/process_keycode/process_clicky.h
+++ b/quantum/process_keycode/process_clicky.h
@@ -4,4 +4,13 @@
void clicky_play(void);
bool process_clicky(uint16_t keycode, keyrecord_t *record);
+void clicky_freq_up(void);
+void clicky_freq_down(void);
+void clicky_freq_reset(void);
+void clicky_freq_toggle(void);
+void clicky_freq_on(void);
+void clicky_freq_off(void);
+
+bool is_clicky_on(void);
+
#endif