diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc
index 5a6284888..f7cec1949 100644
--- a/src/algorithms/channel/adapters/channel.cc
+++ b/src/algorithms/channel/adapters/channel.cc
@@ -108,8 +108,6 @@ Channel::Channel(ConfigurationInterface* configuration, unsigned int channel,
// Destructor
Channel::~Channel() {}
-
-
void Channel::connect(gr::top_block_sptr top_block)
{
if (connected_)
@@ -137,8 +135,6 @@ void Channel::connect(gr::top_block_sptr top_block)
DLOG(INFO) << "tracking -> telemetry_decoder";
// Message ports
- top_block->msg_connect(nav_->get_left_block(), pmt::mp("preamble_timestamp_s"), trk_->get_right_block(), pmt::mp("preamble_timestamp_s"));
- DLOG(INFO) << "MSG FEEDBACK CHANNEL telemetry_decoder -> tracking";
top_block->msg_connect(acq_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events"));
top_block->msg_connect(trk_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events"));
diff --git a/src/algorithms/libs/gnss_circular_deque.h b/src/algorithms/libs/gnss_circular_deque.h
new file mode 100644
index 000000000..d9694e722
--- /dev/null
+++ b/src/algorithms/libs/gnss_circular_deque.h
@@ -0,0 +1,135 @@
+/*!
+ * \file gnss_circular_deque.h
+ * \brief This class implements a circular deque for Gnss_Synchro
+ *
+ * \author Antonio Ramos, 2018. antonio.ramosdet(at)gmail.com
+ *
+ * Detailed description of the file here if needed.
+ *
+ * -------------------------------------------------------------------------
+ *
+ * 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 .
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_CIRCULAR_DEQUE_H_
+#define GNSS_SDR_CIRCULAR_DEQUE_H_
+#include
+#include
+
+template
+class Gnss_circular_deque
+{
+public:
+ Gnss_circular_deque(); // Default constructor
+ Gnss_circular_deque(const unsigned int max_size, const unsigned int nchann); // nchann = number of channels; max_size = channel capacity
+ unsigned int size(const unsigned int ch); // Returns the number of available elements in a channel
+ T& at(const unsigned int ch, const unsigned int pos); // Returns a reference to an element
+ T& front(const unsigned int ch); // Returns a reference to the first element in the deque
+ T& back(const unsigned int ch); // Returns a reference to the last element in the deque
+ void push_back(const unsigned int ch, const T& new_data); // Inserts an element at the end of the deque
+ void pop_front(const unsigned int ch); // Removes the first element of the deque
+ void clear(const unsigned int ch); // Removes all the elements of the deque (Sets size to 0). Capacity is not modified
+ void reset(const unsigned int max_size, const unsigned int nchann); // Removes all the elements in all the channels. Re-sets the number of channels and their capacity
+ void reset(); // Removes all the channels (Sets nchann to 0)
+
+private:
+ std::vector> d_data;
+};
+
+
+template
+Gnss_circular_deque::Gnss_circular_deque()
+{
+ reset();
+}
+
+template
+Gnss_circular_deque::Gnss_circular_deque(const unsigned int max_size, const unsigned int nchann)
+{
+ reset(max_size, nchann);
+}
+
+template
+unsigned int Gnss_circular_deque::size(const unsigned int ch)
+{
+ return d_data.at(ch).size();
+}
+
+template
+T& Gnss_circular_deque::back(const unsigned int ch)
+{
+ return d_data.at(ch).back();
+}
+
+
+template
+T& Gnss_circular_deque::front(const unsigned int ch)
+{
+ return d_data.at(ch).front();
+}
+
+
+template
+T& Gnss_circular_deque::at(const unsigned int ch, const unsigned int pos)
+{
+ return d_data.at(ch).at(pos);
+}
+
+template
+void Gnss_circular_deque::clear(const unsigned int ch)
+{
+ d_data.at(ch).clear();
+}
+
+template
+void Gnss_circular_deque::reset(const unsigned int max_size, const unsigned int nchann)
+{
+ d_data.clear();
+ if (max_size > 0 and nchann > 0)
+ {
+ for (unsigned int i = 0; i < nchann; i++)
+ {
+ d_data.push_back(boost::circular_buffer(max_size));
+ }
+ }
+}
+
+template
+void Gnss_circular_deque::reset()
+{
+ d_data.clear();
+}
+
+template
+void Gnss_circular_deque::pop_front(const unsigned int ch)
+{
+ d_data.at(ch).pop_front();
+}
+
+template
+void Gnss_circular_deque::push_back(const unsigned int ch, const T& new_data)
+{
+ d_data.at(ch).push_back(new_data);
+}
+
+#endif /* GNSS_SDR_CIRCULAR_DEQUE_H_ */
diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index 5129e4157..882b22d83 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -26,6 +26,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/core/interfaces
${CMAKE_SOURCE_DIR}/src/core/receiver
${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks
+ ${CMAKE_SOURCE_DIR}/src/algorithms/libs
${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index 98b8213d8..e3db8ebcf 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -39,8 +39,8 @@ list(SORT OBS_GR_BLOCKS_HEADERS)
add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS})
source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
if(MATIO_FOUND)
- add_dependencies(obs_gr_blocks glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
+ add_dependencies(obs_gr_blocks gnss_sp_libs glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
else(MATIO_FOUND)
- add_dependencies(obs_gr_blocks glog-${glog_RELEASE} armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
+ add_dependencies(obs_gr_blocks gnss_sp_libs glog-${glog_RELEASE} armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
endif(MATIO_FOUND)
-target_link_libraries(obs_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${ARMADILLO_LIBRARIES} ${MATIO_LIBRARIES})
+target_link_libraries(obs_gr_blocks gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} ${ARMADILLO_LIBRARIES} ${MATIO_LIBRARIES})
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index 6e95da824..0fdd85c31 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -63,14 +63,11 @@ hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in,
d_dump_filename = dump_filename;
T_rx_s = 0.0;
T_rx_step_s = 0.001; // 1 ms
- max_delta = 0.15; // 150 ms
+ max_delta = 1.5; // 1.5 s
+ d_latency = 0.175; // 175 ms
valid_channels.resize(d_nchannels, false);
d_num_valid_channels = 0;
-
- for (unsigned int i = 0; i < d_nchannels; i++)
- {
- d_gnss_synchro_history.push_back(std::deque());
- }
+ d_gnss_synchro_history = new Gnss_circular_deque(static_cast(max_delta * 1000.0), d_nchannels);
// ############# ENABLE DATA FILE LOG #################
if (d_dump)
@@ -95,6 +92,7 @@ hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in,
hybrid_observables_cc::~hybrid_observables_cc()
{
+ delete d_gnss_synchro_history;
if (d_dump_file.is_open())
{
try
@@ -302,40 +300,26 @@ int hybrid_observables_cc::save_matfile()
}
-bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, std::deque &data, const double &ti)
+bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, const unsigned int &ch, const double &ti)
{
- if ((ti < data.front().RX_time) or (ti > data.back().RX_time))
+ if ((ti < d_gnss_synchro_history->front(ch).RX_time) or (ti > d_gnss_synchro_history->back(ch).RX_time))
{
return false;
}
- std::deque::iterator it;
+ find_interp_elements(ch, ti);
- arma::vec t = arma::vec(data.size());
- arma::vec dop = t;
- arma::vec cph = t;
- arma::vec tow = t;
- arma::vec tiv = arma::vec(1);
- arma::vec result;
- tiv(0) = ti;
+ //Linear interpolation: y(t) = y(t1) + (y(t2) - y(t1)) * (t - t1) / (t2 - t1)
- unsigned int aux = 0;
- for (it = data.begin(); it != data.end(); it++)
- {
- t(aux) = it->RX_time;
- dop(aux) = it->Carrier_Doppler_hz;
- cph(aux) = it->Carrier_phase_rads;
- tow(aux) = it->TOW_at_current_symbol_s;
+ // CARRIER PHASE INTERPOLATION
+ out.Carrier_phase_rads = d_gnss_synchro_history->at(ch, 0).Carrier_phase_rads + (d_gnss_synchro_history->at(ch, 1).Carrier_phase_rads - d_gnss_synchro_history->at(ch, 0).Carrier_phase_rads) * (ti - d_gnss_synchro_history->at(ch, 0).RX_time) / (d_gnss_synchro_history->at(ch, 1).RX_time - d_gnss_synchro_history->at(ch, 0).RX_time);
- aux++;
- }
- arma::interp1(t, dop, tiv, result);
- out.Carrier_Doppler_hz = result(0);
- arma::interp1(t, cph, tiv, result);
- out.Carrier_phase_rads = result(0);
- arma::interp1(t, tow, tiv, result);
- out.TOW_at_current_symbol_s = result(0);
+ // CARRIER DOPPLER INTERPOLATION
+ out.Carrier_Doppler_hz = d_gnss_synchro_history->at(ch, 0).Carrier_Doppler_hz + (d_gnss_synchro_history->at(ch, 1).Carrier_Doppler_hz - d_gnss_synchro_history->at(ch, 0).Carrier_Doppler_hz) * (ti - d_gnss_synchro_history->at(ch, 0).RX_time) / (d_gnss_synchro_history->at(ch, 1).RX_time - d_gnss_synchro_history->at(ch, 0).RX_time);
- return result.is_finite();
+ // TOW INTERPOLATION
+ out.TOW_at_current_symbol_s = d_gnss_synchro_history->at(ch, 0).TOW_at_current_symbol_s + (d_gnss_synchro_history->at(ch, 1).TOW_at_current_symbol_s - d_gnss_synchro_history->at(ch, 0).TOW_at_current_symbol_s) * (ti - d_gnss_synchro_history->at(ch, 0).RX_time) / (d_gnss_synchro_history->at(ch, 1).RX_time - d_gnss_synchro_history->at(ch, 0).RX_time);
+
+ return true;
}
@@ -351,25 +335,60 @@ double hybrid_observables_cc::compute_T_rx_s(const Gnss_Synchro &a)
}
}
+void hybrid_observables_cc::find_interp_elements(const unsigned int &ch, const double &ti)
+{
+ unsigned int closest = 0;
+ double dif = std::numeric_limits::max();
+ double dt = 0.0;
+ for (unsigned int i = 0; i < d_gnss_synchro_history->size(ch); i++)
+ {
+ dt = std::fabs(ti - d_gnss_synchro_history->at(ch, i).RX_time);
+ if (dt < dif)
+ {
+ closest = i;
+ dif = dt;
+ }
+ else
+ {
+ break;
+ }
+ }
+ if (ti > d_gnss_synchro_history->at(ch, closest).RX_time)
+ {
+ while (closest > 0)
+ {
+ d_gnss_synchro_history->pop_front(ch);
+ closest--;
+ }
+ }
+ else
+ {
+ while (closest > 1)
+ {
+ d_gnss_synchro_history->pop_front(ch);
+ closest--;
+ }
+ }
+}
-void hybrid_observables_cc::forecast(int noutput_items __attribute__((unused)),
- gr_vector_int &ninput_items_required)
+
+void hybrid_observables_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
{
for (unsigned int i = 0; i < d_nchannels; i++)
{
ninput_items_required[i] = 0;
}
- ninput_items_required[d_nchannels] = 1;
+ ninput_items_required[d_nchannels] = noutput_items;
}
-void hybrid_observables_cc::clean_history(std::deque &data)
+void hybrid_observables_cc::clean_history(unsigned int pos)
{
- while (data.size() > 0)
+ while (d_gnss_synchro_history->size(pos) > 0)
{
- if ((T_rx_s - data.front().RX_time) > max_delta)
+ if ((T_rx_s - d_gnss_synchro_history->front(pos).RX_time) > max_delta)
{
- data.pop_front();
+ d_gnss_synchro_history->pop_front(pos);
}
else
{
@@ -439,157 +458,161 @@ int hybrid_observables_cc::general_work(int noutput_items __attribute__((unused)
Gnss_Synchro **out = reinterpret_cast(&output_items[0]);
unsigned int i;
+ unsigned int returned_elements = 0;
int total_input_items = 0;
for (i = 0; i < d_nchannels; i++)
{
total_input_items += ninput_items[i];
}
- consume(d_nchannels, 1);
- T_rx_s += T_rx_step_s;
-
- //////////////////////////////////////////////////////////////////////////
- if ((total_input_items == 0) and (d_num_valid_channels == 0))
+ for (int epoch = 0; epoch < ninput_items[d_nchannels]; epoch++)
{
- return 0;
- }
- //////////////////////////////////////////////////////////////////////////
+ T_rx_s += T_rx_step_s;
- std::vector>::iterator it;
- if (total_input_items > 0)
- {
- i = 0;
- for (it = d_gnss_synchro_history.begin(); it != d_gnss_synchro_history.end(); it++)
+ //////////////////////////////////////////////////////////////////////////
+ if ((total_input_items == 0) and (d_num_valid_channels == 0))
{
- if (ninput_items[i] > 0)
+ consume(d_nchannels, epoch + 1);
+ return returned_elements;
+ }
+ //////////////////////////////////////////////////////////////////////////
+
+ if (total_input_items > 0 and epoch == 0)
+ {
+ for (i = 0; i < d_nchannels; i++)
{
- // Add the new Gnss_Synchros to their corresponding deque
- for (int aux = 0; aux < ninput_items[i]; aux++)
+ if (ninput_items[i] > 0)
{
- if (in[i][aux].Flag_valid_word)
+ // Add the new Gnss_Synchros to their corresponding deque
+ for (int aux = 0; aux < ninput_items[i]; aux++)
{
- it->push_back(in[i][aux]);
- it->back().RX_time = compute_T_rx_s(in[i][aux]);
- // Check if the last Gnss_Synchro comes from the same satellite as the previous ones
- if (it->size() > 1)
+ if (in[i][aux].Flag_valid_word)
{
- if (it->front().PRN != it->back().PRN)
+ d_gnss_synchro_history->push_back(i, in[i][aux]);
+ d_gnss_synchro_history->back(i).RX_time = compute_T_rx_s(in[i][aux]);
+ // Check if the last Gnss_Synchro comes from the same satellite as the previous ones
+ if (d_gnss_synchro_history->size(i) > 1)
{
- it->clear();
+ if (d_gnss_synchro_history->front(i).PRN != d_gnss_synchro_history->back(i).PRN)
+ {
+ d_gnss_synchro_history->clear(i);
+ }
}
}
}
+ consume(i, ninput_items[i]);
}
- consume(i, ninput_items[i]);
- }
- i++;
- }
- }
- for (i = 0; i < d_nchannels; i++)
- {
- if (d_gnss_synchro_history.at(i).size() > 2)
- {
- valid_channels[i] = true;
- }
- else
- {
- valid_channels[i] = false;
- }
- }
- d_num_valid_channels = valid_channels.count();
- // Check if there is any valid channel after reading the new incoming Gnss_Synchro data
- if (d_num_valid_channels == 0)
- {
- return 0;
- }
-
- for (i = 0; i < d_nchannels; i++) //Discard observables with T_rx higher than the threshold
- {
- if (valid_channels[i])
- {
- clean_history(d_gnss_synchro_history.at(i));
- if (d_gnss_synchro_history.at(i).size() < 2)
- {
- valid_channels[i] = false;
}
}
- }
-
- // Check if there is any valid channel after computing the time distance between the Gnss_Synchro data and the receiver time
- d_num_valid_channels = valid_channels.count();
- double T_rx_s_out = T_rx_s - (max_delta / 2.0);
- if ((d_num_valid_channels == 0) or (T_rx_s_out < 0.0))
- {
- return 0;
- }
-
- std::vector epoch_data;
- i = 0;
- for (it = d_gnss_synchro_history.begin(); it != d_gnss_synchro_history.end(); it++)
- {
- if (valid_channels[i])
+ for (i = 0; i < d_nchannels; i++)
{
- Gnss_Synchro interpolated_gnss_synchro = it->back();
- if (interpolate_data(interpolated_gnss_synchro, *it, T_rx_s_out))
+ if (d_gnss_synchro_history->size(i) > 2)
{
- epoch_data.push_back(interpolated_gnss_synchro);
+ valid_channels[i] = true;
}
else
{
valid_channels[i] = false;
}
}
- i++;
- }
- d_num_valid_channels = valid_channels.count();
- if (d_num_valid_channels == 0)
- {
- return 0;
- }
- correct_TOW_and_compute_prange(epoch_data);
- std::vector::iterator it2 = epoch_data.begin();
- for (i = 0; i < d_nchannels; i++)
- {
- if (valid_channels[i])
+ d_num_valid_channels = valid_channels.count();
+ // Check if there is any valid channel after reading the new incoming Gnss_Synchro data
+ if (d_num_valid_channels == 0)
{
- out[i][0] = (*it2);
- out[i][0].Flag_valid_pseudorange = true;
- it2++;
+ consume(d_nchannels, epoch + 1);
+ return returned_elements;
}
- else
+
+ for (i = 0; i < d_nchannels; i++) //Discard observables with T_rx higher than the threshold
{
- out[i][0] = Gnss_Synchro();
- out[i][0].Flag_valid_pseudorange = false;
- }
- }
- if (d_dump)
- {
- // MULTIPLEXED FILE RECORDING - Record results to file
- try
- {
- double tmp_double;
- for (i = 0; i < d_nchannels; i++)
+ if (valid_channels[i])
{
- tmp_double = out[i][0].RX_time;
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
- tmp_double = out[i][0].TOW_at_current_symbol_s;
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
- tmp_double = out[i][0].Carrier_Doppler_hz;
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
- tmp_double = out[i][0].Carrier_phase_rads / GPS_TWO_PI;
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
- tmp_double = out[i][0].Pseudorange_m;
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
- tmp_double = static_cast(out[i][0].PRN);
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
- tmp_double = static_cast(out[i][0].Flag_valid_pseudorange);
- d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ clean_history(i);
+ if (d_gnss_synchro_history->size(i) < 2)
+ {
+ valid_channels[i] = false;
+ }
}
}
- catch (const std::ifstream::failure &e)
+
+ // Check if there is any valid channel after computing the time distance between the Gnss_Synchro data and the receiver time
+ d_num_valid_channels = valid_channels.count();
+ double T_rx_s_out = T_rx_s - d_latency;
+ if ((d_num_valid_channels == 0) or (T_rx_s_out < 0.0))
{
- LOG(WARNING) << "Exception writing observables dump file " << e.what();
- d_dump = false;
+ consume(d_nchannels, epoch + 1);
+ return returned_elements;
}
+
+ std::vector epoch_data;
+ for (i = 0; i < d_nchannels; i++)
+ {
+ if (valid_channels[i])
+ {
+ Gnss_Synchro interpolated_gnss_synchro = d_gnss_synchro_history->back(i);
+ if (interpolate_data(interpolated_gnss_synchro, i, T_rx_s_out))
+ {
+ epoch_data.push_back(interpolated_gnss_synchro);
+ }
+ else
+ {
+ valid_channels[i] = false;
+ }
+ }
+ }
+ d_num_valid_channels = valid_channels.count();
+ if (d_num_valid_channels == 0)
+ {
+ consume(d_nchannels, epoch + 1);
+ return returned_elements;
+ }
+ correct_TOW_and_compute_prange(epoch_data);
+ std::vector::iterator it = epoch_data.begin();
+ for (i = 0; i < d_nchannels; i++)
+ {
+ if (valid_channels[i])
+ {
+ out[i][epoch] = (*it);
+ out[i][epoch].Flag_valid_pseudorange = true;
+ it++;
+ }
+ else
+ {
+ out[i][epoch] = Gnss_Synchro();
+ out[i][epoch].Flag_valid_pseudorange = false;
+ }
+ }
+ if (d_dump)
+ {
+ // MULTIPLEXED FILE RECORDING - Record results to file
+ try
+ {
+ double tmp_double;
+ for (i = 0; i < d_nchannels; i++)
+ {
+ tmp_double = out[i][epoch].RX_time;
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ tmp_double = out[i][epoch].TOW_at_current_symbol_s;
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ tmp_double = out[i][epoch].Carrier_Doppler_hz;
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ tmp_double = out[i][epoch].Carrier_phase_rads / GPS_TWO_PI;
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ tmp_double = out[i][epoch].Pseudorange_m;
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ tmp_double = static_cast(out[i][epoch].PRN);
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ tmp_double = static_cast(out[i][epoch].Flag_valid_pseudorange);
+ d_dump_file.write(reinterpret_cast(&tmp_double), sizeof(double));
+ }
+ }
+ catch (const std::ifstream::failure &e)
+ {
+ LOG(WARNING) << "Exception writing observables dump file " << e.what();
+ d_dump = false;
+ }
+ }
+ returned_elements++;
}
- return 1;
+ consume(d_nchannels, ninput_items[d_nchannels]);
+ return returned_elements;
}
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index aedba43ab..5772464e2 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -35,12 +35,12 @@
#define GNSS_SDR_HYBRID_OBSERVABLES_CC_H
#include "gnss_synchro.h"
+#include "gnss_circular_deque.h"
#include
#include
#include
#include
-#include
-#include
+#include
class hybrid_observables_cc;
@@ -65,18 +65,20 @@ private:
friend hybrid_observables_cc_sptr
hybrid_make_observables_cc(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, std::string dump_filename);
hybrid_observables_cc(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, std::string dump_filename);
- void clean_history(std::deque& data);
+ void clean_history(unsigned int pos);
double compute_T_rx_s(const Gnss_Synchro& a);
- bool interpolate_data(Gnss_Synchro& out, std::deque& data, const double& ti);
+ bool interpolate_data(Gnss_Synchro& out, const unsigned int& ch, const double& ti);
+ void find_interp_elements(const unsigned int& ch, const double& ti);
void correct_TOW_and_compute_prange(std::vector& data);
int save_matfile();
//Tracking observable history
- std::vector> d_gnss_synchro_history;
+ Gnss_circular_deque* d_gnss_synchro_history;
boost::dynamic_bitset<> valid_channels;
double T_rx_s;
double T_rx_step_s;
double max_delta;
+ double d_latency;
bool d_dump;
unsigned int d_nchannels;
unsigned int d_num_valid_channels;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
index a774577a5..286ca0c68 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
@@ -106,8 +106,6 @@ galileo_e1b_telemetry_decoder_cc::galileo_e1b_telemetry_decoder_cc(
bool dump) : gr::block("galileo_e1b_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
index 640cbf009..8e032956e 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
@@ -183,8 +183,6 @@ galileo_e5a_telemetry_decoder_cc::galileo_e5a_telemetry_decoder_cc(
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.cc
index 0bd2fae54..ca6dc8681 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.cc
@@ -54,8 +54,6 @@ glonass_l1_ca_telemetry_decoder_cc::glonass_l1_ca_telemetry_decoder_cc(
bool dump) : gr::block("glonass_l1_ca_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
@@ -285,9 +283,6 @@ int glonass_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribu
LOG(INFO) << "Starting string decoder for GLONASS L1 C/A SAT " << this->d_satellite;
d_preamble_index = d_sample_counter; //record the preamble sample stamp
d_stat = 2;
- // send asynchronous message to tracking to inform of frame sync and extend correlation time
- pmt::pmt_t value = pmt::from_double(static_cast(d_preamble_time_samples) / static_cast(d_symbol_history.at(0).fs) - 0.001);
- this->message_port_pub(pmt::mp("preamble_timestamp_s"), value);
}
else
{
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.cc
index 2b168a89c..e2a362974 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.cc
@@ -53,8 +53,6 @@ glonass_l2_ca_telemetry_decoder_cc::glonass_l2_ca_telemetry_decoder_cc(
bool dump) : gr::block("glonass_l2_ca_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
@@ -284,9 +282,6 @@ int glonass_l2_ca_telemetry_decoder_cc::general_work(int noutput_items __attribu
LOG(INFO) << "Starting string decoder for GLONASS L2 C/A SAT " << this->d_satellite;
d_preamble_index = d_sample_counter; //record the preamble sample stamp
d_stat = 2;
- // send asynchronous message to tracking to inform of frame sync and extend correlation time
- pmt::pmt_t value = pmt::from_double(static_cast(d_preamble_time_samples) / static_cast(d_symbol_history.at(0).fs) - 0.001);
- this->message_port_pub(pmt::mp("preamble_timestamp_s"), value);
}
else
{
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index 580bc8bdc..955d180d7 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -54,8 +54,6 @@ gps_l1_ca_telemetry_decoder_cc::gps_l1_ca_telemetry_decoder_cc(
bool dump) : gr::block("gps_navigation_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
@@ -105,6 +103,10 @@ gps_l1_ca_telemetry_decoder_cc::gps_l1_ca_telemetry_decoder_cc(
flag_PLL_180_deg_phase_locked = false;
d_preamble_time_samples = 0;
d_TOW_at_current_symbol_ms = 0;
+ d_symbol_history.resize(GPS_CA_PREAMBLE_LENGTH_SYMBOLS + 1); // Change fixed buffer size
+ d_symbol_history.clear(); // Clear all the elements in the buffer
+ d_make_correlation = true;
+ d_symbol_counter_corr = 0;
}
@@ -168,7 +170,7 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
unsigned int required_symbols = GPS_CA_PREAMBLE_LENGTH_SYMBOLS;
d_flag_preamble = false;
- if (d_symbol_history.size() > required_symbols)
+ if ((d_symbol_history.size() > required_symbols) and (d_make_correlation or !d_flag_frame_sync))
{
//******* preamble correlation ********
for (unsigned int i = 0; i < GPS_CA_PREAMBLE_LENGTH_SYMBOLS; i++)
@@ -177,19 +179,22 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
{
if (d_symbol_history.at(i).Prompt_I < 0) // symbols clipping
{
- corr_value -= d_preambles_symbols[i] * d_symbol_history.at(i).correlation_length_ms;
+ corr_value -= d_preambles_symbols[i];
}
else
{
- corr_value += d_preambles_symbols[i] * d_symbol_history.at(i).correlation_length_ms;
+ corr_value += d_preambles_symbols[i];
}
}
- if (corr_value >= GPS_CA_PREAMBLE_LENGTH_SYMBOLS) break;
+ }
+ if (std::abs(corr_value) >= GPS_CA_PREAMBLE_LENGTH_SYMBOLS)
+ {
+ d_symbol_counter_corr++;
}
}
//******* frame sync ******************
- if (abs(corr_value) == GPS_CA_PREAMBLE_LENGTH_SYMBOLS)
+ if (std::abs(corr_value) == GPS_CA_PREAMBLE_LENGTH_SYMBOLS)
{
//TODO: Rewrite with state machine
if (d_stat == 0)
@@ -206,18 +211,17 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
}
else if (d_stat == 1) //check 6 seconds of preamble separation
{
- preamble_diff_ms = round(((static_cast(d_symbol_history.at(0).Tracking_sample_counter) - d_preamble_time_samples) / static_cast(d_symbol_history.at(0).fs)) * 1000.0);
- if (abs(preamble_diff_ms - GPS_SUBFRAME_MS) < 1)
+ preamble_diff_ms = std::round(((static_cast(d_symbol_history.at(0).Tracking_sample_counter) - d_preamble_time_samples) / static_cast(d_symbol_history.at(0).fs)) * 1000.0);
+ if (std::abs(preamble_diff_ms - GPS_SUBFRAME_MS) < 1)
{
DLOG(INFO) << "Preamble confirmation for SAT " << this->d_satellite;
d_GPS_FSM.Event_gps_word_preamble();
d_flag_preamble = true;
+ d_make_correlation = false;
+ d_symbol_counter_corr = 0;
d_preamble_time_samples = d_symbol_history.at(0).Tracking_sample_counter; // record the PRN start sample index associated to the preamble
if (!d_flag_frame_sync)
{
- // send asynchronous message to tracking to inform of frame sync and extend correlation time
- pmt::pmt_t value = pmt::from_double(static_cast(d_preamble_time_samples) / static_cast(d_symbol_history.at(0).fs) - 0.001);
- this->message_port_pub(pmt::mp("preamble_timestamp_s"), value);
d_flag_frame_sync = true;
if (corr_value < 0)
{
@@ -236,6 +240,11 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
}
else
{
+ d_symbol_counter_corr++;
+ if (d_symbol_counter_corr > (GPS_SUBFRAME_MS - GPS_CA_TELEMETRY_SYMBOLS_PER_BIT))
+ {
+ d_make_correlation = true;
+ }
if (d_stat == 1)
{
preamble_diff_ms = round(((static_cast(d_symbol_history.at(0).Tracking_sample_counter) - static_cast(d_preamble_time_samples)) / static_cast(d_symbol_history.at(0).fs)) * 1000.0);
@@ -245,6 +254,8 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
d_stat = 0; //lost of frame sync
d_flag_frame_sync = false;
flag_TOW_set = false;
+ d_make_correlation = true;
+ d_symbol_counter_corr = 0;
}
}
}
@@ -395,11 +406,6 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
}
}
- // remove used symbols from history
- if (d_symbol_history.size() > required_symbols)
- {
- d_symbol_history.pop_front();
- }
//3. Make the output (copy the object contents to the GNURadio reserved memory)
*out[0] = current_symbol;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
index 8904f7e85..8e3600e3a 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
@@ -36,9 +36,9 @@
#include "gnss_satellite.h"
#include "gnss_synchro.h"
#include
-#include
#include
#include
+#include
class gps_l1_ca_telemetry_decoder_cc;
@@ -79,11 +79,15 @@ private:
bool d_flag_frame_sync;
// symbols
- std::deque d_symbol_history;
+ boost::circular_buffer d_symbol_history;
double d_symbol_accumulator;
short int d_symbol_accumulator_counter;
+ // symbol counting
+ bool d_make_correlation;
+ unsigned int d_symbol_counter_corr;
+
//bits and frame
unsigned short int d_frame_bit_index;
unsigned int d_GPS_frame_4bytes;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
index 0325041d3..dee30987e 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
@@ -55,8 +55,6 @@ gps_l2c_telemetry_decoder_cc::gps_l2c_telemetry_decoder_cc(
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
index af9666c03..1cfd20162 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
@@ -56,8 +56,6 @@ gps_l5_telemetry_decoder_cc::gps_l5_telemetry_decoder_cc(
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
index 672dbb101..194db3c11 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
@@ -59,8 +59,6 @@ sbas_l1_telemetry_decoder_cc::sbas_l1_telemetry_decoder_cc(
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
- // Telemetry Bit transition synchronization port out
- this->message_port_register_out(pmt::mp("preamble_timestamp_s"));
// Ephemeris data port out
this->message_port_register_out(pmt::mp("telemetry"));
// initialize internal vars
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index 4ae6f8195..d10af3177 100755
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -82,7 +82,6 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(dllpllconf_t conf_) : gr::block("dl
{
trk_parameters = conf_;
// Telemetry bit synchronization message port input
- this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
this->message_port_register_out(pmt::mp("events"));
this->set_relative_rate(1.0 / static_cast(trk_parameters.vector_length));
@@ -362,6 +361,14 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(dllpllconf_t conf_) : gr::block("dl
d_code_phase_samples = 0.0;
d_last_prompt = gr_complex(0.0, 0.0);
d_state = 0; // initial state: standby
+
+ signal_pretty_name["1C"] = "L1 C/A";
+ signal_pretty_name["1B"] = "E1";
+ signal_pretty_name["1G"] = "L1 C/A";
+ signal_pretty_name["2S"] = "L2C";
+ signal_pretty_name["2G"] = "L2 C/A";
+ signal_pretty_name["5X"] = "E5a";
+ signal_pretty_name["L5"] = "L5";
}
@@ -504,7 +511,7 @@ void dll_pll_veml_tracking::start_tracking()
d_code_loop_filter.set_pdi(static_cast(d_code_period));
// DEBUG OUTPUT
- std::cout << "Tracking of " << systemName << " " << signal_type << " signal started on channel " << d_channel << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
+ std::cout << "Tracking of " << systemName << " " << signal_pretty_name[signal_type] << " signal started on channel " << d_channel << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
LOG(INFO) << "Starting tracking of satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << " on channel " << d_channel;
// enable tracking pull-in
@@ -1256,8 +1263,8 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
next_state = acquire_secondary();
if (next_state)
{
- std::cout << "Secondary code locked for CH " << d_channel
- << " : Satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
+ std::cout << systemName << " " << signal_pretty_name[signal_type] << " secondary code locked in channel " << d_channel
+ << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
}
d_Prompt_buffer_deque.pop_front();
@@ -1318,12 +1325,12 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
d_carrier_loop_filter.set_pdi(new_correlation_time);
d_code_loop_filter.set_pdi(new_correlation_time);
d_state = 3; // next state is the extended correlator integrator
- LOG(INFO) << "Enabled " << trk_parameters.extend_correlation_symbols << " [symbols] extended correlator for CH "
+ LOG(INFO) << "Enabled " << trk_parameters.extend_correlation_symbols * static_cast(d_code_period * 1000.0) << " ms extended correlator in channel "
<< d_channel
- << " : Satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN);
- std::cout << "Enabled " << trk_parameters.extend_correlation_symbols << " [symbols] extended correlator for CH "
+ << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN);
+ std::cout << "Enabled " << trk_parameters.extend_correlation_symbols * static_cast(d_code_period * 1000.0) << " ms extended correlator in channel "
<< d_channel
- << " : Satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
+ << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl;
// Set narrow taps delay values [chips]
d_code_loop_filter.set_DLL_BW(trk_parameters.dll_bw_narrow_hz);
d_carrier_loop_filter.set_PLL_BW(trk_parameters.pll_bw_narrow_hz);
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
index e9e41ccbc..89f71a99a 100755
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
@@ -38,6 +38,7 @@
#include
#include
#include
+#include