From 1408a238b52ced134dfa8354b6142c3427cca27b Mon Sep 17 00:00:00 2001 From: chriskiefer Date: Thu, 30 Oct 2025 20:35:28 +0000 Subject: [PATCH] activations --- MEMLNaut-PAF-CARL.ino | 12 ++++++------ PAFSynthAudioApp.hpp | 16 ++++++++-------- src/memllib | 2 +- src/memlp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/MEMLNaut-PAF-CARL.ino b/MEMLNaut-PAF-CARL.ino index c95f9e3..e44dfed 100644 --- a/MEMLNaut-PAF-CARL.ino +++ b/MEMLNaut-PAF-CARL.ino @@ -283,12 +283,12 @@ void loop1() { midi_interf->Poll(); , 10000) -#if 1 //test ARP - PERIODIC_RUN_US( - static size_t arpCount=0; - static size_t noteIndex=30; +// #if 1 //test ARP +// PERIODIC_RUN_US( +// static size_t arpCount=0; +// static size_t noteIndex=30; - , 100000) -#endif +// , 100000) +// #endif } diff --git a/PAFSynthAudioApp.hpp b/PAFSynthAudioApp.hpp index c20a231..fed745e 100644 --- a/PAFSynthAudioApp.hpp +++ b/PAFSynthAudioApp.hpp @@ -18,8 +18,8 @@ // #define ARPEGGIATOR -// template -template +template +// template class PAFSynthAudioApp : public AudioAppBase { public: @@ -206,7 +206,7 @@ public: currentVoiceSpace = voiceSpaces[2].mappingFunction; #endif - auto voiceSpaceTest = [this](const std::array& params) { + auto voiceSpaceSingle1 = [this](const std::array& params) { p0Gain=1.f; p1Gain=0.f; p2Gain=0.f; @@ -242,11 +242,11 @@ public: // euclidN = static_cast(2 + (params[19] * 5)); dlfb = 0.f; - env.setup(1.f,100.f,0.3f, 200.f, sampleRatef ); + env.setup(params[1] * 20.f , params[2] * 200.f, params[3] * 0.4f, params[4] * 300.f, sampleRatef ); - sineShapeGain = 0.f; + sineShapeGain = params[5] * params[5] * 0.2f; sineShapeASym = 0.f; - sineShapeMix = 0.f; + sineShapeMix = params[6] * 0.3f; rmGain = 0.f; feedbackGain = 0.0f; @@ -255,7 +255,7 @@ public: fbSmoothAlpha=0.f; }; - voiceSpaces[0] = {"test", voiceSpaceTest}; + voiceSpaces[0] = {"test", voiceSpaceSingle1}; currentVoiceSpace = voiceSpaces[0].mappingFunction; @@ -343,7 +343,7 @@ public: // } #endif float envval = env.play(); - // y = y * envval; + y = y * envval; // #ifndef ARPEGGIATOR // y *= noteVel; diff --git a/src/memllib b/src/memllib index e207eeb..9d36f7c 160000 --- a/src/memllib +++ b/src/memllib @@ -1 +1 @@ -Subproject commit e207eebb2df4aa065c808404dd1019d520494899 +Subproject commit 9d36f7ce8f6b4704c7be3ba7e7abc1e397587b0f diff --git a/src/memlp b/src/memlp index 8dc59a6..c4a4384 160000 --- a/src/memlp +++ b/src/memlp @@ -1 +1 @@ -Subproject commit 8dc59a6003c932d7d095df2b225e2bc7bcda8179 +Subproject commit c4a43845eac20d4c031c8d92060fdff1b8afa060