fw: pitch shifting works e2e polyvec :)

apfaudio · Dec 13, 2023 · 1691bb5 · 1691bb5
1 parent f0e1c38
commit 1691bb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/firmware/polyvec-lib/src/voice.rs b/firmware/polyvec-lib/src/voice.rs
@@ -29,7 +29,7 @@ pub struct Voice {
     pub note: u8,
     pub start_time_ms: u32,
     pub state: VoiceState,
-    pub pitch: i16,
+    pub pitch: f32,
     pub amplitude: f32,
     pub velocity: u8,
     pub adsr: Option<AdsrParams>,
@@ -75,9 +75,9 @@ impl VoiceManager {
     }
 }
 
-pub fn note_to_pitch(note: u8) -> i16 {
+pub fn note_to_pitch(note: u8) -> f32 {
     let scale = 2.0f32.powf(((note as i16) - 60) as f32 / 12.0f32);
-    ((1.0f32 - scale) * 32768.0f32) as i16
+    1.0f32 - scale
 }
 
 

diff --git a/firmware/polyvec/src/main.rs b/firmware/polyvec/src/main.rs
@@ -267,7 +267,6 @@ impl State {
             }
         } else {
         */
-        /*
             let pmod1 = &peripherals.EURORACK_PMOD1;
             let pmod2 = &peripherals.EURORACK_PMOD2;
             let pmod3 = &peripherals.EURORACK_PMOD3;
@@ -302,8 +301,7 @@ impl State {
             let mut update_hw_voice = |n_voice: usize, midi_note: u8, touch_raw: u8| {
                 let ampl = (touch_raw as f32) / 256.0f32;
                 let pitch = note_to_pitch(midi_note);
-                //shifter[n_voice].set_pitch(pitch);
-                shifter[n_voice].set_pitch(FixedI32::<U16>::from_num(0.0f32));
+                shifter[n_voice].set_pitch(FixedI32::<U16>::from_num(pitch));
 
                 // Low-pass filter to smooth touch on/off
                 let ampl_old: f32 = lpf[n_voice].cutoff().to_num();
@@ -353,8 +351,6 @@ impl State {
                     update_hw_voice(n_voice, voices_old[n_voice].note, 0);
                 }
             }
-
-            */
             /*
         }
             */