diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-04-18 22:47:04 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-04-19 01:47:04 -0400 |
| commit | 8b0b17a369be6d3dff4cb9bad4253960252a5e95 (patch) | |
| tree | 11d453ef480983571de84147db3bc9c1bfcb5054 /users/drashna | |
| parent | 23b45710acc57ed147e006a8c79a1caf6fa57fd7 (diff) | |
| download | qmk_firmware-8b0b17a369be6d3dff4cb9bad4253960252a5e95.tar.gz qmk_firmware-8b0b17a369be6d3dff4cb9bad4253960252a5e95.zip | |
Add Faux Clicking as subset of Audio feature (#2748)
* Add Faux Clicky to main Audio feature
* Make clicky settings user configurable
* Add additional documentation
* Don't play when music mode is enabled (hopefully)
Diffstat (limited to 'users/drashna')
| -rw-r--r-- | users/drashna/config.h | 1 | ||||
| -rw-r--r-- | users/drashna/drashna.c | 18 | ||||
| -rw-r--r-- | users/drashna/drashna.h | 1 |
3 files changed, 1 insertions, 19 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h index 68394ee4db..f9b0d4d17a 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -3,6 +3,7 @@ #ifdef AUDIO_ENABLE +#define AUDIO_CLICKY #define STARTUP_SONG SONG(E1M1_DOOM) #define GOODBYE_SONG SONG(SONIC_RING) #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 170c320d36..73bd249e4c 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -224,19 +224,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed); #endif //CONSOLE_ENABLE - // Run custom faux click code, but only if faux clicky is enabled -#ifdef AUDIO_ENABLE - if ( (faux_click_enabled && keycode != KC_FXCL) || (!faux_click_enabled && keycode == KC_FXCL) ) { - if (record->event.pressed) { - stop_all_notes(); - PLAY_SONG(fauxclicky_pressed); - } else { - stop_all_notes(); - PLAY_SONG(fauxclicky_released); - } - } -#endif //AUDIO_ENABLE - switch (keycode) { case KC_QWERTY: @@ -398,11 +385,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #endif // TAP_DANCE_ENABLE - case KC_FXCL: - if (!record->event.pressed) { // Toggles the custom faux click code - faux_click_enabled = !faux_click_enabled; - } - return false; break; case KC_RGB_T: // This allows me to use underglow as layer indication, or as normal #ifdef RGBLIGHT_ENABLE if (record->event.pressed) { diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h index 1086fa02ed..b7cbaa44af 100644 --- a/users/drashna/drashna.h +++ b/users/drashna/drashna.h @@ -83,7 +83,6 @@ enum userspace_custom_keycodes { KC_SECRET_3, KC_SECRET_4, KC_SECRET_5, - KC_FXCL, NEW_SAFE_RANGE //use "NEWPLACEHOLDER for keymap specific codes }; |