xy view, graphs in rl stats

MEMLNaut-PAF-CARL.ino

@@ -8,6 +8,8 @@
 #include "hardware/structs/bus_ctrl.h"
 #include "PAFSynthAudioApp.hpp"
 #include "src/memllib/examples/InterfaceRL.hpp"
+#include "src/memllib/hardware/memlnaut/display/XYPadView.hpp"  
+#include "src/memllib/hardware/memlnaut/display/MessageView.hpp"
 
 
 #define INTERFACE_TYPE InterfaceRL
@@ -126,6 +128,40 @@ void setup() {
     delay(1);
   }
 
+  std::shared_ptr<XYPadView> noteTrigView = std::make_shared<XYPadView>("Play", TFT_SILVER);
+
+  // Cache MIDI notes being echoed
+  static bool is_playing_note = false;
+  static uint8_t last_note_number = 0;
+
+  noteTrigView->SetOnTouchCallback([](float x, float y) {
+      Serial.printf("Note trigger at: %.2f, %.2f\n", x, y);
+      if (audio_app) {
+          // If a note is already playing, stop it
+          if (is_playing_note) {
+              midi_interf->sendNoteOff(last_note_number, 0);
+              is_playing_note = false;
+          }
+          int noteVel = static_cast<uint8_t>(powf(y * (1.f/127.f), 0.5f) * 127.f);
+          uint8_t midimsg[2] = {static_cast<uint8_t>(x * 127.f), noteVel};
+          queue_try_add(&audio_app->qMIDINoteOn, &midimsg);
+          midi_interf->sendNoteOn(midimsg[0], midimsg[1]);
+          last_note_number = midimsg[0];
+          is_playing_note = true; // Set flag to indicate a note is playing
+      }
+  });
+  noteTrigView->SetOnTouchReleaseCallback([](float x, float y) {
+      Serial.printf("Note release at: %.2f, %.2f\n", x, y);
+      if (audio_app) {
+          uint8_t midimsg[2] = {last_note_number,0};
+          queue_try_add(&audio_app->qMIDINoteOff, &midimsg);
+          midi_interf->sendNoteOff(last_note_number, 0);
+          is_playing_note = false; // Reset flag when note is released
+      }
+  });
+
+  MEMLNaut::Instance()->disp->AddView(noteTrigView);
+
   std::shared_ptr<MessageView> helpView = std::make_shared<MessageView>("Help");
   helpView->post("PAF synth CARL");
   helpView->post("TA: Down: Forget replay memory");

PAFSynthAudioApp.hpp

@@ -11,6 +11,8 @@
 #include "src/memllib/synth/maxiPAF.hpp"
 #include "src/memllib/interface/InterfaceBase.hpp" // Added missing include
 
+#include <span>
+
 
 // #define ARPEGGIATOR
 class ADSRLite {
@@ -104,9 +106,115 @@ public:
     static constexpr size_t kN_Params = NPARAMS;
     static constexpr size_t nFREQs = 17;
     static constexpr float frequencies[nFREQs] = {100, 200, 400,800, 400, 800, 100,1600,100,400,100,50,1600,200,100,800,400};
+    
 
+    using VoiceSpaceFn = std::function<void(const std::array<float, NPARAMS>&)>;
+    struct VoiceSpace {
+        char name[16]="default";
+        VoiceSpaceFn mappingFunction = nullptr;
+    };
+
+    std::array<VoiceSpace, 2> voiceSpaces;
+    
+    VoiceSpaceFn currentVoiceSpace;
 
     PAFSynthAudioApp() : AudioAppBase<NPARAMS>() {
+
+        auto voiceSpace1 = [this](const std::array<float, NPARAMS>& params) {
+            p0Gain=1.f;
+            p1Gain=0.f;
+            p2Gain=0.f;
+            p3Gain=0.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 = 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.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]* 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] * 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;
+            detune = 1.0f + (params[18] * 0.1);
+
+            // euclidN = static_cast<size_t>(2 + (params[19] * 5));
+            dlfb = params[19] * 0.98f;
+
+            // 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];
+        };  
+
+        auto voiceSpace2 = [this](const std::array<float, NPARAMS>& params) {
+            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 = 0.1f + (params[5] * 2.f);
+            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] * 10.f);
+            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]* 1.0f);
+            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);
+            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;
+            detune = 1.0f + (params[18] * 0.1);
+
+            // euclidN = static_cast<size_t>(2 + (params[19] * 5));
+            dlfb = params[19] * 0.98f;
+
+            // 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];
+        };     
+
+        voiceSpaces[0] = {"default", voiceSpace1};
+        voiceSpaces[1] = {"bright", voiceSpace2};
+
+        currentVoiceSpace = voiceSpaces[0].mappingFunction;   
     };
 
     bool __force_inline euclidean(float phase, const size_t n, const size_t k, const size_t offset, const float pulseWidth)
@@ -130,22 +238,22 @@ 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 p0 = *x1;
+        float p0 = *x1 * p0Gain;
 
         const float freq1 = baseFreq * detune;
 
         paf1.play(x1, 1, freq1, freq1 + (paf1_cf * freq1), paf1_bw * freq1, paf1_vib, paf1_vfr, paf1_shift, 1);
-        const float p1 = *x1;
+        const float p1 = *x1 * p1Gain;
 
         const float freq2 = freq1 * detune;
 
         paf2.play(x1, 1, freq2, freq2 + (paf2_cf * freq2), paf2_bw * freq2, paf2_vib, paf2_vfr, paf2_shift, 1);
-        const float p2 = *x1;
+        const float p2 = *x1 * p2Gain;
 
         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;
+        const float p3 = *x1 * p3Gain;
 
         auto shapedSine = [](float phasor, float gain, float asym) -> float {
             // This function shapes the sine wave to create a foldback effect
@@ -154,7 +262,7 @@ public:
             return x;
         };
 
-        float y = p0; //+ p1 + p2 + p3;
+        float y = p0 + p1 + p2 + p3;
     
         // float rm = p0 * p1 * p2 * p3;
 
@@ -164,33 +272,33 @@ public:
 
 
     #ifdef ARPEGGIATOR
-        const float ph = phasorOsc.phasor(1);
+        // const float ph = phasorOsc.phasor(1);
-        const bool euclidNewNote = euclidean(ph, 12, euclidN, 0, 0.1f);
+        // const bool euclidNewNote = euclidean(ph, 12, euclidN, 0, 0.1f);
-        if(zxdetect.onZX(euclidNewNote)) {
+        // if(zxdetect.onZX(euclidNewNote)) {
-            envamp=0.8f;
+        //     envamp=0.8f;
-            freqIndex++;
+        //     freqIndex++;
-            if(freqIndex >= nFREQs) {
+        //     if(freqIndex >= nFREQs) {
-                freqIndex = 0;
+        //         freqIndex = 0;
-            }
+        //     }
-            baseFreq = frequencies[freqIndex];
+        //     baseFreq = frequencies[freqIndex];
-    }else{
+        // }else{
-            // constexpr float envdec = 0.2f/9000.f;
+        //     // constexpr float envdec = 0.2f/9000.f;
-            envamp -= envdec;
+        //     envamp -= envdec;
-            if (envamp < 0.f) {
+        //     if (envamp < 0.f) {
-                envamp = 0.f;
+        //         envamp = 0.f;
-            }
+        //     }
-        }
+        // }
     #else
-        if(newNote) {
+        // if(newNote) {
-            newNote = false;
+        //     newNote = false;
-            envamp=0.8f;
+        //     envamp=0.8f;
-    }else{
+        // }else{
-            // constexpr float envdec = 0.2f/9000.f;
+        //     // constexpr float envdec = 0.2f/9000.f;
-            envamp -= envdec;
+        //     envamp -= envdec;
-            if (envamp < 0.f) {
+        //     if (envamp < 0.f) {
-                envamp = 0.f;
+        //         envamp = 0.f;
-            }
+        //     }
-        }
+        // }
     #endif
         float envval = env.play();
         y = y * envval;
@@ -200,8 +308,7 @@ public:
         y *= noteVel;
     #endif
 
-        float d1 = (dl1.play(y, 100, 0.8f) * dl1mix);
+        float d1 = (dl1.play(y, 100, dlfb) * dl1mix);
-        // float d2 = (dl2.play(y, 15000, 0.8f) * dl2mix);
         y = y + d1;// + d2;
         stereosample_t ret { y, y };
         frame++;
@@ -216,23 +323,9 @@ public:
 
         paf0.init();
         paf0.setsr(maxiSettings::getSampleRate(), 1);
-        // paf0.freq(100, 0);
-        // // paf0.amp(1,0);
-        // paf0.bw(200,0);
-        // paf0.cf(210,0);
-        // paf0.vfr(5,0);
-        // paf0.vib(0.1,0);
-        // paf0.shift(10,0);
 
         paf1.init();
         paf1.setsr(maxiSettings::getSampleRate(), 1);
-        // paf1.freq(150, 0);
-        // // paf1.amp(1,0);
-        // paf1.bw(200,0);
-        // paf1.cf(210,0);
-        // paf1.vfr(5,0);
-        // paf1.vib(0.1,0);
-        // paf1.shift(10,0);
 
         paf2.init();
         paf2.setsr(maxiSettings::getSampleRate(), 1);
@@ -240,10 +333,7 @@ public:
         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);
@@ -279,59 +369,7 @@ public:
     void ProcessParams(const std::array<float, NPARAMS>& params)
     {
         firstParamsReceived = true;
-        // // Map parameters to the synth
+        currentVoiceSpace(params);
-        // synth_.mapParameters(params);
-        // //Serial.print("Params processed.");
-        // paf0_freq = 50.f + (params[0] * params[0] * 1000.f);
-        // paf1_freq = 50.f + (params[1] * params[1] * 1000.f);
-
-        // 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]  * 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] * 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.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]* 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] * 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;
-        detune = 1.0f + (params[18] * 0.1);
-
-        euclidN = static_cast<size_t>(2 + (params[19] * 5));
-
-        // 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);
     }
 
     queue_t qMIDINoteOn, qMIDINoteOff;
@@ -347,12 +385,13 @@ protected:
     maxiDelayline<15100> dl2;
 
     maxiOsc pulse;
-    // maxiEnvGen env;
 
     ADSRLite env;
 
     float frame=0;
 
+    float p0Gain=1.f, p1Gain = 1.f, p2Gain=1.f, p3Gain=1.f;
+
     float paf0_freq = 100;
     float paf1_freq = 100;
     float paf2_freq = 50;
@@ -385,6 +424,7 @@ protected:
 
     float dl1mix = 0.0f;
     float dl2mix = 0.0f;
+    float dlfb = 0.5f;
 
     float rmGain = 0.f;
     
@@ -414,6 +454,7 @@ protected:
 
     float envdec=0.2f/9000.f; // Decay rate for the envelope
 
+
 };
 
 #endif  // __PAF_SYNTH_AUDIO_APP_HPP__

src/memllib

@@ -1 +1 @@
-Subproject commit 66279fdfeaf3f454419d3f1f0ee022b065757bcd
+Subproject commit 8c562f882fa918c98c5596764d398a1c2a2be502