Migrating DLL/PLL configuration from struct to class and adding tracking quality indicators plot sample MATLAB script

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc

@@ -34,6 +34,7 @@
  * -------------------------------------------------------------------------
  */
 
+#include "dll_pll_conf.h"
 #include "galileo_e1_dll_pll_veml_tracking.h"
 #include "configuration_interface.h"
 #include "Galileo_E1.h"
@@ -48,7 +49,7 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
     ConfigurationInterface* configuration, std::string role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
-    dllpllconf_t trk_param;
+    Dll_Pll_Conf trk_param;
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
     std::string default_item_type = "gr_complex";

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc

@@ -35,7 +35,7 @@
  *
  * -------------------------------------------------------------------------
  */
-
+#include "dll_pll_conf.h"
 #include "galileo_e5a_dll_pll_tracking.h"
 #include "configuration_interface.h"
 #include "Galileo_E5a.h"
@@ -49,7 +49,7 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
     ConfigurationInterface* configuration, std::string role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
-    dllpllconf_t trk_param;
+    Dll_Pll_Conf trk_param;
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
     std::string default_item_type = "gr_complex";

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc

@@ -35,7 +35,7 @@
  * -------------------------------------------------------------------------
  */
 
-
+#include "dll_pll_conf.h"
 #include "gps_l1_ca_dll_pll_tracking.h"
 #include "configuration_interface.h"
 #include "GPS_L1_CA.h"
@@ -49,7 +49,7 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     ConfigurationInterface* configuration, std::string role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
-    dllpllconf_t trk_param;
+    Dll_Pll_Conf trk_param;
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
     std::string default_item_type = "gr_complex";
@@ -108,13 +108,13 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
     if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
     trk_param.cn0_samples = cn0_samples;
-    int cn0_min = configuration->property(role + ".cn0_min", 25);
+    int cn0_min = configuration->property(role + ".cn0_min", 30);
     if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
     if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
     trk_param.max_lock_fail = max_lock_fail;
-    double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.85);
+    double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.80);
     if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
     trk_param.carrier_lock_th = carrier_lock_th;
 

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc

@@ -34,7 +34,7 @@
  * -------------------------------------------------------------------------
  */
 
-
+#include "dll_pll_conf.h"
 #include "gps_l2_m_dll_pll_tracking.h"
 #include "configuration_interface.h"
 #include "GPS_L2C.h"
@@ -49,7 +49,7 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
     ConfigurationInterface* configuration, std::string role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
-    dllpllconf_t trk_param;
+    Dll_Pll_Conf trk_param;
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
     std::string default_item_type = "gr_complex";

src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc

@@ -34,7 +34,7 @@
  * -------------------------------------------------------------------------
  */
 
-
+#include "dll_pll_conf.h"
 #include "gps_l5_dll_pll_tracking.h"
 #include "configuration_interface.h"
 #include "GPS_L5.h"
@@ -49,7 +49,7 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
     ConfigurationInterface* configuration, std::string role,
     unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
-    dllpllconf_t trk_param;
+    Dll_Pll_Conf trk_param;
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
     std::string default_item_type = "gr_complex";

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc

@@ -60,7 +60,7 @@
 
 using google::LogMessage;
 
-dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(dllpllconf_t conf_)
+dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(Dll_Pll_Conf conf_)
 {
     return dll_pll_veml_tracking_sptr(new dll_pll_veml_tracking(conf_));
 }
@@ -76,7 +76,7 @@ void dll_pll_veml_tracking::forecast(int noutput_items,
 }
 
 
-dll_pll_veml_tracking::dll_pll_veml_tracking(dllpllconf_t conf_) : gr::block("dll_pll_veml_tracking", gr::io_signature::make(1, 1, sizeof(gr_complex)),
+dll_pll_veml_tracking::dll_pll_veml_tracking(Dll_Pll_Conf conf_) : gr::block("dll_pll_veml_tracking", gr::io_signature::make(1, 1, sizeof(gr_complex)),
                                                                        gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
 {
     trk_parameters = conf_;

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h

@@ -31,6 +31,7 @@
 #ifndef GNSS_SDR_DLL_PLL_VEML_TRACKING_H
 #define GNSS_SDR_DLL_PLL_VEML_TRACKING_H
 
+#include "dll_pll_conf.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
@@ -39,37 +40,14 @@
 #include <fstream>
 #include <string>
 #include <map>
-
-typedef struct
-{
-    /* DLL/PLL tracking configuration */
-    double fs_in;
-    unsigned int vector_length;
-    bool dump;
-    std::string dump_filename;
-    float pll_bw_hz;
-    float dll_bw_hz;
-    float pll_bw_narrow_hz;
-    float dll_bw_narrow_hz;
-    float early_late_space_chips;
-    float very_early_late_space_chips;
-    float early_late_space_narrow_chips;
-    float very_early_late_space_narrow_chips;
-    int extend_correlation_symbols;
-    int cn0_samples;
-    int cn0_min;
-    int max_lock_fail;
-    double carrier_lock_th;
-    bool track_pilot;
-    char system;
-    char signal[3];
-} dllpllconf_t;
+#include <queue>
+#include <deque>
 
 class dll_pll_veml_tracking;
 
 typedef boost::shared_ptr<dll_pll_veml_tracking> dll_pll_veml_tracking_sptr;
 
-dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(dllpllconf_t conf_);
+dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(Dll_Pll_Conf conf_);
 
 /*!
  * \brief This class implements a code DLL + carrier PLL tracking block.
@@ -89,9 +67,9 @@ public:
     void forecast(int noutput_items, gr_vector_int &ninput_items_required);
 
 private:
-    friend dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(dllpllconf_t conf_);
+    friend dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(Dll_Pll_Conf conf_);
 
-    dll_pll_veml_tracking(dllpllconf_t conf_);
+    dll_pll_veml_tracking(Dll_Pll_Conf conf_);
 
     bool cn0_and_tracking_lock_status(double coh_integration_time_s);
     bool acquire_secondary();
@@ -104,7 +82,7 @@ private:
     int save_matfile();
 
     // tracking configuration vars
-    dllpllconf_t trk_parameters;
+    Dll_Pll_Conf trk_parameters;
     bool d_veml;
     bool d_cloop;
     unsigned int d_channel;
@@ -201,6 +179,7 @@ private:
     // CN0 estimation and lock detector
     int d_cn0_estimation_counter;
     int d_carrier_lock_fail_counter;
+    std::deque<float> d_carrier_lock_detector_queue;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;

src/algorithms/tracking/libs/CMakeLists.txt

@@ -43,6 +43,7 @@ set(TRACKING_LIB_SOURCES
      tracking_discriminators.cc
      tracking_FLL_PLL_filter.cc
      tracking_loop_filter.cc
+     dll_pll_conf.cc
 )
 
 if(ENABLE_FPGA)

src/algorithms/tracking/libs/dll_pll_conf.cc

@@ -0,0 +1,29 @@
+#include "dll_pll_conf.h"
+#include <cstring>
+
+Dll_Pll_Conf::Dll_Pll_Conf()
+{
+    /* DLL/PLL tracking configuration */
+    fs_in = 0.0;
+    vector_length = 0;
+    dump = false;
+    dump_filename = "./dll_pll_dump.dat";
+    pll_bw_hz = 40.0;
+    dll_bw_hz = 2.0;
+    pll_bw_narrow_hz = 5.0;
+    dll_bw_narrow_hz = 0.75;
+    early_late_space_chips = 0.5;
+    very_early_late_space_chips = 0.5;
+    early_late_space_narrow_chips = 0.1;
+    very_early_late_space_narrow_chips = 0.1;
+    extend_correlation_symbols = 5;
+    cn0_samples = 20;
+    carrier_lock_det_mav_samples = 20;
+    cn0_min = 25;
+    max_lock_fail = 50;
+    carrier_lock_th = 0.85;
+    track_pilot = false;
+    system = 'G';
+    char sig_[3] = "1C";
+    std::memcpy(signal, sig_, 3);
+}

src/algorithms/tracking/libs/dll_pll_conf.h

@@ -0,0 +1,68 @@
+/*!
+ * \file dll_pll_conf.h
+ * \brief Class that contains all the configuration parameters for generic tracking block based on a DLL and a PLL.
+ * \author Javier Arribas, 2018. jarribas(at)cttc.es
+ *
+ * Class that contains all the configuration parameters for generic tracking block based on a DLL and a PLL.
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_DLL_PLL_CONF_H_
+#define GNSS_SDR_DLL_PLL_CONF_H_
+
+#include <string>
+
+class Dll_Pll_Conf
+{
+private:
+public:
+    /* DLL/PLL tracking configuration */
+    double fs_in;
+    unsigned int vector_length;
+    bool dump;
+    std::string dump_filename;
+    float pll_bw_hz;
+    float dll_bw_hz;
+    float pll_bw_narrow_hz;
+    float dll_bw_narrow_hz;
+    float early_late_space_chips;
+    float very_early_late_space_chips;
+    float early_late_space_narrow_chips;
+    float very_early_late_space_narrow_chips;
+    int extend_correlation_symbols;
+    int cn0_samples;
+    int carrier_lock_det_mav_samples;
+    int cn0_min;
+    int max_lock_fail;
+    double carrier_lock_th;
+    bool track_pilot;
+    char system;
+    char signal[3];
+
+    Dll_Pll_Conf();
+};
+
+#endif

src/utils/matlab/plot_tracking_quality_indicators.m

@@ -0,0 +1,18 @@
+%plot tracking quality indicators
+figure;
+hold on;
+title('Carrier lock test output for all the channels');
+for n=1:1:length(GNSS_tracking)
+    plot(GNSS_tracking(n).carrier_lock_test)
+    plotnames{n}=['SV ' num2str(round(mean(GNSS_tracking(n).PRN)))];
+end
+legend(plotnames);
+
+figure;
+hold on;
+title('Carrier CN0 output for all the channels');
+for n=1:1:length(GNSS_tracking)
+    plot(GNSS_tracking(n).CN0_SNV_dB_Hz)
+    plotnames{n}=['SV ' num2str(round(mean(GNSS_tracking(n).PRN)))];
+end
+legend(plotnames);