diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-04-18 16:16:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 16:16:35 -0400 |
| commit | d926ba22a2d08fe5006221c7784f7d1f9a808c8c (patch) | |
| tree | 1051433a46cf6ea51d09985f42085e5b93fcc4aa /quantum/fauxclicky.c | |
| parent | 7a16a30e6a69a3210cbcda8bab012ba1c1d99a12 (diff) | |
| parent | ffa4c72a893b416da32efef80f4779b8bd48b4bb (diff) | |
Merge pull request #1238 from priyadi/fauxclicky_fix
Faux clicky bug fixes
Diffstat (limited to 'quantum/fauxclicky.c')
| -rw-r--r-- | quantum/fauxclicky.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/quantum/fauxclicky.c b/quantum/fauxclicky.c index 13273e7058..c3341ca332 100644 --- a/quantum/fauxclicky.c +++ b/quantum/fauxclicky.c @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <stdbool.h> #include <musical_notes.h> -__attribute__ ((weak)) -float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_F3, 2); -__attribute__ ((weak)) -float fauxclicky_released_note[2] = MUSICAL_NOTE(_A3, 2); -__attribute__ ((weak)) -float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C3, 2); - bool fauxclicky_enabled = true; uint16_t note_start = 0; bool note_playing = false; @@ -48,13 +41,13 @@ void fauxclicky_stop() note_playing = false; } -void fauxclicky_play(float note[2]) { +void fauxclicky_play(float note[]) { if (!fauxclicky_enabled) return; if (note_playing) fauxclicky_stop(); - FAUXCLICKY_TIMER_PERIOD = (uint16_t)(((float)F_CPU) / (note[0] * FAUXCLICKY_CPU_PRESCALER)); - FAUXCLICKY_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (note[0] * FAUXCLICKY_CPU_PRESCALER)) / 2); + FAUXCLICKY_TIMER_PERIOD = (uint16_t)(((float)F_CPU) / (note[0] * (float)FAUXCLICKY_CPU_PRESCALER)); + FAUXCLICKY_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (note[0] * (float)FAUXCLICKY_CPU_PRESCALER)) / (float)2); note_playing = true; - note_period = (note[1] / 16) * (60 / (float)FAUXCLICKY_TEMPO) * 100; // check this + note_period = (note[1] / (float)16) * ((float)60 / (float)FAUXCLICKY_TEMPO) * 1000; note_start = timer_read(); FAUXCLICKY_ENABLE_OUTPUT; } |