[hamradio-commits] [gnss-sdr] 99/251: Initializing class members in the constructor
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 7dcffd34013f9b665ae8a7f0442899d6a5793d45
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Sun May 17 11:02:27 2015 +0200
Initializing class members in the constructor
---
.../tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc | 6 +++++-
.../adapters/galileo_e1_tcp_connector_tracking.cc | 4 +++-
.../tracking/adapters/galileo_e5a_dll_pll_tracking.cc | 3 +++
.../adapters/galileo_volk_e1_dll_pll_veml_tracking.cc | 4 ++++
.../tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc | 3 +++
.../tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc | 4 ++++
.../tracking/adapters/gps_l1_ca_dll_pll_tracking.cc | 3 +++
.../tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc | 4 ++++
.../tracking/adapters/gps_l2_m_dll_pll_tracking.cc | 3 +++
.../galileo_e1_dll_pll_veml_tracking_cc.cc | 9 +++++++++
.../galileo_e1_tcp_connector_tracking_cc.cc | 11 +++++++++++
.../galileo_volk_e1_dll_pll_veml_tracking_cc.cc | 11 ++++++++++-
.../gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc | 15 +++++++++++++++
.../gps_l1_ca_dll_pll_optim_tracking_cc.cc | 10 ++++++++++
.../gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc | 11 ++++++++++-
.../gps_l1_ca_tcp_connector_tracking_cc.cc | 11 +++++++++++
.../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc | 14 ++++++++++++--
17 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index b965386..06ef6e9 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -64,7 +64,7 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
float early_late_space_chips;
float very_early_late_space_chips;
- item_type = configuration->property(role + ".item_type",default_item_type);
+ item_type = configuration->property(role + ".item_type", default_item_type);
fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
f_if = configuration->property(role + ".if", 0);
dump = configuration->property(role + ".dump", false);
@@ -96,9 +96,13 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+ channel_ = 0;
+ channel_internal_queue_ = 0;
+
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index fc9361c..ed2e30a 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -97,9 +97,11 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
-
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index a094521..4e67b11 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -103,8 +103,11 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
index 4879416..cb19c37 100644
--- a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
@@ -96,9 +96,13 @@ GalileoVolkE1DllPllVemlTracking::GalileoVolkE1DllPllVemlTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+ channel_ = 0;
+ channel_internal_queue_ = 0;
+
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc
index 0f7ff61..265b3ee 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc
@@ -102,8 +102,11 @@ GpsL1CaDllFllPllTracking::GpsL1CaDllFllPllTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
index ad46b5b..11392d8 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
@@ -93,8 +93,12 @@ GpsL1CaDllPllOptimTracking::GpsL1CaDllPllOptimTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
index 0613e9a..4dcab03 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
@@ -93,8 +93,11 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
index 2da95a6..f21e73b 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
@@ -94,8 +94,12 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
index 25fef9f..0c4745a 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
@@ -91,8 +91,11 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
}
else
{
+ item_size_ = sizeof(gr_complex);
LOG(WARNING) << item_type << " unknown tracking item type.";
}
+ channel_ = 0;
+ channel_internal_queue_ = 0;
DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
}
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
index 3e7e142..0ea9258 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
@@ -174,6 +174,15 @@ galileo_e1_dll_pll_veml_tracking_cc::galileo_e1_dll_pll_veml_tracking_cc(
*d_Prompt = gr_complex(0,0);
*d_Late = gr_complex(0,0);
*d_Very_Late = gr_complex(0,0);
+
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_acc_code_phase_secs = 0.0;
}
void galileo_e1_dll_pll_veml_tracking_cc::start_tracking()
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index 4a65738..bdbd5f3 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -170,6 +170,17 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
d_carrier_lock_fail_counter = 0;
d_carrier_lock_threshold = CARRIER_LOCK_THRESHOLD;
systemName["E"] = std::string("Galileo");
+
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_next_rem_code_phase_samples = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_acc_code_phase_secs = 0.0;
+ d_code_phase_samples = 0;
+ d_next_prn_length_samples = 0;
}
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
index 76cdba5..d9ae8bd 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
@@ -191,6 +191,15 @@ gr::block("galileo_volk_e1_dll_pll_veml_tracking_cc", gr::io_signature::make(1,
*d_Prompt = gr_complex(0,0);
*d_Late = gr_complex(0,0);
*d_Very_Late = gr_complex(0,0);
+
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_acc_code_phase_secs = 0.0;
}
void galileo_volk_e1_dll_pll_veml_tracking_cc::start_tracking()
@@ -356,7 +365,7 @@ int galileo_volk_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items,gr
}
// GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
- Gnss_Synchro current_synchro_data;
+ Gnss_Synchro current_synchro_data = Gnss_Synchro();
// Fill the acquisition data
current_synchro_data = *d_acquisition_gnss_synchro;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc
index 3e71b39..14697ec 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc
@@ -158,6 +158,21 @@ Gps_L1_Ca_Dll_Fll_Pll_Tracking_cc::Gps_L1_Ca_Dll_Fll_Pll_Tracking_cc(
systemName["S"] = std::string("SBAS");
systemName["E"] = std::string("Galileo");
systemName["C"] = std::string("Compass");
+
+ d_channel_internal_queue = 0;
+ //d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_code_freq_hz = 0.0;
+ d_rem_carr_phase = 0.0;
+ d_rem_code_phase_samples = 0.0;
+ d_acq_code_phase_samples = 0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_acc_code_phase_samples = 0;
+ d_FLL_discriminator_hz = 0.0;
+ d_pull_in = false;
+ d_FLL_wait = 1;
}
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
index 92ce756..86886dc 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
@@ -162,6 +162,16 @@ Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc(
d_carrier_lock_threshold = CARRIER_LOCK_THRESHOLD;
systemName["G"] = std::string("GPS");
+
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_code_phase_samples = 0.0;
+ d_acc_code_phase_secs = 0.0;
}
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
index db1abad..85d63f5 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
@@ -167,6 +167,15 @@ Gps_L1_Ca_Dll_Pll_Tracking_cc::Gps_L1_Ca_Dll_Pll_Tracking_cc(
set_relative_rate(1.0/((double)d_vector_length*2));
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_code_phase_samples = 0.0;
+ d_acc_code_phase_secs = 0.0;
//set_min_output_buffer((long int)300);
}
@@ -337,7 +346,7 @@ int Gps_L1_Ca_Dll_Pll_Tracking_cc::general_work (int noutput_items, gr_vector_in
Gnss_Synchro **out = (Gnss_Synchro **) &output_items[0];
// GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
- Gnss_Synchro current_synchro_data;
+ Gnss_Synchro current_synchro_data = Gnss_Synchro();
if (d_enable_tracking == true)
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 2351db6..671b3dd 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -174,6 +174,17 @@ Gps_L1_Ca_Tcp_Connector_Tracking_cc::Gps_L1_Ca_Tcp_Connector_Tracking_cc(
systemName["S"] = std::string("SBAS");
systemName["E"] = std::string("Galileo");
systemName["C"] = std::string("Compass");
+
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_next_rem_code_phase_samples = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_code_phase_samples = 0;
+ d_next_prn_length_samples = 0;
}
void Gps_L1_Ca_Tcp_Connector_Tracking_cc::start_tracking()
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
index 3137325..a7fa6cf 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
@@ -169,7 +169,17 @@ gps_l2_m_dll_pll_tracking_cc::gps_l2_m_dll_pll_tracking_cc(
set_relative_rate(1.0/((double)d_vector_length*2));
//set_min_output_buffer((long int)300);
- LOG(INFO)<<"d_vector_length"<<d_vector_length<<std::endl;
+ d_channel_internal_queue = 0;
+ d_acquisition_gnss_synchro = 0;
+ d_channel = 0;
+ d_acq_code_phase_samples = 0.0;
+ d_acq_carrier_doppler_hz = 0.0;
+ d_carrier_doppler_hz = 0.0;
+ d_acc_carrier_phase_rad = 0.0;
+ d_code_phase_samples = 0.0;
+ d_acc_code_phase_secs = 0.0;
+
+ LOG(INFO) << "d_vector_length" << d_vector_length;
}
@@ -333,7 +343,7 @@ int gps_l2_m_dll_pll_tracking_cc::general_work (int noutput_items, gr_vector_int
float code_error_filt_chips;
// GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
- Gnss_Synchro current_synchro_data;
+ Gnss_Synchro current_synchro_data = Gnss_Synchro();
// Block input data and block output stream pointers
const gr_complex* in = (gr_complex*) input_items[0]; //PRN start block alignment
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list