paf upgrades

MEMLNaut-PAF-CARL.ino

@@ -52,7 +52,12 @@ constexpr size_t kN_InputParams = 3;
 
 // Add these macros near other globals
 #define MEMORY_BARRIER() __sync_synchronize()
-#define WRITE_VOLATILE(var, val) do { MEMORY_BARRIER(); (var) = (val); MEMORY_BARRIER(); } while (0)
+#define WRITE_VOLATILE(var, val) \
+  do { \
+    MEMORY_BARRIER(); \
+    (var) = (val); \
+    MEMORY_BARRIER(); \
+  } while (0)
 #define READ_VOLATILE(var) ({ MEMORY_BARRIER(); typeof(var) __temp = (var); MEMORY_BARRIER(); __temp; })
 
 
@@ -62,12 +67,10 @@ constexpr size_t kN_InputParams = 3;
 //     return true;
 // }
 
-void setup()
+void setup() {
-{
   set_sys_clock_khz(AudioDriver::GetSysClockSpeed(), true);
 
-    bus_ctrl_hw->priority = BUSCTRL_BUS_PRIORITY_DMA_W_BITS |
+  bus_ctrl_hw->priority = BUSCTRL_BUS_PRIORITY_DMA_W_BITS | BUSCTRL_BUS_PRIORITY_DMA_R_BITS | BUSCTRL_BUS_PRIORITY_PROC1_BITS;
-        BUSCTRL_BUS_PRIORITY_DMA_R_BITS | BUSCTRL_BUS_PRIORITY_PROC1_BITS;
 
   uint32_t seed = get_rosc_entropy_seed(32);
   srand(seed);
@@ -104,6 +107,9 @@ void setup()
       if (noteon) {
         uint8_t midimsg[2] = { note_number, vel_value };
         queue_try_add(&audio_app->qMIDINoteOn, &midimsg);
+      }else{
+        uint8_t midimsg[2] = { note_number, vel_value };
+        queue_try_add(&audio_app->qMIDINoteOff, &midimsg);
       }
       Serial.printf("MIDI Note %d: %d\n", note_number, vel_value);
     });
@@ -135,13 +141,11 @@ void setup()
   MEMLNaut::Instance()->addSystemInfoView();
 
   Serial.println("Finished initialising core 0.");
-
 }
 
 PERF_DECLARE(MLSTATS);
 
-void loop()
+void loop() {
-{
 
   PERIODIC_RUN_US(
     PERF_BEGIN(MLSTATS);
@@ -149,8 +153,9 @@ void loop()
     PERF_END(MLSTATS);
     , 5000)
 
-    static int AUDIO_MEM blip_counter = 0;
+  PERIODIC_RUN_US(
-    if (blip_counter++ > 100) {
+    static size_t blip_counter=0;
+    if (blip_counter++ > 10) {
       blip_counter = 0;
       Serial.println(".");
       // Blink LED
@@ -161,19 +166,22 @@ void loop()
       // Un-blink LED
       digitalWrite(33, LOW);
     }
+    , 100000)
+
+  PERIODIC_RUN_US(
     midi_interf->Poll();
-    // delay(10); // Add a small delay to avoid flooding the serial output
+    , 10000)
 }
 
 
-void AUDIO_FUNC(audio_block_callback)(float in[][kBufferSize], float out[][kBufferSize], size_t n_channels, size_t n_frames)
+void AUDIO_FUNC(audio_block_callback)(float in[][kBufferSize], float out[][kBufferSize], size_t n_channels, size_t n_frames) {
-{
   for (size_t i = 0; i < n_frames; ++i) {
 
     stereosample_t x{
       in[0][i],
       in[1][i]
-        }, y;
+    },
+      y;
 
     // Audio processing
     if (audio_app) {
@@ -186,8 +194,7 @@ void AUDIO_FUNC(audio_block_callback)(float in[][kBufferSize], float out[][kBuff
 }
 
 
-void setup1()
+void setup1() {
-{
   while (!READ_VOLATILE(serial_ready)) {
     MEMORY_BARRIER();
     delay(1);
@@ -205,7 +212,9 @@ void setup1()
     audio_raw->Setup(AudioDriver::GetSampleRate(), interface);
 
     // shared_ptr with custom deleter calling only the destructor (control block still allocates)
-        auto audio_deleter = [](PAFSynthAudioApp<>* p) { if (p) p->~PAFSynthAudioApp<>(); };
+    auto audio_deleter = [](PAFSynthAudioApp<>* p) {
+      if (p) p->~PAFSynthAudioApp<>();
+    };
     std::shared_ptr<PAFSynthAudioApp<>> temp_audio_app(audio_raw, audio_deleter);
 
     MEMORY_BARRIER();
@@ -228,10 +237,8 @@ void setup1()
   Serial.println("Finished initialising core 1.");
 }
 
-void loop1()
+void loop1() {
-{
   // Audio app parameter processing loop
   audio_app->loop();
   delay(1);
 }
-

PAFSynthAudioApp.hpp

@@ -6,17 +6,98 @@
 
 #include <cstddef>
 #include <cstdint>
-// #include <vector>
 #include <memory> // Added for std::shared_ptr
 
 #include "src/memllib/synth/maxiPAF.hpp"
 #include "src/memllib/interface/InterfaceBase.hpp" // Added missing include
 
 
-#define ARPEGGIATOR
+// #define ARPEGGIATOR
+class ADSRLite {
+    public:
     
+    enum envStage{WAITTOTRIG, ATTACK, DECAY, SUSTAIN, RELEASE};
 
-template<size_t NPARAMS=21>
+    void setup(float attackTimeMs, float decayTimeMs, float newSustainLevel, float releaseTimeMs) {
+        attackIncFull = 1.f/((attackTimeMs / 1000.f) * kSampleRate);
+        attackInc = attackIncFull;
+        decayInc = 1.f/((decayTimeMs / 1000.f) * kSampleRate);
+        sustainLevel = newSustainLevel;
+        decayInc *= (1.f - sustainLevel);
+        releaseMs = releaseTimeMs;
+    }
+
+    float play() {
+
+        switch(stage) {
+            case envStage::WAITTOTRIG:
+            {
+                envelopeValue = 0.f;
+                break;
+            }
+            case envStage::ATTACK:
+            {
+                envelopeValue += attackInc;
+                if (envelopeValue >= 1.f) {
+                    stage = envStage::DECAY;
+                    Serial.printf("decay %f\n", envelopeValue);
+                }
+                break;
+            }
+            case envStage::DECAY:
+            {
+                envelopeValue -= decayInc;
+                if (envelopeValue<=sustainLevel) {
+                    stage = envStage::SUSTAIN;
+                    Serial.printf("sus %f\n", envelopeValue);
+                }
+                break;
+            }
+            case envStage::SUSTAIN:
+            {
+                // envelopeValue = sustainLevel;
+                break;
+            }
+            case envStage::RELEASE:
+            {
+                envelopeValue -= relInc;
+                if (envelopeValue <= 0.f) {
+                    stage = envStage::WAITTOTRIG;
+                    Serial.println("wait");
+                    envelopeValue=0.f;
+                }
+                break;
+            }
+        }
+        return envelopeValue * velocity;
+    }
+
+    void reset() {
+        stage = envStage::WAITTOTRIG;
+        envelopeValue=0;
+
+    }
+
+    void trigger(float vel) {
+        stage = envStage::ATTACK;
+        attackInc = attackIncFull * (1.f - envelopeValue);
+        velocity = vel;
+    }
+
+    void release() {
+        relInc = 1.f/((releaseMs / 1000.f) * kSampleRate);
+        relInc *= envelopeValue;
+        stage = envStage::RELEASE;
+    }
+
+private:
+    envStage stage = envStage::WAITTOTRIG;
+    float attackInc=0, attackIncFull=0, decayInc=0, sustainLevel=0,relInc=0, releaseMs;
+    float envelopeValue=0;
+    float velocity = 1.f;
+};
+
+template<size_t NPARAMS=33>
 class PAFSynthAudioApp : public AudioAppBase<NPARAMS>
 {
 public:
@@ -49,17 +130,38 @@ public:
         // const float trig = pulse.square(1);
 
         paf0.play(x1, 1, baseFreq, baseFreq + (paf0_cf * baseFreq), paf0_bw * baseFreq, paf0_vib, paf0_vfr, paf0_shift, 0);
-        float y = x1[0];
+        float p0 = *x1;
 
         const float freq1 = baseFreq * detune;
 
         paf1.play(x1, 1, freq1, freq1 + (paf1_cf * freq1), paf1_bw * freq1, paf1_vib, paf1_vfr, paf1_shift, 1);
-        y += x1[0];
+        const float p1 = *x1;
 
         const float freq2 = freq1 * detune;
 
         paf2.play(x1, 1, freq2, freq2 + (paf2_cf * freq2), paf2_bw * freq2, paf2_vib, paf2_vfr, paf2_shift, 1);
-        y += x1[0];
+        const float p2 = *x1;
+
+        const float freq3 = freq2 * detune;
+
+        paf3.play(x1, 1, freq3, freq3 + (paf3_cf * freq3), paf3_bw * freq3, paf3_vib, paf3_vfr, paf3_shift, 1);
+        const float p3 = *x1;
+
+        auto shapedSine = [](float phasor, float gain, float asym) -> float {
+            // This function shapes the sine wave to create a foldback effect
+            float x = sinf(phasor * TWOPI);
+            x = sinf(((x * TWOPI) * gain) + asym);
+            return x;
+        };
+
+        float y = p0; //+ p1 + p2 + p3;
+    
+        // float rm = p0 * p1 * p2 * p3;
+
+        // y = y + (rm * rmGain);
+
+        y = y + (shapedSine(y, sineShapeGain, sineShapeGain) * sineShapeMix);
+
 
     #ifdef ARPEGGIATOR
         const float ph = phasorOsc.phasor(1);
@@ -90,13 +192,15 @@ public:
             }
         }
     #endif
-        y = y * envamp* envamp;
+        float envval = env.play();
+        y = y * envval;
+        // y = y * envamp* envamp;
 
     #ifndef ARPEGGIATOR
         y *= noteVel;
     #endif
 
-        float d1 = (dl1.play(y, 3500, 0.8f) * dl1mix);
+        float d1 = (dl1.play(y, 100, 0.8f) * dl1mix);
         // float d2 = (dl2.play(y, 15000, 0.8f) * dl2mix);
         y = y + d1;// + d2;
         stereosample_t ret { y, y };
@@ -132,27 +236,26 @@ public:
 
         paf2.init();
         paf2.setsr(maxiSettings::getSampleRate(), 1);
-        // paf2.freq(190, 0);
-        // // paf2.amp(1,0);
-        // paf2.bw(500,0);
-        // paf2.cf(210,0);
-        // paf2.vfr(5,0);
-        // paf2.vib(0.1,0);
-        // paf2.shift(6,0);
 
-        env.setupAR(10,100);
+        paf3.init();
+        paf3.setsr(maxiSettings::getSampleRate(), 1);
+
+        // env.setupAR(10,100);
         arpFreq = frequencies[0];
         // line.prepare(1.f,0.f,100.f,false);
         // line.triggerEnable(true);
         envamp=1.f;
 
+        env.setup(500,500,0.8,1000);
+
         queue_init(&qMIDINoteOn, sizeof(uint8_t)*2, 1);
+        queue_init(&qMIDINoteOff, sizeof(uint8_t)*2, 1);
 
     }
 
     inline float mtof(uint8_t note) {
         // Convert MIDI note to frequency
-        return 440.0f * powf(2.0f, (note - 69) / 12.0f);
+        return 440.0f * exp2f((note - 69) / 12.0f);
     }
 
     void loop() override {
@@ -163,6 +266,12 @@ public:
             noteVel = midimsg[1] / 127.0f; // Normalize velocity to [0, 1]
             noteVel = noteVel * noteVel; // Square the velocity for more pronounced effect
             newNote = true;
+            env.trigger(noteVel);
+        }
+        if (firstParamsReceived && queue_try_remove(&qMIDINoteOff, &midimsg)) {
+            // Serial.printf("PAFSynthAudioApp::ProcessParams - Received MIDI Note On: %d, Velocity: %d\n", midimsg[0], midimsg[1]);
+            env.release();
+            Serial.println("release");
         }
         AudioAppBase<NPARAMS>::loop();
     }
@@ -179,28 +288,33 @@ public:
         // paf0_cf = arpFreq + (params[2] * params[2] * arpFreq * 1.f);
         // paf1_cf = arpFreq + (params[3] * params[3] * arpFreq * 1.f);
         // paf2_cf = arpFreq + (params[4] * params[4] * arpFreq * 1.f);
-        paf0_cf = (params[2] * params[2]  * 1.f);
+        paf0_cf = (params[2] * params[2]  * 0.1f);
         paf1_cf = (params[3] * params[3]  * 1.f);
         paf2_cf = (params[4] * params[4]  * 1.f);
+        paf3_cf = (params[21] * params[21]  * 1.f);
 
         // paf0_bw = 5.f + (params[5] * arpFreq * 0.5f);
         // paf1_bw = 5.f + (params[6] * arpFreq * 0.5f);
         // paf2_bw = 5.f + (params[7] * arpFreq * 0.5f);
-        paf0_bw = 0.1f + (params[5] * 2.f);
+        paf0_bw = 0.1f + (params[5] * 0.2f);
         paf1_bw = 0.1f + (params[6] * 2.f);
         paf2_bw = 0.1f + (params[7] * 2.f);
+        paf3_bw = 0.1f + (params[22] * 2.f);
 
-        paf0_vib = (params[8] * params[8] * 0.99f);
+        paf0_vib = (params[8] * params[8] * 0.1f);
         paf1_vib = (params[9] * params[9] * 0.99f);
         paf2_vib = (params[10] * params[10] * 0.99f);
+        paf3_vib = (params[23] * params[23] * 0.99f);
 
-        paf0_vfr = (params[11] * params[11]* 10.f);
+        paf0_vfr = (params[11] * params[11]* 0.1f);
         paf1_vfr = (params[12] * params[12] * 10.f);
         paf2_vfr = (params[13] * params[13] * 10.f);
+        paf3_vfr = (params[24] * params[24] * 10.f);
 
-        paf0_shift = (params[14] * 1000.f);
+        paf0_shift = (params[14] * 10.f);
         paf1_shift = (params[15] * 1000.f);
         paf2_shift = (params[16] * 1000.f);
+        paf3_shift = (params[25] * 1000.f);
 
         dl1mix = params[17] * params[17] * 0.4f;
         // dl2mix = params[18] * params[18] * 0.4f;
@@ -208,9 +322,15 @@ public:
 
         euclidN = static_cast<size_t>(2 + (params[19] * 5));
 
-        envdec=((params[20] * 3.f) + 0.1f)/9000.f; // Decay rate for the envelope
+        // envdec=((params[20] * 1.f) + 0.01f)/9000.f; // Decay rate for the envelope
+        env.setup(params[30] * 200.f,params[20] * params[20] * 500.f, params[31] * 0.5f, params[32] * 500.f );
 
+        sineShapeGain = params[26] * params[26];
+        sineShapeASym = params[27] * params[27] * 0.1f;
+        sineShapeMix = params[28];
 
+        rmGain = params[29] * params[29];
+        // sineShapeMixInv = 1.f-sineShapeMix;
         // Serial.printf("%f %f %f %f %f\n", paf0_cf,  paf0_bw, paf0_vib, paf0_vfr, paf0_shift);
     }
 
@@ -221,43 +341,57 @@ protected:
     maxiPAFOperator paf0;
     maxiPAFOperator paf1;
     maxiPAFOperator paf2;
+    maxiPAFOperator paf3;
 
     maxiDelayline<5000> dl1;
     maxiDelayline<15100> dl2;
 
     maxiOsc pulse;
-    maxiEnvGen env;
+    // maxiEnvGen env;
 
+    ADSRLite env;
 
     float frame=0;
 
     float paf0_freq = 100;
     float paf1_freq = 100;
     float paf2_freq = 50;
+    float paf3_freq = 50;
 
     float paf0_cf = 200;
     float paf1_cf = 250;
     float paf2_cf = 250;
+    float paf3_cf = 250;
 
     float paf0_bw = 100;
     float paf1_bw = 5000;
     float paf2_bw = 5000;
+    float paf3_bw = 5000;
 
     float paf0_vib = 0;
     float paf1_vib = 1;
     float paf2_vib = 1;
+    float paf3_vib = 1;
 
     float paf0_vfr = 2;
     float paf1_vfr = 2;
     float paf2_vfr = 2;
+    float paf3_vfr = 2;
 
     float paf0_shift = 0;
     float paf1_shift = 0;
     float paf2_shift = 0;
+    float paf3_shift = 0;
 
     float dl1mix = 0.0f;
     float dl2mix = 0.0f;
 
+    float rmGain = 0.f;
+    
+    float sineShapeGain=0.1;
+    float sineShapeASym = 0.f;
+    float sineShapeMix = 0.f;
+    float sineShapeMixInv = 1.f;
     size_t counter=0;
     size_t freqIndex = 0;
     size_t freqOffset = 0;

src/memllib

@@ -1 +1 @@
-Subproject commit d9fe679e77acffc156d3a91b0c51b16df38f6d0d
+Subproject commit 66279fdfeaf3f454419d3f1f0ee022b065757bcd