From ee353eadfd02f01250b47c5d8c10c0d51b258564 Mon Sep 17 00:00:00 2001
From: Bliblank <pmcgeee03@gmail.com>
Date: Tue, 3 Feb 2026 19:30:33 -0600
Subject: [PATCH] remove param_defaults

---
 src/ConfigInterface.cpp  |  8 ++------
 src/ParameterStore.cpp   | 10 +---------
 src/ParameterStore.h     | 34 ----------------------------------
 src/synth/Oscillator.cpp |  3 +--
 4 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/src/ConfigInterface.cpp b/src/ConfigInterface.cpp
index dc962b8..da134af 100644
--- a/src/ConfigInterface.cpp
+++ b/src/ConfigInterface.cpp
@@ -95,9 +95,6 @@ YAML::Node ConfigInterface::loadProfile(std::string filename) {
         { config["Osc3PitchOffset"][0].as<float>(), config["Osc3PitchOffset"][1].as<float>(), config["Osc3PitchOffset"][2].as<float>() },
     }};
 
-    // TODO: remove this once all the parameters are set properly
-    params_->resetToDefaults();
-
     // set the values in the paramstore
     params_->set(EnvelopeId::Osc1Volume, osc1VolumeProfile[0].def, osc1VolumeProfile[1].def, osc1VolumeProfile[2].def, osc1VolumeProfile[3].def, osc1VolumeProfile[4].def);
     params_->set(EnvelopeId::FilterCutoff, fCutoffProfile[0].def, fCutoffProfile[1].def, fCutoffProfile[2].def, fCutoffProfile[3].def, fCutoffProfile[4].def);
@@ -116,9 +113,8 @@ YAML::Node ConfigInterface::loadProfile(std::string filename) {
     params_->set(ParamId::Osc3SemitoneOffset, osc3PitchOffsets[1].def);
     params_->set(ParamId::Osc3PitchOffset, osc3PitchOffsets[2].def);
 
-    // TODO:
-    // load wavetable settings
-    // load oscillator pitch settings
+    params_->set(ParamId::Osc1WaveSelector1, static_cast<float>(config["OscWaveSelector1"].as<int>()));
+    params_->set(ParamId::Osc1WaveSelector2, static_cast<float>(config["OscWaveSelector2"].as<int>()));
 
     return config;
 
diff --git a/src/ParameterStore.cpp b/src/ParameterStore.cpp
index 3e7d895..d27d1c0 100644
--- a/src/ParameterStore.cpp
+++ b/src/ParameterStore.cpp
@@ -6,7 +6,7 @@
 #include <filesystem>
 
 ParameterStore::ParameterStore() {
-    //resetToDefaults();
+
 }
 
 // set parameter value
@@ -29,11 +29,3 @@ void ParameterStore::set(EnvelopeId id, float depth, float a, float d, float s,
 float ParameterStore::get(ParamId id) const {
     return values_[static_cast<size_t>(id)].load(std::memory_order_relaxed);
 }
-
-void ParameterStore::resetToDefaults() {
-
-    for(size_t i = 0; i < PARAM_COUNT; i++) {
-        values_[i].store(PARAM_DEFS[i].def, std::memory_order_relaxed);
-    }
-
-}
diff --git a/src/ParameterStore.h b/src/ParameterStore.h
index 25b203a..b75ed4f 100644
--- a/src/ParameterStore.h
+++ b/src/ParameterStore.h
@@ -72,39 +72,6 @@ struct ParamDefault {
     float max;
 };
 
-constexpr std::array<ParamDefault, static_cast<size_t>(ParamId::Count)> PARAM_DEFS {{
-    { 100.0f,   20.0f,  600.0f},   // Osc1Freq
-    {   2.0f,    0.0f,    0.0f},   // OscWaveSelector1
-    {   1.0f,    0.0f,    0.0f},   // OscWaveSelector2
-    {   0.0f,   -5.0f,    5.0f},   // MasterOctaveOffset
-    {   0.0f,  -12.0f,   12.0f},   // MasterSemitoneOffset
-    {   0.0f, -100.0f,  100.0f},   // MasterPitchOffset
-    {   0.0f,   -5.0f,    5.0f},   // Osc1OctaveOffset
-    {   0.0f,  -12.0f,   12.0f},   // Osc1SemitoneOffset
-    {   0.0f, -100.0f,  100.0f},   // Osc1PitchOffset
-    {   1.0f,   -5.0f,    5.0f},   // Osc2OctaveOffset
-    {   0.0f,  -12.0f,   12.0f},   // Osc2SemitoneOffset
-    {   0.0f, -100.0f,  100.0f},   // Osc2PitchOffset
-    {   1.0f,   -5.0f,    5.0f},   // Osc3OctaveOffset
-    {   7.0f,  -12.0f,   12.0f},   // Osc3SemitoneOffset
-    {  1.96f, -100.0f,  100.0f},   // Osc3PitchOffset
-    {   1.0f,    0.0f,    2.0f},   // Osc1VolumeDepth
-    {  0.05f,    0.0f,    2.0f},   // Osc1VolumeEnvA
-    {   0.2f,    0.0f,    2.0f},   // Osc1VolumeEnvD
-    {   0.7f,    0.0f,    1.0f},   // Osc1VolumeEnvS
-    {   0.2f,    0.0f,    2.0f},   // Osc1VolumeEnvR
-    {   4.0f,    0.0f,    8.0f},   // FilterCutoffDepth
-    {  0.05f,    0.0f,    2.0f},   // FilterCutoffEnvA
-    {  0.20f,    0.0f,    2.0f},   // FilterCutoffEnvD
-    {   0.2f,    0.0f,    1.0f},   // FilterCutoffEnvS
-    {  0.25f,    0.0f,    2.0f},   // FilterCutoffEnvR
-    {   3.0f,    0.0f,    8.0f},   // FilterResonanceDepth
-    {  0.05f,    0.0f,    2.0f},   // FilterResonanceEnvA
-    {  0.20f,    0.0f,    2.0f},   // FilterResonanceEnvD
-    {   0.5f,    0.0f,    1.0f},   // FilterResonanceEnvS
-    {  0.30f,    0.0f,    2.0f},   // FilterResonanceEnvR
-}};
-
 constexpr size_t PARAM_COUNT = static_cast<size_t>(ParamId::Count);
 
 class ParameterStore {
@@ -119,7 +86,6 @@ public:
     void set(EnvelopeId id, float depth, float a, float d, float s, float r);
     float get(ParamId id) const;
     int32_t getInt(ParamId id) const { return static_cast<int32_t>(get(id)); }
-    void resetToDefaults();
 
 private:
 
diff --git a/src/synth/Oscillator.cpp b/src/synth/Oscillator.cpp
index e1e5f80..a001ff3 100644
--- a/src/synth/Oscillator.cpp
+++ b/src/synth/Oscillator.cpp
@@ -24,8 +24,7 @@ float Oscillator::process(uint8_t note, float detune, bool& scopeTrigger) {
 
 float Oscillator::process(float frequency, bool& scopeTrigger) {
 
-    float pitchOffset = 0.5f;
-    float phaseInc = pitchOffset * 2.0f * M_PI * frequency / sampleRate_;
+    float phaseInc = 2.0f * M_PI * frequency / sampleRate_;
 
     float sampleOut = wavetable_->sample(activeWavetable_, phase_);