Merge upstream QMK Firmware at '0.12.52~1'

1 files changed, 20 insertions, 0 deletions

diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index abafa2b404..7bd26b461f 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -1,4 +1,5 @@
 /* Copyright 2016 Jack Humbert
+ * Copyright 2020 JohSchneider
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +30,7 @@ float voice_envelope(float frequency);
 typedef enum {
     default_voice,
 #ifdef AUDIO_VOICES
+    vibrating,
     something,
     drums,
     butts_fader,
@@ -48,3 +50,21 @@ typedef enum {
 void set_voice(voice_type v);
 void voice_iterate(void);
 void voice_deiterate(void);
+
+// Vibrato functions
+void voice_set_vibrato_rate(float rate);
+void voice_increase_vibrato_rate(float change);
+void voice_decrease_vibrato_rate(float change);
+void voice_set_vibrato_strength(float strength);
+void voice_increase_vibrato_strength(float change);
+void voice_decrease_vibrato_strength(float change);
+
+// Timbre functions
+/**
+ * @brief set the global timbre for tones to be played
+ * @note: only applies to pwm implementations - where it adjusts the duty-cycle
+ * @note: using any instrument from voices.[ch] other than 'default' may override the set value
+ * @param[in]: timbre: valid range is (0,100)
+ */
+void    voice_set_timbre(uint8_t timbre);
+uint8_t voice_get_timbre(void);