Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into tracking_debug

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc

@@ -271,7 +271,7 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
                 }
         }
 
-    delete[] ca_codes_f;
+    volk_gnsssdr_free(ca_codes_f);
     if (d_track_pilot)
         {
             volk_gnsssdr_free(data_codes_f);
@@ -289,10 +289,10 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
 
 GalileoE1DllPllVemlTrackingFpga::~GalileoE1DllPllVemlTrackingFpga()
 {
-    delete[] d_ca_codes;
+    volk_gnsssdr_free(d_ca_codes);
     if (d_track_pilot)
         {
-            delete[] d_data_codes;
+            volk_gnsssdr_free(d_data_codes);
         }
 }
 

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc

@@ -273,10 +273,10 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
 
 GalileoE5aDllPllTrackingFpga::~GalileoE5aDllPllTrackingFpga()
 {
-    delete[] d_ca_codes;
+    volk_gnsssdr_free(d_ca_codes);
     if (d_track_pilot)
         {
-            delete[] d_data_codes;
+            volk_gnsssdr_free(d_data_codes);
         }
 }
 

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc

@@ -239,7 +239,7 @@ GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
 
 GpsL1CaDllPllTrackingFpga::~GpsL1CaDllPllTrackingFpga()
 {
-    delete[] d_ca_codes;
+    volk_gnsssdr_free(d_ca_codes);
 }
 
 

src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h

@@ -47,6 +47,15 @@
  */
 class Tracking_2nd_DLL_filter
 {
+public:
+    void set_DLL_BW(float dll_bw_hz);             //!< Set DLL filter bandwidth [Hz]
+    void set_pdi(float pdi_code);                 //!< Set Summation interval for code [s]
+    void initialize();                            //!< Start tracking with acquisition information
+    float get_code_nco(float DLL_discriminator);  //!< Numerically controlled oscillator
+    Tracking_2nd_DLL_filter(float pdi_code);
+    Tracking_2nd_DLL_filter();
+    ~Tracking_2nd_DLL_filter();
+
 private:
     // PLL filter parameters
     float d_tau1_code = 0.0;
@@ -57,15 +66,6 @@ private:
     float d_old_code_error = 0.0;
     float d_old_code_nco = 0.0;
     void calculate_lopp_coef(float* tau1, float* tau2, float lbw, float zeta, float k);
-
-public:
-    void set_DLL_BW(float dll_bw_hz);             //! Set DLL filter bandwidth [Hz]
-    void set_pdi(float pdi_code);                 //! Set Summation interval for code [s]
-    void initialize();                            //! Start tracking with acquisition information
-    float get_code_nco(float DLL_discriminator);  //! Numerically controlled oscillator
-    Tracking_2nd_DLL_filter(float pdi_code);
-    Tracking_2nd_DLL_filter();
-    ~Tracking_2nd_DLL_filter();
 };
 
 #endif

src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h

@@ -46,28 +46,25 @@
  */
 class Tracking_2nd_PLL_filter
 {
-private:
-    // PLL filter parameters
-    float d_tau1_carr = 0.0;
-    float d_tau2_carr = 0.0;
-    float d_pdi_carr = 0.0;
-
-    float d_pllnoisebandwidth = 0.0;
-    float d_plldampingratio = 0.0;
-
-    float d_old_carr_error = 0.0;
-    float d_old_carr_nco = 0.0;
-
-    void calculate_lopp_coef(float* tau1, float* tau2, float lbw, float zeta, float k);
-
 public:
-    void set_PLL_BW(float pll_bw_hz);  //! Set PLL loop bandwidth [Hz]
-    void set_pdi(float pdi_carr);      //! Set Summation interval for code [s]
+    void set_PLL_BW(float pll_bw_hz);  //!< Set PLL loop bandwidth [Hz]
+    void set_pdi(float pdi_carr);      //!< Set Summation interval for code [s]
     void initialize();
     float get_carrier_nco(float PLL_discriminator);
     Tracking_2nd_PLL_filter(float pdi_carr);
     Tracking_2nd_PLL_filter();
     ~Tracking_2nd_PLL_filter();
+
+private:
+    // PLL filter parameters
+    float d_tau1_carr = 0.0;
+    float d_tau2_carr = 0.0;
+    float d_pdi_carr = 0.0;
+    float d_pllnoisebandwidth = 0.0;
+    float d_plldampingratio = 0.0;
+    float d_old_carr_error = 0.0;
+    float d_old_carr_nco = 0.0;
+    void calculate_lopp_coef(float* tau1, float* tau2, float lbw, float zeta, float k);
 };
 
 #endif

src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h

@@ -36,6 +36,13 @@
  */
 class Tracking_FLL_PLL_filter
 {
+public:
+    void set_params(float fll_bw_hz, float pll_bw_hz, int order);
+    void initialize(float d_acq_carrier_doppler_hz);
+    float get_carrier_error(float FLL_discriminator, float PLL_discriminator, float correlation_time_s);
+    Tracking_FLL_PLL_filter();
+    ~Tracking_FLL_PLL_filter();
+
 private:
     // FLL + PLL filter parameters
     int d_order;
@@ -49,13 +56,6 @@ private:
     float d_pll_w0p2;
     float d_pll_b3;
     float d_pll_w0p;
-
-public:
-    void set_params(float fll_bw_hz, float pll_bw_hz, int order);
-    void initialize(float d_acq_carrier_doppler_hz);
-    float get_carrier_error(float FLL_discriminator, float PLL_discriminator, float correlation_time_s);
-    Tracking_FLL_PLL_filter();
-    ~Tracking_FLL_PLL_filter();
 };
 
 #endif

src/algorithms/tracking/libs/tracking_loop_filter.h

@@ -43,6 +43,27 @@
  */
 class Tracking_loop_filter
 {
+public:
+    float get_noise_bandwidth(void) const;
+    float get_update_interval(void) const;
+    bool get_include_last_integrator(void) const;
+    int get_order(void) const;
+
+    void set_noise_bandwidth(float noise_bandwidth);
+    void set_update_interval(float update_interval);
+    void set_include_last_integrator(bool include_last_integrator);
+    void set_order(int loop_order);
+
+    void initialize(float initial_output = 0.0);
+    float apply(float current_input);
+
+    Tracking_loop_filter(float update_interval, float noise_bandwidth,
+        int loop_order = 2,
+        bool include_last_integrator = false);
+
+    Tracking_loop_filter();
+    ~Tracking_loop_filter();
+
 private:
     // Store the last inputs and outputs:
     std::vector<float> d_inputs;
@@ -71,27 +92,6 @@ private:
 
     // Compute the filter coefficients:
     void update_coefficients(void);
-
-public:
-    float get_noise_bandwidth(void) const;
-    float get_update_interval(void) const;
-    bool get_include_last_integrator(void) const;
-    int get_order(void) const;
-
-    void set_noise_bandwidth(float noise_bandwidth);
-    void set_update_interval(float update_interval);
-    void set_include_last_integrator(bool include_last_integrator);
-    void set_order(int loop_order);
-
-    void initialize(float initial_output = 0.0);
-    float apply(float current_input);
-
-    Tracking_loop_filter(float update_interval, float noise_bandwidth,
-        int loop_order = 2,
-        bool include_last_integrator = false);
-
-    Tracking_loop_filter();
-    ~Tracking_loop_filter();
 };
 
 #endif