[hamradio-commits] [gnss-sdr] 29/149: Cleaning includes
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:42:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit d0ac06d71dbb7d2c47a9182effd1c95e31c291a1
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Mon Jan 4 22:56:52 2016 +0100
Cleaning includes
---
.../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc | 3 -
.../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h | 5 +-
.../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc | 4 +-
.../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h | 4 -
.../PVT/gnuradio_blocks/hybrid_pvt_cc.cc | 3 -
src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h | 3 -
.../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 11 +-
.../gps_l1_ca_pcps_acquisition_fine_doppler.h | 1 -
.../adapters/gps_l1_ca_pcps_assisted_acquisition.h | 1 -
...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 1 -
...galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 3 -
.../galileo_pcps_8ms_acquisition_cc.h | 3 -
.../gnuradio_blocks/pcps_acquisition_cc.cc | 4 +-
.../gnuradio_blocks/pcps_acquisition_cc.h | 1 -
.../pcps_acquisition_fine_doppler_cc.cc | 1 -
.../pcps_acquisition_fine_doppler_cc.h | 3 -
.../gnuradio_blocks/pcps_assisted_acquisition_cc.h | 3 -
.../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 4 -
.../pcps_multithread_acquisition_cc.cc | 2 +
.../pcps_multithread_acquisition_cc.h | 3 -
.../gnuradio_blocks/pcps_opencl_acquisition_cc.cc | 1 -
.../gnuradio_blocks/pcps_opencl_acquisition_cc.h | 3 -
.../pcps_quicksync_acquisition_cc.cc | 1 -
.../pcps_quicksync_acquisition_cc.h | 3 -
.../gnuradio_blocks/pcps_tong_acquisition_cc.h | 3 -
.../gnuradio_blocks/galileo_e1_observables_cc.cc | 4 +-
.../gnuradio_blocks/galileo_e1_observables_cc.h | 11 +-
.../gnuradio_blocks/gps_l1_ca_observables_cc.cc | 3 +-
.../gnuradio_blocks/gps_l1_ca_observables_cc.h | 4 -
.../gnuradio_blocks/hybrid_observables_cc.cc | 3 +-
.../gnuradio_blocks/hybrid_observables_cc.h | 8 +-
.../gnuradio_blocks/mixed_observables_cc.cc | 3 +-
.../gnuradio_blocks/mixed_observables_cc.h | 4 -
.../gnuradio_blocks/unpack_2bit_samples.cc | 1 -
.../gnuradio_blocks/unpack_2bit_samples.h | 19 +-
.../unpack_byte_2bit_cpx_samples.cc | 1 -
.../gnuradio_blocks/unpack_byte_2bit_cpx_samples.h | 3 +-
.../gnuradio_blocks/unpack_byte_2bit_samples.cc | 1 -
.../gnuradio_blocks/unpack_intspir_1bit_samples.cc | 1 -
.../adapters/galileo_e1b_telemetry_decoder.cc | 6 +-
.../adapters/galileo_e1b_telemetry_decoder.h | 2 +-
.../adapters/galileo_e5a_telemetry_decoder.cc | 10 +-
.../adapters/galileo_e5a_telemetry_decoder.h | 2 +-
.../adapters/gps_l1_ca_telemetry_decoder.cc | 1 +
.../adapters/gps_l2_m_telemetry_decoder.cc | 3 +-
.../adapters/sbas_l1_telemetry_decoder.cc | 1 +
.../galileo_e1b_telemetry_decoder_cc.cc | 5 +-
.../galileo_e5a_telemetry_decoder_cc.cc | 664 +++++++++++----------
.../gps_l1_ca_telemetry_decoder_cc.cc | 1 -
.../adapters/galileo_e1_dll_pll_veml_tracking.cc | 1 -
.../adapters/galileo_e1_tcp_connector_tracking.cc | 1 -
.../galileo_volk_e1_dll_pll_veml_tracking.cc | 1 -
.../galileo_e1_dll_pll_veml_tracking_cc.h | 4 -
.../galileo_e1_tcp_connector_tracking_cc.h | 3 -
.../galileo_e5a_dll_pll_tracking_cc.h | 3 -
.../galileo_volk_e1_dll_pll_veml_tracking_cc.h | 3 -
.../gps_l1_ca_dll_fll_pll_tracking_cc.h | 3 -
.../gps_l1_ca_dll_pll_c_aid_tracking_cc.h | 3 -
.../gps_l1_ca_dll_pll_optim_tracking_cc.h | 3 -
.../gps_l1_ca_dll_pll_tracking_cc.h | 3 -
.../gps_l1_ca_dll_pll_tracking_gpu_cc.h | 3 -
.../gps_l1_ca_tcp_connector_tracking_cc.h | 3 -
.../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h | 2 -
src/algorithms/tracking/libs/correlator.cc | 2 +-
src/algorithms/tracking/libs/correlator.h | 1 -
65 files changed, 378 insertions(+), 496 deletions(-)
diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
index c071cb2..eca8f01 100644
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
@@ -30,11 +30,8 @@
#include "galileo_e1_pvt_cc.h"
#include <algorithm>
-#include <bitset>
#include <iostream>
#include <map>
-#include <sstream>
-#include <vector>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <gnuradio/gr_complex.h>
#include <gnuradio/io_signature.h>
diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
index 5878f5c..766aedf 100644
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
@@ -32,11 +32,8 @@
#define GNSS_SDR_GALILEO_E1_PVT_CC_H
#include <fstream>
-#include <queue>
-#include <utility>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
+#include <utility>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "nmea_printer.h"
diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
index ec5ddfc..834da42 100644
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
@@ -29,11 +29,9 @@
#include "gps_l1_ca_pvt_cc.h"
#include <algorithm>
-#include <bitset>
#include <iostream>
#include <map>
-#include <sstream>
-#include <vector>
+#include <utility>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <gnuradio/gr_complex.h>
#include <gnuradio/io_signature.h>
diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
index 3a87378..4739468 100644
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
@@ -31,11 +31,7 @@
#define GNSS_SDR_GPS_L1_CA_PVT_CC_H
#include <fstream>
-#include <queue>
-#include <utility>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "nmea_printer.h"
diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
index dd63788..e1aebd7 100644
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
@@ -30,11 +30,8 @@
#include "hybrid_pvt_cc.h"
#include <algorithm>
-#include <bitset>
#include <iostream>
#include <map>
-#include <sstream>
-#include <vector>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <gnuradio/gr_complex.h>
#include <gnuradio/io_signature.h>
diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
index 4582df9..b95928c 100644
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
@@ -32,11 +32,8 @@
#define GNSS_SDR_HYBRID_PVT_CC_H
#include <fstream>
-#include <queue>
#include <utility>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "nmea_printer.h"
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
index 512c9f4..7a0a365 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
@@ -33,7 +33,6 @@
*/
#include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
-#include <iostream>
#include <glog/logging.h>
#include <gnuradio/io_signature.h>
#include "gps_sdr_signal_processing.h"
@@ -46,17 +45,14 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
ConfigurationInterface* configuration, std::string role,
unsigned int in_streams, unsigned int out_streams,
boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(
- queue)
+ role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
{
-
std::string default_item_type = "gr_complex";
std::string default_dump_filename = "./data/acquisition.dat";
DLOG(INFO) << "role " << role;
- 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);
if_ = configuration->property(role + ".ifreq", 0);
@@ -65,8 +61,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
doppler_min_ = configuration->property(role + ".doppler_min", -5000);
sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
max_dwells_= configuration->property(role + ".max_dwells", 1);
- dump_filename_ = configuration->property(role + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
//--- Find number of samples per spreading code -------------------------
vector_length_ = round(fs_in_
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h
index 7b8de54..49364a4 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h
@@ -36,7 +36,6 @@
#include <string>
#include <gnuradio/msg_queue.h>
-#include <gnuradio/blocks/stream_to_vector.h>
#include "gnss_synchro.h"
#include "acquisition_interface.h"
#include "pcps_acquisition_fine_doppler_cc.h"
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
index b853d83..0827fa2 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h
@@ -36,7 +36,6 @@
#include <string>
#include <gnuradio/msg_queue.h>
-#include <gnuradio/blocks/stream_to_vector.h>
#include "gnss_synchro.h"
#include "acquisition_interface.h"
#include "pcps_assisted_acquisition_cc.h"
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index 2871428..77bdcd4 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -36,7 +36,6 @@
*/
#include "galileo_e5a_noncoherent_iq_acquisition_caf_cc.h"
-#include <sys/time.h>
#include <sstream>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
index 43097fa..74bf9f3 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
@@ -39,10 +39,7 @@
#define GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_CC_H_
#include <fstream>
-#include <queue>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
index 0867b9a..693c8d1 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
@@ -34,9 +34,6 @@
#include <fstream>
#include <string>
-#include <queue>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
index 5c95102..014bd79 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
@@ -33,14 +33,14 @@
*/
#include "pcps_acquisition_cc.h"
-#include <sys/time.h>
#include <sstream>
+#include <boost/filesystem.hpp>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
#include <volk/volk.h>
#include "gnss_signal_processing.h"
#include "control_message_factory.h"
-#include <boost/filesystem.hpp>
+
using google::LogMessage;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
index 168e62c..db2d27f 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
@@ -51,7 +51,6 @@
#define GNSS_SDR_PCPS_ACQUISITION_CC_H_
#include <fstream>
-#include <queue>
#include <string>
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
index 2893192..06e1fe5 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
@@ -42,7 +42,6 @@
#include "gps_sdr_signal_processing.h"
#include "control_message_factory.h"
-
using google::LogMessage;
pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc(
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
index c394191..289fd10 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
@@ -49,10 +49,7 @@
#define GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
#include <fstream>
-#include <queue>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
index 37366a2..f5fa355 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
@@ -49,10 +49,7 @@
#define GNSS_SDR_PCPS_ASSISTED_ACQUISITION_CC_H_
#include <fstream>
-#include <queue>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
index 3fcf899..80807cc 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
@@ -38,11 +38,7 @@
#define GNSS_SDR_PCPS_CCCWSR_ACQUISITION_CC_H_
#include <fstream>
-#include <queue>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/shared_array.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc
index c3c4a24..6aa66c8 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc
@@ -34,6 +34,8 @@
#include "pcps_multithread_acquisition_cc.h"
#include <sstream>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
#include <glog/logging.h>
#include <gnuradio/io_signature.h>
#include <volk/volk.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
index 86261aa..ed4398b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h
@@ -52,11 +52,8 @@
#include <algorithm>
#include <fstream>
-#include <queue>
#include <string>
#include <vector>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
index 472932c..81dea6d 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@@ -49,7 +49,6 @@
*/
#include "pcps_opencl_acquisition_cc.h"
-#include <sys/time.h>
#include <algorithm>
#include <fstream>
#include <iostream>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
index 06eb012..f91a7ea 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
@@ -52,11 +52,8 @@
#define GNSS_SDR_PCPS_OPENCL_ACQUISITION_CC_H_
#include <fstream>
-#include <queue>
#include <string>
#include <vector>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index 563e884..44a9a09 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -29,7 +29,6 @@
*/
#include "pcps_quicksync_acquisition_cc.h"
-#include <ctime>
#include <cmath>
#include <sstream>
#include <gnuradio/io_signature.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
index 88d37f0..4f68b36 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -52,13 +52,10 @@
#define GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_
#include <fstream>
-#include <queue>
#include <string>
#include <algorithm>
#include <functional>
#include <assert.h>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
index 6c738e4..2528ba7 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -52,10 +52,7 @@
#define GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_
#include <fstream>
-#include <queue>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
index 0f5aaea..7f96fd2 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
@@ -32,16 +32,14 @@
#include "galileo_e1_observables_cc.h"
#include <algorithm>
-#include <bitset>
#include <cmath>
#include <iostream>
#include <map>
-#include <sstream>
+#include <utility>
#include <vector>
#include <armadillo>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
-//#include "control_message_factory.h"
#include "gnss_synchro.h"
#include "Galileo_E1.h"
#include "galileo_navigation_message.h"
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
index 0791e15..a16d9cf 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
@@ -35,19 +35,10 @@
#include <fstream>
-#include <queue>
#include <string>
-#include <utility>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
-//#include "concurrent_queue.h"
-//#include "galileo_navigation_message.h"
-//#include "rinex_printer.h"
-//#include "Galileo_E1.h"
-//#include "gnss_synchro.h"
class galileo_e1_observables_cc;
@@ -63,7 +54,7 @@ class galileo_e1_observables_cc : public gr::block
{
public:
~galileo_e1_observables_cc ();
- //void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
+
int general_work (int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
index 9a793a7..bde660b 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
@@ -29,12 +29,11 @@
#include "gps_l1_ca_observables_cc.h"
#include <algorithm>
-#include <bitset>
#include <cmath>
#include <iostream>
#include <map>
-#include <sstream>
#include <vector>
+#include <utility>
#include <armadillo>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
index 4ca64d8..174f38b 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
@@ -33,12 +33,8 @@
#include <deque>
#include <fstream>
-#include <queue>
#include <string>
-#include <utility>
#include <vector>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index 5fa1a46..52cac4e 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -31,11 +31,10 @@
#include "hybrid_observables_cc.h"
#include <algorithm>
-#include <bitset>
#include <cmath>
#include <iostream>
#include <map>
-#include <sstream>
+#include <utility>
#include <vector>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index 5cfca58..d1c049e 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -30,15 +30,11 @@
*/
-#ifndef GNSS_SDR_hybrid_observables_CC_H
-#define GNSS_SDR_hybrid_observables_CC_H
+#ifndef GNSS_SDR_HYBRID_OBSERVABLES_CC_H
+#define GNSS_SDR_HYBRID_OBSERVABLES_CC_H
#include <fstream>
-#include <queue>
#include <string>
-#include <utility>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
diff --git a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
index 161d20b..955ea22 100644
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
@@ -29,12 +29,11 @@
#include "mixed_observables_cc.h"
#include <algorithm>
-#include <bitset>
#include <cmath>
#include <iostream>
#include <map>
-#include <sstream>
#include <vector>
+#include <utility>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
#include "control_message_factory.h"
diff --git a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
index 5d41a64..884b412 100644
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
@@ -32,11 +32,7 @@
#define GNSS_SDR_MIXED_OBSERVABLES_CC_H_
#include <fstream>
-#include <queue>
#include <string>
-#include <utility>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
index 45e80be..c1cb5ab 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
@@ -30,7 +30,6 @@
#include "unpack_2bit_samples.h"
-#include <iostream>
#include <gnuradio/io_signature.h>
struct byte_2bit_struct
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
index 309025f..0e8a73d 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -68,8 +68,10 @@
#ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H
#define GNSS_SDR_UNPACK_2BIT_SAMPLES_H
+#include <cstdint>
#include <gnuradio/sync_interpolator.h>
+
class unpack_2bit_samples;
typedef boost::shared_ptr<unpack_2bit_samples> unpack_2bit_samples_sptr;
@@ -92,6 +94,13 @@ private:
size_t item_size,
bool big_endian_items,
bool reverse_interleaving);
+ bool big_endian_bytes_;
+ size_t item_size_;
+ bool big_endian_items_;
+ bool swap_endian_items_;
+ bool swap_endian_bytes_;
+ bool reverse_interleaving_;
+ std::vector< int8_t > work_buffer_;
public:
unpack_2bit_samples( bool big_endianBytes,
@@ -104,16 +113,6 @@ public:
int work (int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
-
-private:
- bool big_endian_bytes_;
- size_t item_size_;
- bool big_endian_items_;
- bool swap_endian_items_;
- bool swap_endian_bytes_;
- bool reverse_interleaving_;
- std::vector< int8_t > work_buffer_;
-
};
#endif
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc
index a330686..9a15d2d 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc
@@ -34,7 +34,6 @@
#include "unpack_byte_2bit_cpx_samples.h"
-#include <iostream>
#include <gnuradio/io_signature.h>
struct byte_2bit_struct
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
index d7513aa..f0b0328 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
@@ -50,8 +50,7 @@ unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples();
class unpack_byte_2bit_cpx_samples: public gr::sync_interpolator
{
private:
- friend unpack_byte_2bit_cpx_samples_sptr
- make_unpack_byte_2bit_cpx_samples_sptr();
+ friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr();
public:
unpack_byte_2bit_cpx_samples();
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc
index 5d535e5..0f675c9 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc
@@ -30,7 +30,6 @@
#include "unpack_byte_2bit_samples.h"
-#include <iostream>
#include <gnuradio/io_signature.h>
struct byte_2bit_struct
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc
index ddb86d8..039117b 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc
@@ -30,7 +30,6 @@
#include "unpack_intspir_1bit_samples.h"
-#include <iostream>
#include <gnuradio/io_signature.h>
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
index da98572..7fc099e 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
@@ -34,12 +34,14 @@
#include "galileo_e1b_telemetry_decoder.h"
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
+#include "configuration_interface.h"
+#include "concurrent_queue.h"
#include "galileo_ephemeris.h"
#include "galileo_almanac.h"
#include "galileo_iono.h"
#include "galileo_utc_model.h"
-#include "configuration_interface.h"
-#include "galileo_e1b_telemetry_decoder_cc.h"
+
+
extern concurrent_queue<Galileo_Ephemeris> global_galileo_ephemeris_queue;
extern concurrent_queue<Galileo_Iono> global_galileo_iono_queue;
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
index 4758abd..3553530 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
@@ -50,7 +50,7 @@ class ConfigurationInterface;
class GalileoE1BTelemetryDecoder : public TelemetryDecoderInterface
{
public:
- GalileoE1BTelemetryDecoder(ConfigurationInterface* configuration,
+ GalileoE1BTelemetryDecoder(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
index 883f0fb..37e2aec 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
@@ -35,9 +35,9 @@
*/
#include "galileo_e5a_telemetry_decoder.h"
-#include <boost/shared_ptr.hpp>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
+#include "concurrent_queue.h"
#include "galileo_ephemeris.h"
#include "galileo_almanac.h"
#include "galileo_iono.h"
@@ -96,16 +96,16 @@ void GalileoE5aTelemetryDecoder::set_satellite(Gnss_Satellite satellite)
void GalileoE5aTelemetryDecoder::connect(gr::top_block_sptr top_block)
{
- if(top_block) { /* top_block is not null */};
- // Nothing to connect internally
+ if(top_block) { /* top_block is not null */};
+ // Nothing to connect internally
DLOG(INFO) << "nothing to connect internally";
}
void GalileoE5aTelemetryDecoder::disconnect(gr::top_block_sptr top_block)
{
- if(top_block) { /* top_block is not null */};
- // Nothing to disconnect
+ if(top_block) { /* top_block is not null */};
+ // Nothing to disconnect
}
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
index bc3921b..5187ad8 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
@@ -51,7 +51,7 @@ class ConfigurationInterface;
class GalileoE5aTelemetryDecoder: public TelemetryDecoderInterface
{
public:
- GalileoE5aTelemetryDecoder(ConfigurationInterface* configuration,
+ GalileoE5aTelemetryDecoder(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
index 90408f5..4fa5b1f 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
@@ -33,6 +33,7 @@
#include "gps_l1_ca_telemetry_decoder.h"
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
+#include "concurrent_queue.h"
#include "gps_ephemeris.h"
#include "gps_almanac.h"
#include "gps_iono.h"
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.cc
index 037bc77..61bea26 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.cc
@@ -33,12 +33,13 @@
#include "gps_l2_m_telemetry_decoder.h"
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
+#include "concurrent_queue.h"
#include "gps_cnav_ephemeris.h"
#include "gps_almanac.h"
#include "gps_cnav_iono.h"
#include "gps_cnav_utc_model.h"
#include "configuration_interface.h"
-#include "concurrent_queue.h"
+
extern concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_queue;
extern concurrent_queue<Gps_CNAV_Iono> global_gps_cnav_iono_queue;
diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
index ee48156..a234d3a 100644
--- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
@@ -33,6 +33,7 @@
#include "sbas_l1_telemetry_decoder.h"
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
+#include "concurrent_queue.h"
#include "sbas_telemetry_data.h"
#include "sbas_ionospheric_correction.h"
#include "sbas_satellite_correction.h"
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 757ced1..bea64c6 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
@@ -31,10 +31,9 @@
#include "galileo_e1b_telemetry_decoder_cc.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
#include <iostream>
-#include <sstream>
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
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 b63ba39..ed6850c 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
@@ -34,20 +34,17 @@
*/
#include "galileo_e5a_telemetry_decoder_cc.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
#include <iostream>
-#include <sstream>
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
#include "control_message_factory.h"
-//#include "galileo_navigation_message.h"
#include "galileo_fnav_message.h"
#include "gnss_synchro.h"
#include "convolutional.h"
-//#include <volk/volk.h>
-//#include "galileo_e1b_telemetry_decoder_cc.h"
+
#define CRC_ERROR_LIMIT 6
@@ -60,6 +57,7 @@ galileo_e5a_make_telemetry_decoder_cc(Gnss_Satellite satellite, boost::shared_pt
return galileo_e5a_telemetry_decoder_cc_sptr(new galileo_e5a_telemetry_decoder_cc(satellite, queue, dump));
}
+
void galileo_e5a_telemetry_decoder_cc::forecast (int noutput_items, gr_vector_int &ninput_items_required)
{
//ninput_items_required[0] = GALILEO_FNAV_SAMPLES_PER_PAGE; // set the required sample history
@@ -69,9 +67,10 @@ void galileo_e5a_telemetry_decoder_cc::forecast (int noutput_items, gr_vector_in
}
}
+
void galileo_e5a_telemetry_decoder_cc::viterbi_decoder(double *page_part_symbols, int *page_part_bits)
{
-// int CodeLength = 240;
+ // int CodeLength = 240;
int CodeLength = 488;
int DataLength;
int nn, KK, mm, max_states;
@@ -81,8 +80,8 @@ void galileo_e5a_telemetry_decoder_cc::viterbi_decoder(double *page_part_symbols
KK = 7; // Constraint Length
g_encoder[0] = 121; // Polynomial G1
g_encoder[1] = 91; // Polynomial G2
-// g_encoder[0] = 171; // Polynomial G1
-// g_encoder[1] = 133; // Polynomial G2
+ // g_encoder[0] = 171; // Polynomial G1
+ // g_encoder[1] = 133; // Polynomial G2
mm = KK - 1;
max_states = 1 << mm; // 2^mm
@@ -121,6 +120,7 @@ void galileo_e5a_telemetry_decoder_cc::deinterleaver(int rows, int cols, double
}
}
+
void galileo_e5a_telemetry_decoder_cc::decode_word(double *page_symbols,int frame_length)
{
double page_symbols_deint[frame_length];
@@ -169,25 +169,25 @@ void galileo_e5a_telemetry_decoder_cc::decode_word(double *page_symbols,int fram
}
// 4. Push the new navigation data to the queues
- if (d_nav.have_new_ephemeris() == true)
- {
- // get ephemeris object for this SV
- Galileo_Ephemeris ephemeris = d_nav.get_ephemeris();//notice that the read operation will clear the valid flag
- //std::cout<<"New Galileo Ephemeris received for SV "<<d_satellite.get_PRN()<<std::endl;
- d_ephemeris_queue->push(ephemeris);
- }
- if (d_nav.have_new_iono_and_GST() == true)
- {
- Galileo_Iono iono = d_nav.get_iono(); //notice that the read operation will clear the valid flag
- //std::cout<<"New Galileo IONO model (and UTC) received for SV "<<d_satellite.get_PRN()<<std::endl;
- d_iono_queue->push(iono);
- }
- if (d_nav.have_new_utc_model() == true)
- {
- Galileo_Utc_Model utc_model = d_nav.get_utc_model(); //notice that the read operation will clear the valid flag
- //std::cout<<"New Galileo UTC model received for SV "<<d_satellite.get_PRN()<<std::endl;
- d_utc_model_queue->push(utc_model);
- }
+ if (d_nav.have_new_ephemeris() == true)
+ {
+ // get ephemeris object for this SV
+ Galileo_Ephemeris ephemeris = d_nav.get_ephemeris();//notice that the read operation will clear the valid flag
+ //std::cout<<"New Galileo Ephemeris received for SV "<<d_satellite.get_PRN()<<std::endl;
+ d_ephemeris_queue->push(ephemeris);
+ }
+ if (d_nav.have_new_iono_and_GST() == true)
+ {
+ Galileo_Iono iono = d_nav.get_iono(); //notice that the read operation will clear the valid flag
+ //std::cout<<"New Galileo IONO model (and UTC) received for SV "<<d_satellite.get_PRN()<<std::endl;
+ d_iono_queue->push(iono);
+ }
+ if (d_nav.have_new_utc_model() == true)
+ {
+ Galileo_Utc_Model utc_model = d_nav.get_utc_model(); //notice that the read operation will clear the valid flag
+ //std::cout<<"New Galileo UTC model received for SV "<<d_satellite.get_PRN()<<std::endl;
+ d_utc_model_queue->push(utc_model);
+ }
}
@@ -195,8 +195,8 @@ galileo_e5a_telemetry_decoder_cc::galileo_e5a_telemetry_decoder_cc(
Gnss_Satellite satellite,
boost::shared_ptr<gr::msg_queue> queue,
bool dump) :
- gr::block("galileo_e5a_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
- gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
+ gr::block("galileo_e5a_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)),
+ gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
{
// initialize internal vars
d_queue = queue;
@@ -208,38 +208,38 @@ galileo_e5a_telemetry_decoder_cc::galileo_e5a_telemetry_decoder_cc(
// set the preamble
//unsigned short int preambles_bits[GALILEO_FNAV_PREAMBLE_LENGTH_BITS] = GALILEO_FNAV_PREAMBLE;
for (int i = 0; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
- {
- if (GALILEO_FNAV_PREAMBLE.at(i) == '0')
- {
- d_preamble_bits[i] = 1;
- }
- else
- {
- d_preamble_bits[i] = -1;
- }
- }
-
-// memcpy((unsigned short int*)this->d_preambles_bits, (unsigned short int*)preambles_bits, GALILEO_FNAV_PREAMBLE_LENGTH_BITS*sizeof(unsigned short int));
-
-// // preamble bits to sampled symbols
-// d_preambles_symbols = (signed int*)malloc(sizeof(signed int) * GALILEO_FNAV_SAMPLES_PER_PREAMBLE);
-// int n = 0;
-// for (int i = 0; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
-// {
-// for (unsigned int j = 0; j < GALILEO_FNAV_SAMPLES_PER_SYMBOL; j++)
-// {
-// if (d_preambles_bits[i] == 1)
-// {
-// d_preambles_symbols[n] = 1;
-// }
-// else
-// {
-// d_preambles_symbols[n] = -1;
-// }
-// n++;
-// }
-// }
-//
+ {
+ if (GALILEO_FNAV_PREAMBLE.at(i) == '0')
+ {
+ d_preamble_bits[i] = 1;
+ }
+ else
+ {
+ d_preamble_bits[i] = -1;
+ }
+ }
+
+ // memcpy((unsigned short int*)this->d_preambles_bits, (unsigned short int*)preambles_bits, GALILEO_FNAV_PREAMBLE_LENGTH_BITS*sizeof(unsigned short int));
+
+ // // preamble bits to sampled symbols
+ // d_preambles_symbols = (signed int*)malloc(sizeof(signed int) * GALILEO_FNAV_SAMPLES_PER_PREAMBLE);
+ // int n = 0;
+ // for (int i = 0; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
+ // {
+ // for (unsigned int j = 0; j < GALILEO_FNAV_SAMPLES_PER_SYMBOL; j++)
+ // {
+ // if (d_preambles_bits[i] == 1)
+ // {
+ // d_preambles_symbols[n] = 1;
+ // }
+ // else
+ // {
+ // d_preambles_symbols[n] = -1;
+ // }
+ // n++;
+ // }
+ // }
+ //
d_sample_counter = 0;
d_state = 0;
d_preamble_lock = false;
@@ -266,11 +266,13 @@ galileo_e5a_telemetry_decoder_cc::galileo_e5a_telemetry_decoder_cc(
flag_TOW_set = false;
}
+
galileo_e5a_telemetry_decoder_cc::~galileo_e5a_telemetry_decoder_cc()
{
d_dump_file.close();
}
+
int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items)
{
@@ -287,211 +289,211 @@ int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
*/
switch (d_state)
{
- case 0:
- {
- if (in[0][0].Prompt_I != 0)
- {
- d_current_symbol += in[0][0].Prompt_I;
- if (d_prompt_counter == GALILEO_FNAV_CODES_PER_SYMBOL - 1)
- {
- if (d_current_symbol > 0)
- {
- d_page_symbols[d_symbol_counter] = 1;
- }
- else
- {
- d_page_symbols[d_symbol_counter] = -1;
- }
- d_current_symbol = 0;
- d_symbol_counter++;
- d_prompt_counter = 0;
- if (d_symbol_counter == GALILEO_FNAV_PREAMBLE_LENGTH_BITS-1)
- {
- d_state = 1;
- }
- }
- else
- {
- d_prompt_counter++;
- }
- }
- break;
- }
- case 1:
- {
- d_current_symbol += in[0][0].Prompt_I;
- if (d_prompt_counter == GALILEO_FNAV_CODES_PER_SYMBOL - 1)
- {
- if (d_current_symbol > 0)
- {
- d_page_symbols[d_symbol_counter] = 1;
- }
- else
- {
- d_page_symbols[d_symbol_counter] = -1;
- }
-// d_page_symbols[d_symbol_counter] = d_current_symbol_float/(float)GALILEO_FNAV_CODES_PER_SYMBOL;
- d_current_symbol = 0;
- d_symbol_counter++;
- d_prompt_counter = 0;
- // **** Attempt Preamble correlation ****
- bool corr_flag=true;
- int corr_sign = 0; // sequence can be found inverted
-// corr_sign = d_preamble_bits[0] * d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS];
-// for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
-// {
-// if ((d_preamble_bits[i] * d_page_symbols[i + d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS]) != corr_sign)
-// {
-// //exit for if one bit doesn't correlate
-// corr_flag=false;
-// break;
-// }
-// }
- // check if the preamble starts positive correlated or negative correlated
- if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS] < 0) // symbols clipping
- {
- corr_sign=-d_preamble_bits[0];
- }
- else
- {
- corr_sign=d_preamble_bits[0];
- }
- // the preamble is fully correlated only if maintains corr_sign along the whole sequence
- for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
- {
- if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] < 0 && d_preamble_bits[i]+corr_sign != 0)
- {
- //exit for
- corr_flag=false;
- break;
- }
- if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] > 0 && d_preamble_bits[i]+corr_sign == 0)
- {
- //exit for
- corr_flag=false;
- break;
- }
- }
- //
- if (corr_flag==true) // preamble fully correlates
- {
- d_preamble_index = d_sample_counter - GALILEO_FNAV_CODES_PER_PREAMBLE;//record the preamble sample stamp. Remember correlation appears at the end of the preamble in this design
- LOG(INFO) << "Preamble detection for Galileo SAT " << this->d_satellite << std::endl;
- d_symbol_counter = 0; // d_page_symbols start right after preamble and finish at the end of next preamble.
- d_state = 2; // preamble lock
- }
- if (d_symbol_counter >= GALILEO_FNAV_SYMBOLS_PER_PAGE + GALILEO_FNAV_PREAMBLE_LENGTH_BITS)
- {
- d_symbol_counter = GALILEO_FNAV_PREAMBLE_LENGTH_BITS; // prevents overflow
- }
- }
- else
- {
- d_prompt_counter++;
- }
- break;
- }
- case 2:
- {
- d_current_symbol += in[0][0].Prompt_I;
- if (d_prompt_counter == GALILEO_FNAV_CODES_PER_SYMBOL - 1)
- {
- if (d_current_symbol > 0)
- {
- d_page_symbols[d_symbol_counter] = 1;
- }
- else
- {
- d_page_symbols[d_symbol_counter] = -1;
- }
-// d_page_symbols[d_symbol_counter] = d_current_symbol_float/(float)GALILEO_FNAV_CODES_PER_SYMBOL;
- d_current_symbol = 0;
- d_symbol_counter++;
- d_prompt_counter = 0;
- // At the right sample stamp, check preamble synchro
- if (d_sample_counter == d_preamble_index + GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE)
- {
- // **** Attempt Preamble correlation ****
- bool corr_flag = true;
- int corr_sign = 0; // sequence can be found inverted
-// corr_sign = d_preamble_bits[0] * d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS];
-// for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
-// {
-// if ((d_preamble_bits[i] * d_page_symbols[i + d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS]) != corr_sign)
-// {
-// //exit for if one bit doesn't correlate
-// corr_flag=false;
-// break;
-// }
-// }
- // check if the preamble starts positive correlated or negative correlated
- if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS] < 0) // symbols clipping
- {
- corr_sign=-d_preamble_bits[0];
- }
- else
- {
- corr_sign=d_preamble_bits[0];
- }
- // the preamble is fully correlated only if maintains corr_sign along the whole sequence
- for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
- {
- if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] < 0 && d_preamble_bits[i]+corr_sign != 0)
- {
- //exit for
- corr_flag=false;
- break;
- }
- if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] > 0 && d_preamble_bits[i]+corr_sign == 0)
- {
- //exit for
- corr_flag=false;
- break;
- }
- }
- //
- if (corr_flag==true) // NEW PREAMBLE RECEIVED. DECODE PAGE
- {
- d_preamble_index = d_sample_counter - GALILEO_FNAV_CODES_PER_PREAMBLE;//record the preamble sample stamp
- // DECODE WORD
- decode_word(d_page_symbols, GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS);
- // CHECK CRC
- if (d_nav.flag_CRC_test == true)
- {
- d_CRC_error_counter = 0;
- d_flag_preamble = true; //valid preamble indicator (initialized to false every work())
- d_preamble_time_seconds = in[0][0].Tracking_timestamp_secs - (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD); //record the PRN start sample index associated to the preamble start.
- if (!d_flag_frame_sync)
- {
- d_flag_frame_sync = true;
- LOG(INFO) <<" Frame sync SAT " << this->d_satellite << " with preamble start at " << d_preamble_time_seconds << " [s]";
- }
- d_symbol_counter = 0; // d_page_symbols start right after preamble and finish at the end of next preamble.
- }
- else
- {
- d_CRC_error_counter++;
- if (d_CRC_error_counter > CRC_ERROR_LIMIT)
- {
- LOG(INFO) << "Lost of frame sync SAT " << this->d_satellite;
- d_state = 1;
- d_symbol_counter = GALILEO_FNAV_PREAMBLE_LENGTH_BITS; // prevents overflow
- d_flag_frame_sync = false;
- }
- else
- {
- d_symbol_counter = 0; // d_page_symbols start right after preamble and finish at the end of next preamble.
- }
- }
- }
- }
- }
- else
- {
- d_prompt_counter++;
- }
- break;
- }
+ case 0:
+ {
+ if (in[0][0].Prompt_I != 0)
+ {
+ d_current_symbol += in[0][0].Prompt_I;
+ if (d_prompt_counter == GALILEO_FNAV_CODES_PER_SYMBOL - 1)
+ {
+ if (d_current_symbol > 0)
+ {
+ d_page_symbols[d_symbol_counter] = 1;
+ }
+ else
+ {
+ d_page_symbols[d_symbol_counter] = -1;
+ }
+ d_current_symbol = 0;
+ d_symbol_counter++;
+ d_prompt_counter = 0;
+ if (d_symbol_counter == GALILEO_FNAV_PREAMBLE_LENGTH_BITS - 1)
+ {
+ d_state = 1;
+ }
+ }
+ else
+ {
+ d_prompt_counter++;
+ }
+ }
+ break;
+ }
+ case 1:
+ {
+ d_current_symbol += in[0][0].Prompt_I;
+ if (d_prompt_counter == GALILEO_FNAV_CODES_PER_SYMBOL - 1)
+ {
+ if (d_current_symbol > 0)
+ {
+ d_page_symbols[d_symbol_counter] = 1;
+ }
+ else
+ {
+ d_page_symbols[d_symbol_counter] = -1;
+ }
+ // d_page_symbols[d_symbol_counter] = d_current_symbol_float/(float)GALILEO_FNAV_CODES_PER_SYMBOL;
+ d_current_symbol = 0;
+ d_symbol_counter++;
+ d_prompt_counter = 0;
+ // **** Attempt Preamble correlation ****
+ bool corr_flag=true;
+ int corr_sign = 0; // sequence can be found inverted
+ // corr_sign = d_preamble_bits[0] * d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS];
+ // for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
+ // {
+ // if ((d_preamble_bits[i] * d_page_symbols[i + d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS]) != corr_sign)
+ // {
+ // //exit for if one bit doesn't correlate
+ // corr_flag = false;
+ // break;
+ // }
+ // }
+ // check if the preamble starts positive correlated or negative correlated
+ if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS] < 0) // symbols clipping
+ {
+ corr_sign=-d_preamble_bits[0];
+ }
+ else
+ {
+ corr_sign=d_preamble_bits[0];
+ }
+ // the preamble is fully correlated only if maintains corr_sign along the whole sequence
+ for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
+ {
+ if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] < 0 && d_preamble_bits[i]+corr_sign != 0)
+ {
+ //exit for
+ corr_flag=false;
+ break;
+ }
+ if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] > 0 && d_preamble_bits[i]+corr_sign == 0)
+ {
+ //exit for
+ corr_flag=false;
+ break;
+ }
+ }
+ //
+ if (corr_flag==true) // preamble fully correlates
+ {
+ d_preamble_index = d_sample_counter - GALILEO_FNAV_CODES_PER_PREAMBLE;//record the preamble sample stamp. Remember correlation appears at the end of the preamble in this design
+ LOG(INFO) << "Preamble detection for Galileo SAT " << this->d_satellite << std::endl;
+ d_symbol_counter = 0; // d_page_symbols start right after preamble and finish at the end of next preamble.
+ d_state = 2; // preamble lock
+ }
+ if (d_symbol_counter >= GALILEO_FNAV_SYMBOLS_PER_PAGE + GALILEO_FNAV_PREAMBLE_LENGTH_BITS)
+ {
+ d_symbol_counter = GALILEO_FNAV_PREAMBLE_LENGTH_BITS; // prevents overflow
+ }
+ }
+ else
+ {
+ d_prompt_counter++;
+ }
+ break;
+ }
+ case 2:
+ {
+ d_current_symbol += in[0][0].Prompt_I;
+ if (d_prompt_counter == GALILEO_FNAV_CODES_PER_SYMBOL - 1)
+ {
+ if (d_current_symbol > 0)
+ {
+ d_page_symbols[d_symbol_counter] = 1;
+ }
+ else
+ {
+ d_page_symbols[d_symbol_counter] = -1;
+ }
+ // d_page_symbols[d_symbol_counter] = d_current_symbol_float/(float)GALILEO_FNAV_CODES_PER_SYMBOL;
+ d_current_symbol = 0;
+ d_symbol_counter++;
+ d_prompt_counter = 0;
+ // At the right sample stamp, check preamble synchro
+ if (d_sample_counter == d_preamble_index + GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE)
+ {
+ // **** Attempt Preamble correlation ****
+ bool corr_flag = true;
+ int corr_sign = 0; // sequence can be found inverted
+ // corr_sign = d_preamble_bits[0] * d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS];
+ // for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
+ // {
+ // if ((d_preamble_bits[i] * d_page_symbols[i + d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS]) != corr_sign)
+ // {
+ // //exit for if one bit doesn't correlate
+ // corr_flag = false;
+ // break;
+ // }
+ // }
+ // check if the preamble starts positive correlated or negative correlated
+ if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS] < 0) // symbols clipping
+ {
+ corr_sign=-d_preamble_bits[0];
+ }
+ else
+ {
+ corr_sign=d_preamble_bits[0];
+ }
+ // the preamble is fully correlated only if maintains corr_sign along the whole sequence
+ for (int i = 1; i < GALILEO_FNAV_PREAMBLE_LENGTH_BITS; i++)
+ {
+ if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] < 0 && d_preamble_bits[i]+corr_sign != 0)
+ {
+ //exit for
+ corr_flag=false;
+ break;
+ }
+ if (d_page_symbols[d_symbol_counter - GALILEO_FNAV_PREAMBLE_LENGTH_BITS + i] > 0 && d_preamble_bits[i]+corr_sign == 0)
+ {
+ //exit for
+ corr_flag=false;
+ break;
+ }
+ }
+
+ if (corr_flag==true) // NEW PREAMBLE RECEIVED. DECODE PAGE
+ {
+ d_preamble_index = d_sample_counter - GALILEO_FNAV_CODES_PER_PREAMBLE;//record the preamble sample stamp
+ // DECODE WORD
+ decode_word(d_page_symbols, GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS);
+ // CHECK CRC
+ if (d_nav.flag_CRC_test == true)
+ {
+ d_CRC_error_counter = 0;
+ d_flag_preamble = true; //valid preamble indicator (initialized to false every work())
+ d_preamble_time_seconds = in[0][0].Tracking_timestamp_secs - (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD); //record the PRN start sample index associated to the preamble start.
+ if (!d_flag_frame_sync)
+ {
+ d_flag_frame_sync = true;
+ LOG(INFO) <<" Frame sync SAT " << this->d_satellite << " with preamble start at " << d_preamble_time_seconds << " [s]";
+ }
+ d_symbol_counter = 0; // d_page_symbols start right after preamble and finish at the end of next preamble.
+ }
+ else
+ {
+ d_CRC_error_counter++;
+ if (d_CRC_error_counter > CRC_ERROR_LIMIT)
+ {
+ LOG(INFO) << "Lost of frame sync SAT " << this->d_satellite;
+ d_state = 1;
+ d_symbol_counter = GALILEO_FNAV_PREAMBLE_LENGTH_BITS; // prevents overflow
+ d_flag_frame_sync = false;
+ }
+ else
+ {
+ d_symbol_counter = 0; // d_page_symbols start right after preamble and finish at the end of next preamble.
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ d_prompt_counter++;
+ }
+ break;
+ }
}
consume_each(1);
@@ -501,57 +503,57 @@ int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
current_synchro_data = in[0][0];
//2. Add the telemetry decoder information
if (this->d_flag_preamble == true and d_nav.flag_TOW_set == true)
- //update TOW at the preamble instant
- //We expect a preamble each 10 seconds (FNAV page period)
- {
- Prn_timestamp_at_preamble_ms = d_preamble_time_seconds * 1000;
- //Prn_timestamp_at_preamble_ms = in[0][0].Tracking_timestamp_secs * 1000.0;
- if (d_nav.flag_TOW_1 == true)
- {
- d_TOW_at_Preamble = d_nav.FNAV_TOW_1;
- d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
- d_nav.flag_TOW_1 = false;
- }
- if (d_nav.flag_TOW_2 == true)
- {
- d_TOW_at_Preamble = d_nav.FNAV_TOW_2;
- d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
- d_nav.flag_TOW_2 = false;
- }
- if (d_nav.flag_TOW_3 == true)
- {
- d_TOW_at_Preamble = d_nav.FNAV_TOW_3;
- d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
- d_nav.flag_TOW_3 = false;
- }
- if (d_nav.flag_TOW_4 == true)
- {
- d_TOW_at_Preamble = d_nav.FNAV_TOW_4;
- d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
- d_nav.flag_TOW_4 = false;
- }
- else
- {
- //this page has no timming information
- d_TOW_at_Preamble = d_TOW_at_Preamble + GALILEO_FNAV_SECONDS_PER_PAGE;
- d_TOW_at_current_symbol = d_TOW_at_current_symbol + GALILEO_E5a_CODE_PERIOD;
- }
-
- }
+ //update TOW at the preamble instant
+ //We expect a preamble each 10 seconds (FNAV page period)
+ {
+ Prn_timestamp_at_preamble_ms = d_preamble_time_seconds * 1000;
+ //Prn_timestamp_at_preamble_ms = in[0][0].Tracking_timestamp_secs * 1000.0;
+ if (d_nav.flag_TOW_1 == true)
+ {
+ d_TOW_at_Preamble = d_nav.FNAV_TOW_1;
+ d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
+ d_nav.flag_TOW_1 = false;
+ }
+ if (d_nav.flag_TOW_2 == true)
+ {
+ d_TOW_at_Preamble = d_nav.FNAV_TOW_2;
+ d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
+ d_nav.flag_TOW_2 = false;
+ }
+ if (d_nav.flag_TOW_3 == true)
+ {
+ d_TOW_at_Preamble = d_nav.FNAV_TOW_3;
+ d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
+ d_nav.flag_TOW_3 = false;
+ }
+ if (d_nav.flag_TOW_4 == true)
+ {
+ d_TOW_at_Preamble = d_nav.FNAV_TOW_4;
+ d_TOW_at_current_symbol = d_TOW_at_Preamble + (static_cast<double>(GALILEO_FNAV_CODES_PER_PAGE+GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD);
+ d_nav.flag_TOW_4 = false;
+ }
+ else
+ {
+ //this page has no timming information
+ d_TOW_at_Preamble = d_TOW_at_Preamble + GALILEO_FNAV_SECONDS_PER_PAGE;
+ d_TOW_at_current_symbol = d_TOW_at_current_symbol + GALILEO_E5a_CODE_PERIOD;
+ }
+
+ }
else //if there is not a new preamble, we define the TOW of the current symbol
- {
- d_TOW_at_current_symbol = d_TOW_at_current_symbol + GALILEO_E5a_CODE_PERIOD;
- }
+ {
+ d_TOW_at_current_symbol = d_TOW_at_current_symbol + GALILEO_E5a_CODE_PERIOD;
+ }
//if (d_flag_frame_sync == true and d_nav.flag_TOW_set==true and d_nav.flag_CRC_test == true)
if (d_flag_frame_sync == true and d_nav.flag_TOW_set == true)
- {
- current_synchro_data.Flag_valid_word = true;
- }
+ {
+ current_synchro_data.Flag_valid_word = true;
+ }
else
- {
- current_synchro_data.Flag_valid_word = false;
- }
+ {
+ current_synchro_data.Flag_valid_word = false;
+ }
current_synchro_data.d_TOW = d_TOW_at_Preamble;
current_synchro_data.d_TOW_at_current_symbol = d_TOW_at_current_symbol;
@@ -560,23 +562,23 @@ int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
current_synchro_data.Prn_timestamp_at_preamble_ms = Prn_timestamp_at_preamble_ms;
if(d_dump == true)
- {
- // MULTIPLEXED FILE RECORDING - Record results to file
- try
- {
- double tmp_double;
- tmp_double = d_TOW_at_current_symbol;
- d_dump_file.write((char*)&tmp_double, sizeof(double));
- tmp_double = current_synchro_data.Prn_timestamp_ms;
- d_dump_file.write((char*)&tmp_double, sizeof(double));
- tmp_double = d_TOW_at_Preamble;
- d_dump_file.write((char*)&tmp_double, sizeof(double));
- }
- catch (const std::ifstream::failure& e)
- {
- LOG(WARNING) << "Exception writing observables dump file " << e.what();
- }
- }
+ {
+ // MULTIPLEXED FILE RECORDING - Record results to file
+ try
+ {
+ double tmp_double;
+ tmp_double = d_TOW_at_current_symbol;
+ d_dump_file.write((char*)&tmp_double, sizeof(double));
+ tmp_double = current_synchro_data.Prn_timestamp_ms;
+ d_dump_file.write((char*)&tmp_double, sizeof(double));
+ tmp_double = d_TOW_at_Preamble;
+ d_dump_file.write((char*)&tmp_double, sizeof(double));
+ }
+ catch (const std::ifstream::failure& e)
+ {
+ LOG(WARNING) << "Exception writing observables dump file " << e.what();
+ }
+ }
d_sample_counter++; //count for the processed samples
//3. Make the output (copy the object contents to the GNURadio reserved memory)
*out[0] = current_synchro_data;
@@ -587,6 +589,7 @@ int galileo_e5a_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
return 1;
}
+
void galileo_e5a_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite)
{
d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
@@ -621,6 +624,7 @@ void galileo_e5a_telemetry_decoder_cc::set_channel(int channel)
}
}
+
void galileo_e5a_telemetry_decoder_cc::set_ephemeris_queue(concurrent_queue<Galileo_Ephemeris> *ephemeris_queue)
{
d_ephemeris_queue = ephemeris_queue;
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 0105f14..5e4a6d5 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
@@ -36,7 +36,6 @@
#include "gps_l1_ca_telemetry_decoder_cc.h"
#include <iostream>
-#include <sstream>
#include <boost/lexical_cast.hpp>
#include <gnuradio/io_signature.h>
#include <glog/logging.h>
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 06ef6e9..1f1fea8 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
@@ -36,7 +36,6 @@
#include "galileo_e1_dll_pll_veml_tracking.h"
#include <glog/logging.h>
-#include "GPS_L1_CA.h"
#include "Galileo_E1.h"
#include "configuration_interface.h"
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 ed2e30a..b7b0046 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -37,7 +37,6 @@
#include "galileo_e1_tcp_connector_tracking.h"
#include <glog/logging.h>
-#include "GPS_L1_CA.h"
#include "Galileo_E1.h"
#include "configuration_interface.h"
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 cb19c37..bd2be97 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
@@ -36,7 +36,6 @@
#include "galileo_volk_e1_dll_pll_veml_tracking.h"
#include <glog/logging.h>
-#include "GPS_L1_CA.h"
#include "Galileo_E1.h"
#include "configuration_interface.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
index 6451ec6..2b26428 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
@@ -33,14 +33,10 @@
#define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <string>
#include <map>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
-//#include <volk/volk.h>
#include "concurrent_queue.h"
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
index c991125..e57586d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
@@ -40,11 +40,8 @@
#define GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
index 7257f80..0a4d9d5 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
@@ -38,11 +38,8 @@
#define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_CC_H_
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
index 8db210f..dbec110 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
@@ -34,11 +34,8 @@
#include <fstream>
-#include <queue>
#include <string>
#include <map>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <volk/volk.h>
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h
index 76afc8f..c124365 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.h
@@ -38,11 +38,8 @@
#define GNSS_SDR_GPS_L1_CA_DLL_FLL_PLL_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index 212b26a..3c7ae88 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -38,11 +38,8 @@
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
index 52ce88e..0e194c8 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
@@ -38,11 +38,8 @@
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
index 5cf55fa..5fe19e4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
@@ -38,11 +38,8 @@
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
index 7c08e12..e6828aa 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
@@ -37,11 +37,8 @@
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
index b3625eb..579c78d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
@@ -38,11 +38,8 @@
#define GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
index 4fc35f4..8fdcfb6 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
@@ -40,8 +40,6 @@
#include <queue>
#include <map>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include "concurrent_queue.h"
diff --git a/src/algorithms/tracking/libs/correlator.cc b/src/algorithms/tracking/libs/correlator.cc
index ff34e69..967bb5c 100644
--- a/src/algorithms/tracking/libs/correlator.cc
+++ b/src/algorithms/tracking/libs/correlator.cc
@@ -35,8 +35,8 @@
#include "correlator.h"
-#include <iostream>
#include <volk/volk.h>
+
#if USING_VOLK_CW_EPL_CORR_CUSTOM
#define LV_HAVE_SSE3
#include "volk_cw_epl_corr.h"
diff --git a/src/algorithms/tracking/libs/correlator.h b/src/algorithms/tracking/libs/correlator.h
index 9deaaf4..ea86728 100644
--- a/src/algorithms/tracking/libs/correlator.h
+++ b/src/algorithms/tracking/libs/correlator.h
@@ -37,7 +37,6 @@
#ifndef GNSS_SDR_CORRELATOR_H_
#define GNSS_SDR_CORRELATOR_H_
-#include <string>
#include <gnuradio/gr_complex.h>
#if !defined(GENERIC_ARCH) && HAVE_SSE3
--
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