Merge branch 'master' into feature/combos
This commit is contained in:
commit
6a462c818c
71 changed files with 8131 additions and 2038 deletions
|
@ -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) {
|
||||
|
|
|
@ -11,6 +11,7 @@ float voice_envelope(float frequency);
|
|||
|
||||
typedef enum {
|
||||
default_voice,
|
||||
something,
|
||||
butts_fader,
|
||||
octave_crunch,
|
||||
duty_osc,
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include "process_music.h"
|
||||
|
||||
bool music_activated = false;
|
||||
uint8_t starting_note = 0x0C;
|
||||
int offset = 7;
|
||||
uint8_t music_starting_note = 0x0C;
|
||||
int music_offset = 7;
|
||||
|
||||
// music sequencer
|
||||
static bool music_sequence_recording = false;
|
||||
|
@ -115,7 +115,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
|
|||
return false;
|
||||
}
|
||||
|
||||
float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row));
|
||||
float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + SCALE[record->event.key.col + music_offset])/12.0+(MATRIX_ROWS - record->event.key.row));
|
||||
if (record->event.pressed) {
|
||||
play_note(freq, 0xF);
|
||||
if (music_sequence_recording) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue