From 994f192636431fb6a0e0d9d9371a437d04e19519 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 19 Mar 2019 21:11:21 +0100 Subject: [PATCH 1/5] Fix warning if put_time is not present --- src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 7b58f31ae..54ca099a5 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -366,10 +366,10 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels, // Display time in local time zone d_show_local_time_zone = conf_.show_local_time_zone; - time_t when = std::time(nullptr); - auto const tm = *std::localtime(&when); std::ostringstream os; #ifdef HAS_PUT_TIME + time_t when = std::time(nullptr); + auto const tm = *std::localtime(&when); os << std::put_time(&tm, "%z"); #endif std::string utc_diff_str = os.str(); // in ISO 8601 format: "+HHMM" or "-HHMM" From 8a52c20e28822d2c9544b4a8dc60bd4055e0a8d2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 20 Mar 2019 15:44:59 +0100 Subject: [PATCH 2/5] Add missing override keyword --- .../acquisition/adapters/beidou_b1i_pcps_acquisition.h | 4 ++-- .../acquisition/adapters/beidou_b3i_pcps_acquisition.h | 4 ++-- .../adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h | 4 ++-- .../adapters/galileo_e1_pcps_ambiguous_acquisition.h | 4 ++-- .../adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h | 4 ++-- .../adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h | 4 ++-- .../galileo_e1_pcps_quicksync_ambiguous_acquisition.h | 4 ++-- .../adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h | 4 ++-- .../adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h | 4 ++-- .../acquisition/adapters/galileo_e5a_pcps_acquisition.h | 4 ++-- .../acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h | 4 ++-- .../acquisition/adapters/glonass_l1_ca_pcps_acquisition.h | 4 ++-- .../acquisition/adapters/glonass_l2_ca_pcps_acquisition.h | 4 ++-- .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h | 4 ++-- .../adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h | 4 ++-- .../acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h | 4 ++-- .../adapters/gps_l1_ca_pcps_assisted_acquisition.h | 4 ++-- .../acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h | 4 ++-- .../adapters/gps_l1_ca_pcps_quicksync_acquisition.h | 4 ++-- .../acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h | 4 ++-- .../acquisition/adapters/gps_l2_m_pcps_acquisition.h | 4 ++-- .../acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h | 4 ++-- .../acquisition/adapters/gps_l5i_pcps_acquisition.h | 4 ++-- .../acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index 6822659cf..05965a97f 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -93,7 +93,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -102,7 +102,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h index 2562d2790..93f65a89d 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h @@ -92,7 +92,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -101,7 +101,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index 35044840b..265bf9701 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -87,7 +87,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -96,7 +96,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 897336965..ea2d18b27 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -91,7 +91,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -100,7 +100,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index 543c55248..3e070ca83 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h @@ -93,7 +93,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_fpga_->set_channel(channel_); @@ -102,7 +102,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index 561b6055e..46957d533 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -87,7 +87,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -96,7 +96,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index 017ebf295..b29b808a8 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -88,7 +88,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -97,7 +97,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index 8618c606f..0893f731c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -87,7 +87,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -96,7 +96,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index cdd1504c4..6d709894f 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -88,7 +88,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -97,7 +97,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h index 4ea234cf5..b3c43d542 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h @@ -79,7 +79,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -88,7 +88,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index ff9e9a126..37282fb25 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -92,7 +92,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_fpga_->set_channel(channel_); @@ -101,7 +101,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h index 9f3e4497f..91229faa8 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -89,7 +89,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -98,7 +98,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h index 95bfde06c..a063d0532 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h @@ -89,7 +89,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -98,7 +98,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index 727c0a81c..ab2ed82d7 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -95,7 +95,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -104,7 +104,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); 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 33bd36c0f..2b7daf80e 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 @@ -88,7 +88,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -97,7 +97,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index e92e3a41c..228c56ca9 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h @@ -93,7 +93,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_fpga_->set_channel(channel_); @@ -102,7 +102,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); 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 24d22f4a5..13560238e 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 @@ -88,7 +88,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -97,7 +97,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index e5c8b11b9..29da366a6 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -87,7 +87,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -96,7 +96,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index b5de94a96..fadd57f73 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -89,7 +89,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -98,7 +98,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index c158b0c9a..5fac3c436 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -88,7 +88,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_cc_->set_channel(channel_); @@ -97,7 +97,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_cc_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index a3398ae63..1c7c591bb 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -92,7 +92,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -101,7 +101,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index 08bf8a9fb..ddcf10cd8 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h @@ -94,7 +94,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_fpga_->set_channel(channel_); @@ -103,7 +103,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 756d122d4..fa157024e 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -92,7 +92,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_->set_channel(channel_); @@ -101,7 +101,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_->set_channel_fsm(channel_fsm); diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index d009eca49..9238b06c9 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -95,7 +95,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - inline void set_channel(unsigned int channel) + inline void set_channel(unsigned int channel) override { channel_ = channel; acquisition_fpga_->set_channel(channel_); @@ -104,7 +104,7 @@ public: /*! * \brief Set channel fsm associated to this acquisition instance */ - inline void set_channel_fsm(std::shared_ptr channel_fsm) + inline void set_channel_fsm(std::shared_ptr channel_fsm) override { channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); From 55b1f316edefd6a958f5f81521afdb3c68f123f8 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Wed, 20 Mar 2019 16:57:50 +0100 Subject: [PATCH 3/5] Removing gnuradio block inheritance in FPGA acquisition --- ...ileo_e1_pcps_ambiguous_acquisition_fpga.cc | 6 ++-- .../galileo_e5a_pcps_acquisition_fpga.cc | 7 ++-- .../gps_l1_ca_pcps_acquisition_fpga.cc | 6 ++-- .../gps_l2_m_pcps_acquisition_fpga.cc | 7 ++-- .../adapters/gps_l5i_pcps_acquisition_fpga.cc | 6 ++-- .../gnuradio_blocks/pcps_acquisition_fpga.cc | 36 ++++++------------- .../gnuradio_blocks/pcps_acquisition_fpga.h | 10 ++---- src/algorithms/channel/adapters/channel.cc | 28 +++++++++++---- 8 files changed, 56 insertions(+), 50 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc index 191279974..898ba8d62 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc @@ -64,6 +64,9 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; + float downsampling_factor = configuration_->property(role + ".downsampling_factor", 4.0); acq_parameters.downsampling_factor = downsampling_factor; @@ -163,7 +166,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - DLOG(INFO) << "acquisition(" << acquisition_fpga_->unique_id() << ")"; channel_ = 0; doppler_step_ = 0; @@ -274,5 +276,5 @@ gr::basic_block_sptr GalileoE1PcpsAmbiguousAcquisitionFpga::get_left_block() gr::basic_block_sptr GalileoE1PcpsAmbiguousAcquisitionFpga::get_right_block() { - return acquisition_fpga_; + return nullptr; } diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index 5c79068ed..3da2486c2 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -61,6 +61,10 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000); int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + + acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; + float downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0); acq_parameters.downsampling_factor = downsampling_factor; fs_in = fs_in / downsampling_factor; @@ -164,7 +168,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - DLOG(INFO) << "acquisition(" << acquisition_fpga_->unique_id() << ")"; channel_ = 0; doppler_step_ = 0; @@ -274,5 +277,5 @@ gr::basic_block_sptr GalileoE5aPcpsAcquisitionFpga::get_left_block() gr::basic_block_sptr GalileoE5aPcpsAcquisitionFpga::get_right_block() { - return acquisition_fpga_; + return nullptr; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc index 2505180f0..ff300ea57 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc @@ -68,6 +68,9 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; + float downsampling_factor = configuration_->property(role + ".downsampling_factor", 4.0); acq_parameters.downsampling_factor = downsampling_factor; @@ -146,7 +149,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - DLOG(INFO) << "acquisition(" << acquisition_fpga_->unique_id() << ")"; channel_ = 0; doppler_step_ = 0; @@ -257,5 +259,5 @@ gr::basic_block_sptr GpsL1CaPcpsAcquisitionFpga::get_left_block() gr::basic_block_sptr GpsL1CaPcpsAcquisitionFpga::get_right_block() { - return acquisition_fpga_; + return nullptr; } diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc index cc08b8bb2..6dcb7e224 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc @@ -70,6 +70,9 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); acq_parameters.fs_in = fs_in_; + acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; + doppler_max_ = configuration->property(role + ".doppler_max", 5000); if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max; acq_parameters.doppler_max = doppler_max_; @@ -139,13 +142,11 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( delete[] fft_codes_padded; acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - DLOG(INFO) << "acquisition(" << acquisition_fpga_->unique_id() << ")"; channel_ = 0; doppler_step_ = 0; gnss_synchro_ = nullptr; channel_fsm_ = nullptr; - DLOG(INFO) << "acquisition(" << acquisition_fpga_->unique_id() << ")"; threshold_ = 0.0; } @@ -253,5 +254,5 @@ gr::basic_block_sptr GpsL2MPcpsAcquisitionFpga::get_left_block() gr::basic_block_sptr GpsL2MPcpsAcquisitionFpga::get_right_block() { - return acquisition_fpga_; + return nullptr; } diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc index 92b43c988..413f68783 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc @@ -67,6 +67,9 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; + float downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0); acq_parameters.downsampling_factor = downsampling_factor; @@ -146,7 +149,6 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - DLOG(INFO) << "acquisition(" << acquisition_fpga_->unique_id() << ")"; channel_ = 0; doppler_step_ = 0; @@ -258,5 +260,5 @@ gr::basic_block_sptr GpsL5iPcpsAcquisitionFpga::get_left_block() gr::basic_block_sptr GpsL5iPcpsAcquisitionFpga::get_right_block() { - return acquisition_fpga_; + return nullptr; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index f89d0fc16..9ffbcaabd 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -52,12 +52,8 @@ pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_) } -pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_) : gr::block("pcps_acquisition_fpga", - gr::io_signature::make(0, 0, 0), - gr::io_signature::make(0, 0, 0)) +pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_) { - this->message_port_register_out(pmt::mp("events")); - acq_parameters = std::move(conf_); d_sample_counter = 0ULL; // SAMPLE COUNTER d_active = false; @@ -150,15 +146,8 @@ void pcps_acquisition_fpga::send_positive_acquisition() << ", magnitude " << d_mag << ", input signal power " << d_input_power; - if (d_channel_fsm) - { - //the channel FSM is set, so, notify it directly the positive acquisition to minimize delays - d_channel_fsm->Event_valid_acquisition(); - } - else - { - this->message_port_pub(pmt::mp("events"), pmt::from_long(1)); - } + //the channel FSM is set, so, notify it directly the positive acquisition to minimize delays + d_channel_fsm->Event_valid_acquisition(); } @@ -175,7 +164,14 @@ void pcps_acquisition_fpga::send_negative_acquisition() << ", magnitude " << d_mag << ", input signal power " << d_input_power; - this->message_port_pub(pmt::mp("events"), pmt::from_long(2)); + if (acq_parameters.repeat_satellite == true) + { + d_channel_fsm->Event_failed_acquisition_repeat(); + } + else + { + d_channel_fsm->Event_failed_acquisition_no_repeat(); + } } @@ -266,16 +262,6 @@ void pcps_acquisition_fpga::set_active(bool active) } -int pcps_acquisition_fpga::general_work(int noutput_items __attribute__((unused)), - gr_vector_int& ninput_items __attribute__((unused)), - gr_vector_const_void_star& input_items __attribute__((unused)), - gr_vector_void_star& output_items __attribute__((unused))) -{ - // the general work is not used with the acquisition that uses the FPGA - return noutput_items; -} - - void pcps_acquisition_fpga::reset_acquisition(void) { // this function triggers a HW reset of the FPGA PL. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index 4ee9acb81..f7d13b50f 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -68,6 +68,7 @@ typedef struct float downsampling_factor; uint32_t total_block_exp; uint32_t excludelimit; + bool repeat_satellite; } pcpsconf_fpga_t; class pcps_acquisition_fpga; @@ -83,7 +84,7 @@ pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_); * Check \ref Navitec2012 "An Open Source Galileo E1 Software Receiver", * Algorithm 1, for a pseudocode description of this implementation. */ -class pcps_acquisition_fpga : public gr::block +class pcps_acquisition_fpga { private: friend pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_); @@ -221,13 +222,6 @@ public: * \brief This funciton is only used for the unit tests */ void read_fpga_total_scale_factor(uint32_t* total_scale_factor, uint32_t* fw_scale_factor); - - /*! - * \brief Parallel Code Phase Search Acquisition signal processing. - */ - int general_work(int noutput_items, gr_vector_int& ninput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items); }; #endif /* GNSS_SDR_PCPS_ACQUISITION_FPGA_H_*/ diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index c68c35628..9620e5d67 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -55,7 +55,7 @@ Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::s queue_ = std::move(queue); channel_fsm_ = std::make_shared(); - flag_enable_fpga = configuration->property("Channel.enable_FPGA", false); + flag_enable_fpga = configuration->property("GNSS-SDR.enable_FPGA", false); acq_->set_channel(channel_); acq_->set_channel_fsm(channel_fsm_); trk_->set_channel(channel_); @@ -125,7 +125,10 @@ Channel::~Channel() = default; void Channel::connect(gr::top_block_sptr top_block) { - acq_->connect(top_block); + if (!flag_enable_fpga) + { + acq_->connect(top_block); + } trk_->connect(top_block); nav_->connect(top_block); @@ -136,7 +139,10 @@ void Channel::connect(gr::top_block_sptr top_block) DLOG(INFO) << "tracking -> telemetry_decoder"; // Message ports - top_block->msg_connect(acq_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events")); + if (!flag_enable_fpga) + { + 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")); connected_ = true; @@ -152,12 +158,18 @@ void Channel::disconnect(gr::top_block_sptr top_block) } top_block->disconnect(trk_->get_right_block(), 0, nav_->get_left_block(), 0); - - acq_->disconnect(top_block); + if (!flag_enable_fpga) + { + acq_->disconnect(top_block); + } trk_->disconnect(top_block); nav_->disconnect(top_block); + top_block->msg_disconnect(nav_->get_left_block(), pmt::mp("telemetry_to_trk"), trk_->get_right_block(), pmt::mp("telemetry_to_trk")); - top_block->msg_disconnect(acq_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events")); + if (!flag_enable_fpga) + { + top_block->msg_disconnect(acq_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events")); + } top_block->msg_disconnect(trk_->get_right_block(), pmt::mp("events"), channel_msg_rx, pmt::mp("events")); connected_ = false; } @@ -178,6 +190,10 @@ gr::basic_block_sptr Channel::get_left_block_trk() gr::basic_block_sptr Channel::get_left_block_acq() { + if (flag_enable_fpga) + { + LOG(ERROR) << "Enabled FPGA and called get_left_block() in channel interface"; + } return acq_->get_left_block(); } From f3d91bbd38e589789506d8ef51aa0b96d4772480 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 20 Mar 2019 18:00:37 +0100 Subject: [PATCH 4/5] Remove unused includes --- .../adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h | 7 +------ .../adapters/galileo_e5a_pcps_acquisition_fpga.cc | 1 - .../adapters/galileo_e5a_pcps_acquisition_fpga.h | 4 ++-- .../acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h | 1 + .../acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h | 7 +------ .../acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h | 6 ------ 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index 3e070ca83..8683d5556 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h @@ -33,10 +33,7 @@ #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_FPGA_H_ #include "channel_fsm.h" -#include "complex_byte_to_float_x2.h" #include "pcps_acquisition_fpga.h" -#include -#include #include // for basic_block_sptr, top_block_sptr #include // for lv_16sc_t #include // for size_t @@ -107,6 +104,7 @@ public: channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); } + /*! * \brief Set statistics threshold of PCPS algorithm */ @@ -157,9 +155,6 @@ public: private: ConfigurationInterface* configuration_; pcps_acquisition_fpga_sptr acquisition_fpga_; - gr::blocks::stream_to_vector::sptr stream_to_vector_; - gr::blocks::float_to_complex::sptr float_to_complex_; - complex_byte_to_float_x2_sptr cbyte_to_float_x2_; bool acquire_pilot_; uint32_t channel_; std::shared_ptr channel_fsm_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index 3da2486c2..0b8e0c815 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -61,7 +61,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000); int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index 37282fb25..62c186503 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -35,7 +35,6 @@ #include "channel_fsm.h" #include "pcps_acquisition_fpga.h" -#include #include // for basic_block_sptr, top_block_sptr #include // for lv_16sc_t #include // for size_t @@ -89,6 +88,7 @@ public: * tracking blocks */ void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; + /*! * \brief Set acquisition channel unique ID */ @@ -106,6 +106,7 @@ public: channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); } + /*! * \brief Set statistics threshold of PCPS algorithm */ @@ -166,7 +167,6 @@ public: private: ConfigurationInterface* configuration_; pcps_acquisition_fpga_sptr acquisition_fpga_; - gr::blocks::stream_to_vector::sptr stream_to_vector_; std::string item_type_; std::string dump_filename_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index 228c56ca9..6204354b2 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h @@ -107,6 +107,7 @@ public: channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); } + /*! * \brief Set statistics threshold of PCPS algorithm */ diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index ddcf10cd8..495a613e5 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h @@ -35,10 +35,7 @@ #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_FPGA_H_ #include "channel_fsm.h" -#include "complex_byte_to_float_x2.h" #include "pcps_acquisition_fpga.h" -#include -#include #include // for basic_block_sptr, top_block_sptr #include // for lv_16sc_t #include // for size_t @@ -108,6 +105,7 @@ public: channel_fsm_ = channel_fsm; acquisition_fpga_->set_channel_fsm(channel_fsm); } + /*! * \brief Set statistics threshold of PCPS algorithm */ @@ -158,9 +156,6 @@ public: private: ConfigurationInterface* configuration_; pcps_acquisition_fpga_sptr acquisition_fpga_; - gr::blocks::stream_to_vector::sptr stream_to_vector_; - gr::blocks::float_to_complex::sptr float_to_complex_; - complex_byte_to_float_x2_sptr cbyte_to_float_x2_; std::string item_type_; unsigned int channel_; std::shared_ptr channel_fsm_; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index 9238b06c9..caecc68a8 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -36,10 +36,7 @@ #define GNSS_SDR_GPS_L5I_PCPS_ACQUISITION_FPGA_H_ #include "channel_fsm.h" -#include "complex_byte_to_float_x2.h" #include "pcps_acquisition_fpga.h" -#include -#include #include // for basic_block_sptr, top_block_sptr #include // for lv_16sc_t #include // for size_t @@ -159,9 +156,6 @@ public: private: ConfigurationInterface* configuration_; pcps_acquisition_fpga_sptr acquisition_fpga_; - gr::blocks::stream_to_vector::sptr stream_to_vector_; - gr::blocks::float_to_complex::sptr float_to_complex_; - complex_byte_to_float_x2_sptr cbyte_to_float_x2_; std::string item_type_; uint32_t channel_; std::shared_ptr channel_fsm_; From 88b60aa6b1f66981fa333b631f646626a8f3e2f1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 20 Mar 2019 18:08:39 +0100 Subject: [PATCH 5/5] Remove unused includes --- .../acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc | 9 +++------ .../acquisition/gnuradio_blocks/pcps_acquisition_fpga.h | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index 9ffbcaabd..e3e5fdd60 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -35,12 +35,9 @@ #include "pcps_acquisition_fpga.h" #include "gnss_synchro.h" #include -#include -#include // for from_long -#include // for mp -#include // for ceil -#include // for operator<< -#include // for move +#include // for ceil +#include // for operator<< +#include // for move #define AQ_DOWNSAMPLING_DELAY 40 // delay due to the downsampling filter in the acquisition diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index f7d13b50f..174ee7af5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -44,8 +44,6 @@ #include "channel_fsm.h" #include "fpga_acquisition.h" #include -#include // for block -#include // for gr_vector_const_void_star #include // for lv_16sc_t #include // for uint32_t #include // for shared_ptr