diff options
| -rw-r--r-- | keyboards/planck/keymaps/default/Makefile | 2 | ||||
| -rw-r--r-- | keyboards/preonic/rules.mk | 6 | ||||
| -rw-r--r-- | quantum/audio/voices.c | 23 | ||||
| -rw-r--r-- | quantum/audio/voices.h | 1 | 
4 files changed, 27 insertions, 5 deletions
| diff --git a/keyboards/planck/keymaps/default/Makefile b/keyboards/planck/keymaps/default/Makefile index 267a087ea9..17487ebbfc 100644 --- a/keyboards/planck/keymaps/default/Makefile +++ b/keyboards/planck/keymaps/default/Makefile @@ -10,7 +10,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)  CONSOLE_ENABLE = no         # Console for debug(+400)  COMMAND_ENABLE = no        # Commands for debug and configuration  NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality +BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality  MIDI_ENABLE = yes            # MIDI controls  AUDIO_ENABLE = yes           # Audio output on port C6  UNICODE_ENABLE = no         # Unicode diff --git a/keyboards/preonic/rules.mk b/keyboards/preonic/rules.mk index c4ce2aacca..071bfdc7fe 100644 --- a/keyboards/preonic/rules.mk +++ b/keyboards/preonic/rules.mk @@ -56,11 +56,11 @@ BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000)  MOUSEKEY_ENABLE ?= no       # Mouse keys(+4700)  EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)  CONSOLE_ENABLE ?= no         # Console for debug(+400) -COMMAND_ENABLE ?= yes        # Commands for debug and configuration +COMMAND_ENABLE ?= no        # Commands for debug and configuration  NKRO_ENABLE ?= no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work  BACKLIGHT_ENABLE ?= yes      # Enable keyboard backlight functionality -MIDI_ENABLE ?= no            # MIDI controls -AUDIO_ENABLE ?= no           # Audio output on port C6 +MIDI_ENABLE ?= yes            # MIDI controls +AUDIO_ENABLE ?= yes           # Audio output on port C6  UNICODE_ENABLE ?= no         # Unicode  BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID  RGBLIGHT_ENABLE ?= no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c index 6d4172a06c..19f7b646ef 100644 --- a/quantum/audio/voices.c +++ b/quantum/audio/voices.c @@ -18,7 +18,7 @@ void voice_iterate() {  }  void voice_deiterate() { -    voice = (voice - 1) % number_of_voices; +    voice = (voice - 1 + number_of_voices) % number_of_voices;  }  float voice_envelope(float frequency) { @@ -31,6 +31,27 @@ float voice_envelope(float frequency) {              polyphony_rate = 0;  	        break; +        case something: +            polyphony_rate = 0; +            switch (compensated_index) { +                case 0 ... 9: +                    note_timbre = TIMBRE_12; +                    break; + +                case 10 ... 19: +                    note_timbre = TIMBRE_25; +                    break; + +                case 20 ... 200: +                    note_timbre = .25 + .125 + pow(((float)compensated_index - 20) / (200 - 20), 2)*.125; +                    break; + +                default: +                    note_timbre = .25; +                    break; +            } +            break; +          case butts_fader:              polyphony_rate = 0;              switch (compensated_index) { diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h index b2495b23b5..b43def3d7d 100644 --- a/quantum/audio/voices.h +++ b/quantum/audio/voices.h @@ -11,6 +11,7 @@ float voice_envelope(float frequency);  typedef enum {      default_voice, +    something,      butts_fader,      octave_crunch,      duty_osc, | 
