From 11312bba8d76cdb16589664815a0da7a5f0b1577 Mon Sep 17 00:00:00 2001 From: jatin Date: Wed, 5 Jul 2023 23:38:33 -0700 Subject: [PATCH] Fuzz Machine CPU tweaks --- .clang-tidy | 1 - src/processors/drive/fuzz_machine/FuzzFaceNDK.cpp | 9 ++++++--- src/processors/drive/fuzz_machine/FuzzFaceNDK.h | 2 ++ src/processors/drive/fuzz_machine/FuzzMachine.cpp | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 4380277a..3b751903 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -73,7 +73,6 @@ modernize-avoid-bind, modernize-concat-nested-namespaces, modernize-deprecated-headers, modernize-deprecated-ios-base-aliases, -modernize-loop-convert, modernize-make-shared, modernize-make-unique, modernize-raw-string-literal, diff --git a/src/processors/drive/fuzz_machine/FuzzFaceNDK.cpp b/src/processors/drive/fuzz_machine/FuzzFaceNDK.cpp index cd4dba5f..8bd5e0c9 100644 --- a/src/processors/drive/fuzz_machine/FuzzFaceNDK.cpp +++ b/src/processors/drive/fuzz_machine/FuzzFaceNDK.cpp @@ -34,7 +34,10 @@ void FuzzFaceNDK::reset_state() { x_n[ch].setZero(); v_n[ch].setZero(); -// v_n[ch] = Eigen::Vector { 1.43236, 1.77569, -0.636511, 0.021566 }; +// v_n[ch] = Eigen::Vector { 0.00079512734663310196, +// 0.086036015040678246, +// 6.9641953425394627, +// 6.9946688952593483 }; } } @@ -199,9 +202,9 @@ void FuzzFaceNDK::process (std::span channel_data, size_t ch) noexcept F_min.noalias() = p_n + K_mat * i_n - v_n[ch]; A_solve.noalias() = K_mat * Jac - eye; delta_v.noalias() = A_solve.householderQr().solve (F_min); - v_n[ch] -= delta_v * 0.25; + v_n[ch] -= delta_v * 0.5; delta = delta_v.array().abs().sum(); - } while (delta > 1.0e-2 && ++nIters < 8); + } while (delta > 1.0e-2 && ++nIters < 3); calc_currents(); y_n.noalias() = D_mat * x_n[ch] + E_mat_var * u_n_var + E_u_fix + F_mat * i_n; diff --git a/src/processors/drive/fuzz_machine/FuzzFaceNDK.h b/src/processors/drive/fuzz_machine/FuzzFaceNDK.h index 37974c6f..527f7c4d 100644 --- a/src/processors/drive/fuzz_machine/FuzzFaceNDK.h +++ b/src/processors/drive/fuzz_machine/FuzzFaceNDK.h @@ -12,6 +12,8 @@ #include // END USER INCLUDES + + struct FuzzFaceNDK { // START USER ENTRIES diff --git a/src/processors/drive/fuzz_machine/FuzzMachine.cpp b/src/processors/drive/fuzz_machine/FuzzMachine.cpp index 4859251b..52434155 100644 --- a/src/processors/drive/fuzz_machine/FuzzMachine.cpp +++ b/src/processors/drive/fuzz_machine/FuzzMachine.cpp @@ -27,7 +27,7 @@ ParamLayout FuzzMachine::createParameterLayout() createPercentParameter (params, "fuzz", "Fuzz", 1.0f); createPercentParameter (params, "bias", "Bias", 1.0f); - createPercentParameter (params, "vol", "Volume", 0.5f); + createPercentParameter (params, "vol", "Volume", 1.0f); return { params.begin(), params.end() }; } @@ -118,7 +118,7 @@ void FuzzMachine::processAudio (AudioBuffer& buffer) dcBlocker.processBlock (buffer); - volume.setGainLinear (volumeParam->getCurrentValue() * 80.0f); + volume.setGainLinear (volumeParam->getCurrentValue() * 100.0f); volume.process (buffer); for (auto [ch, data] : chowdsp::buffer_iters::channels (buffer))