From 24a2b02fd7ddbf01bc467e6fbcdd6ce1b6e705e7 Mon Sep 17 00:00:00 2001
From: KubaPro010 <kuba.pro010@gmail.com>
Date: Sat, 22 Mar 2025 21:13:15 +0100
Subject: [PATCH] i give up

---
 lib/filters.c | 32 --------------------------------
 lib/filters.h | 19 +------------------
 src/fm95.c    |  6 +++---
 3 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/lib/filters.c b/lib/filters.c
index cd2ee20..9d6021f 100644
--- a/lib/filters.c
+++ b/lib/filters.c
@@ -12,36 +12,4 @@ float apply_preemphasis(ResistorCapacitor *filter, float sample) {
 
 float hard_clip(float sample, float threshold) {
     return fmaxf(-threshold, fminf(threshold, sample));
-}
-
-void init_pll(PLL *pll, float reference_frequency, float target_frequency, float sample_rate) {
-    pll->reference_frequency = reference_frequency;
-    pll->target_frequency = target_frequency;
-    pll->multiplier = target_frequency / reference_frequency;
-    pll->sample_rate = sample_rate;
-    
-    pll->phase_error = 0.0f;
-    pll->loop_filter = 0.0f;
-    pll->vco_phase = 0.0f;
-    pll->vco_frequency = target_frequency;
-    
-    pll->loop_gain = 0.01f;
-    pll->filter_coefficient = 0.1f;
-}
-
-float update_pll(PLL *pll, float reference_signal) {
-    float vco_divided_phase = fmodf(pll->vco_phase / pll->multiplier, M_2PI);
-    float reference_phase = acosf(reference_signal); // Extract phase from reference signal
-    
-    pll->phase_error = sinf(reference_phase - vco_divided_phase);
-    
-    pll->loop_filter = pll->loop_filter * (1.0f - pll->filter_coefficient) + 
-                       pll->phase_error * pll->filter_coefficient * pll->loop_gain;
-    
-    pll->vco_frequency = pll->target_frequency + pll->loop_filter;
-    
-    float phase_increment = (M_2PI * pll->vco_frequency) / pll->sample_rate;
-    pll->vco_phase = fmodf(pll->vco_phase + phase_increment, M_2PI * pll->multiplier);
-    
-    return sinf(pll->vco_phase);
 }
\ No newline at end of file
diff --git a/lib/filters.h b/lib/filters.h
index 535ee03..57faefe 100644
--- a/lib/filters.h
+++ b/lib/filters.h
@@ -14,21 +14,4 @@ typedef struct
 void init_preemphasis(ResistorCapacitor *filter, float tau, float sample_rate);
 float apply_preemphasis(ResistorCapacitor *filter, float sample);
 
-float hard_clip(float sample, float threshold);
-
-typedef struct {
-    float phase_error;
-    float loop_filter;
-    float vco_phase;
-    float vco_frequency;
-
-    float reference_frequency;
-    float target_frequency;
-    float multiplier;
-    float sample_rate;
-    float loop_gain;
-    float filter_coefficient;
-} PLL;
-
-void init_pll(PLL *pll, float reference_frequency, float target_frequency, float sample_rate);
-float update_pll(PLL *pll, float reference_signal);
\ No newline at end of file
+float hard_clip(float sample, float threshold);
\ No newline at end of file
diff --git a/src/fm95.c b/src/fm95.c
index 5bdc4d0..a6acd4b 100644
--- a/src/fm95.c
+++ b/src/fm95.c
@@ -415,8 +415,8 @@ int main(int argc, char **argv) {
     init_preemphasis(&preemp_l, preemphasis_tau, sample_rate);
     init_preemphasis(&preemp_r, preemphasis_tau, sample_rate);
 
-    PLL rds2_pll;
-    init_pll(&rds2_pll, 19000, 66500, sample_rate);
+    Oscillator rds2_osc;
+    init_oscillator(&rds2_osc, 66500, sample_rate);
     // #endregion
 
     signal(SIGINT, stop);
@@ -494,7 +494,7 @@ int main(int argc, char **argv) {
                 float rds_carrier = get_oscillator_sin_multiplier_ni(&osc, 3);
                 output[i] += (current_rds_in*rds_carrier)*RDS_VOLUME;
                 if(!sca_on) {
-                    float rds2_carrier_66 = update_pll(&rds2_pll, get_oscillator_sin_multiplier_ni(&osc, 1));
+                    float rds2_carrier_66 = get_oscillator_sin_sample(&rds2_osc);
                     output[i] += (current_rds2_in*rds2_carrier_66)*RDS2_VOLUME;
                 }
             }