1
0
Fork 0

Store Clicky status in EEPROM

This commit is contained in:
Drashna Jaelre 2018-05-08 18:46:29 -07:00 committed by skullydazed
parent b7e25f9ec4
commit e72e4b6920
5 changed files with 33 additions and 24 deletions

View file

@ -128,13 +128,11 @@ This adds a click sound each time you hit a button, to simulate click sounds fro
* `CK_UP` - Increases the frequency of the clicks * `CK_UP` - Increases the frequency of the clicks
* `CK_DOWN` - Decreases the frequency of the clicks * `CK_DOWN` - Decreases the frequency of the clicks
The feature is disabled by default, to save space. To enable it, add this to your `config.h`: The feature is disabled by default, to save space. To enable it, add this to your `config.h`:
#define AUDIO_CLICKY #define AUDIO_CLICKY
Additionally, even when enabled, the feature is not enabled by default, so you would need to turn it on first. And since we don't use EEPROM to store the setting (yet), you can default this to on by adding this to your `config.h`:
#define AUDIO_CLICKY_ON
You can configure the default, min and max frequencies, the stepping and built in randomness by defining these values: You can configure the default, min and max frequencies, the stepping and built in randomness by defining these values:

View file

@ -223,7 +223,7 @@ void audio_init()
TCCR1B = (1 << WGM13) | (1 << WGM12) | (0 << CS12) | (1 << CS11) | (0 << CS10); TCCR1B = (1 << WGM13) | (1 << WGM12) | (0 << CS12) | (1 << CS11) | (0 << CS10);
TIMER_1_PERIOD = (uint16_t)(((float)F_CPU) / (440 * CPU_PRESCALER)); TIMER_1_PERIOD = (uint16_t)(((float)F_CPU) / (440 * CPU_PRESCALER));
TIMER_1_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (440 * CPU_PRESCALER)) * note_timbre); TIMER_1_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (440 * CPU_PRESCALER)) * note_timbre);
#endif #endif
audio_initialized = true; audio_initialized = true;
} }
@ -231,7 +231,7 @@ void audio_init()
if (audio_config.enable) { if (audio_config.enable) {
PLAY_SONG(startup_song); PLAY_SONG(startup_song);
} }
} }
void stop_all_notes() void stop_all_notes()
@ -464,7 +464,7 @@ ISR(TIMER3_AUDIO_vect)
note_position++; note_position++;
bool end_of_note = false; bool end_of_note = false;
if (TIMER_3_PERIOD > 0) { if (TIMER_3_PERIOD > 0) {
if (!note_resting) if (!note_resting)
end_of_note = (note_position >= (note_length / TIMER_3_PERIOD * 0xFFFF - 1)); end_of_note = (note_position >= (note_length / TIMER_3_PERIOD * 0xFFFF - 1));
else else
end_of_note = (note_position >= (note_length)); end_of_note = (note_position >= (note_length));
@ -604,7 +604,7 @@ ISR(TIMER1_AUDIO_vect)
note_position++; note_position++;
bool end_of_note = false; bool end_of_note = false;
if (TIMER_1_PERIOD > 0) { if (TIMER_1_PERIOD > 0) {
if (!note_resting) if (!note_resting)
end_of_note = (note_position >= (note_length / TIMER_1_PERIOD * 0xFFFF - 1)); end_of_note = (note_position >= (note_length / TIMER_1_PERIOD * 0xFFFF - 1));
else else
end_of_note = (note_position >= (note_length)); end_of_note = (note_position >= (note_length));

View file

@ -3,11 +3,6 @@
#ifdef AUDIO_CLICKY #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 #ifndef AUDIO_CLICKY_FREQ_DEFAULT
#define AUDIO_CLICKY_FREQ_DEFAULT 440.0f #define AUDIO_CLICKY_FREQ_DEFAULT 440.0f
#endif // !AUDIO_CLICKY_FREQ_DEFAULT #endif // !AUDIO_CLICKY_FREQ_DEFAULT
@ -27,6 +22,8 @@ bool clicky_enable = false;
float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; 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 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 #ifndef NO_MUSIC_MODE
extern bool music_activated; extern bool music_activated;
extern bool midi_activated; extern bool midi_activated;
@ -42,7 +39,10 @@ void clicky_play(void) {
} }
bool process_clicky(uint16_t keycode, keyrecord_t *record) { 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; } 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) { if (record->event.pressed) {
clicky_play();; clicky_play();;
} }

View file

@ -133,9 +133,6 @@ void led_set_keymap(uint8_t usb_led) {}
void matrix_init_user(void) { void matrix_init_user(void) {
userspace_config.raw = eeprom_read_byte(EECONFIG_USERSPACE); userspace_config.raw = eeprom_read_byte(EECONFIG_USERSPACE);
#ifdef AUDIO_CLICKY
clicky_enable = userspace_config.clicky_enable;
#endif
#ifdef BOOTLOADER_CATERINA #ifdef BOOTLOADER_CATERINA
DDRD &= ~(1<<5); DDRD &= ~(1<<5);
@ -145,7 +142,6 @@ void matrix_init_user(void) {
PORTB &= ~(1<<0); PORTB &= ~(1<<0);
#endif #endif
#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
set_unicode_input_mode(UC_WINC); set_unicode_input_mode(UC_WINC);
#endif //UNICODE_ENABLE #endif //UNICODE_ENABLE
@ -338,11 +334,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false; break; return false; break;
case CLICKY_TOGGLE: case KC_CCCV: // One key copy/paste
#ifdef AUDIO_CLICKY if(record->event.pressed){
userspace_config.clicky_enable = clicky_enable; copy_paste_timer = timer_read();
eeprom_update_byte(EECONFIG_USERSPACE, userspace_config.raw); } else {
if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy
register_code(KC_LCTL);
tap(KC_C);
unregister_code(KC_LCTL);
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_copy);
#endif #endif
} else { // Tap, paste
register_code(KC_LCTL);
tap(KC_V);
unregister_code(KC_LCTL);
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_paste);
#endif
}
}
return false;
break; break;
#ifdef UNICODE_ENABLE #ifdef UNICODE_ENABLE
case UC_FLIP: // (╯°□°)╯ ︵ ┻━┻ case UC_FLIP: // (╯°□°)╯ ︵ ┻━┻

View file

@ -49,7 +49,7 @@ enum userspace_layers {
// RGB color codes are no longer located here anymore. Instead, you will want to // RGB color codes are no longer located here anymore. Instead, you will want to
// head to https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h // head to https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h
extern bool clicky_enable; extern bool rgb_layer_change;
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
void rgblight_sethsv_default_helper(uint8_t index); void rgblight_sethsv_default_helper(uint8_t index);
@ -64,7 +64,6 @@ bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t thi
typedef union { typedef union {
uint8_t raw; uint8_t raw;
struct { struct {
bool clicky_enable :1;
bool rgb_layer_change :1; bool rgb_layer_change :1;
bool is_overwatch :1; bool is_overwatch :1;
bool nuke_switch :1; bool nuke_switch :1;