From cf39e77396bb0303fc5fddaf826d3d5c4192edf7 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 12 Oct 2017 18:15:35 +0200 Subject: [PATCH] Pass Gnss_Satellite object by reference instead of by value --- .../adapters/galileo_e1b_telemetry_decoder.cc | 2 +- .../adapters/galileo_e1b_telemetry_decoder.h | 2 +- .../adapters/galileo_e5a_telemetry_decoder.cc | 2 +- .../adapters/galileo_e5a_telemetry_decoder.h | 2 +- .../adapters/gps_l1_ca_telemetry_decoder.cc | 2 +- .../adapters/gps_l1_ca_telemetry_decoder.h | 2 +- .../adapters/gps_l2c_telemetry_decoder.cc | 2 +- .../adapters/gps_l2c_telemetry_decoder.h | 2 +- .../adapters/sbas_l1_telemetry_decoder.cc | 2 +- .../adapters/sbas_l1_telemetry_decoder.h | 2 +- .../galileo_e1b_telemetry_decoder_cc.cc | 6 +++--- .../gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h | 8 ++++---- .../galileo_e5a_telemetry_decoder_cc.cc | 4 ++-- .../gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h | 6 +++--- .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc | 6 +++--- .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h | 10 +++++----- .../gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc | 6 +++--- .../gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h | 10 +++++----- .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc | 6 +++--- .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h | 10 +++++----- src/core/interfaces/telemetry_decoder_interface.h | 2 +- 21 files changed, 47 insertions(+), 47 deletions(-) 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 053bce863..5de974a85 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -67,7 +67,7 @@ GalileoE1BTelemetryDecoder::~GalileoE1BTelemetryDecoder() {} -void GalileoE1BTelemetryDecoder::set_satellite(Gnss_Satellite satellite) +void GalileoE1BTelemetryDecoder::set_satellite(const Gnss_Satellite & satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); telemetry_decoder_->set_satellite(satellite_); 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 5bdc2b4a1..571fd09b8 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -74,7 +74,7 @@ public: gr::basic_block_sptr get_left_block() override; gr::basic_block_sptr get_right_block() override; - void set_satellite(Gnss_Satellite satellite) override; + void set_satellite(const Gnss_Satellite & satellite) override; inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } inline void reset() override 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 9049079d4..24f72a4ac 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -71,7 +71,7 @@ GalileoE5aTelemetryDecoder::~GalileoE5aTelemetryDecoder() {} -void GalileoE5aTelemetryDecoder::set_satellite(Gnss_Satellite satellite) +void GalileoE5aTelemetryDecoder::set_satellite(const Gnss_Satellite & satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); telemetry_decoder_->set_satellite(satellite_); 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 488f9e24e..9b7bb7713 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h @@ -75,7 +75,7 @@ public: gr::basic_block_sptr get_left_block() override; gr::basic_block_sptr get_right_block() override; - void set_satellite(Gnss_Satellite satellite) override; + void set_satellite(const Gnss_Satellite & satellite) override; inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } inline void reset() override 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 bc9792a7b..72deeafd6 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 @@ -67,7 +67,7 @@ GpsL1CaTelemetryDecoder::~GpsL1CaTelemetryDecoder() {} -void GpsL1CaTelemetryDecoder::set_satellite(Gnss_Satellite satellite) +void GpsL1CaTelemetryDecoder::set_satellite(const Gnss_Satellite & satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); telemetry_decoder_->set_satellite(satellite_); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index d7e2bd0f0..fdefb78d5 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -69,7 +69,7 @@ public: gr::basic_block_sptr get_left_block() override; gr::basic_block_sptr get_right_block() override; - void set_satellite(Gnss_Satellite satellite) override; + void set_satellite(const Gnss_Satellite & satellite) override; inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } inline void reset() override diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc index 935998578..205b34395 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -68,7 +68,7 @@ GpsL2CTelemetryDecoder::~GpsL2CTelemetryDecoder() {} -void GpsL2CTelemetryDecoder::set_satellite(Gnss_Satellite satellite) +void GpsL2CTelemetryDecoder::set_satellite(const Gnss_Satellite & satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); telemetry_decoder_->set_satellite(satellite_); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h index f60daf5e6..c98d724cf 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h @@ -69,7 +69,7 @@ public: gr::basic_block_sptr get_left_block() override; gr::basic_block_sptr get_right_block() override; - void set_satellite(Gnss_Satellite satellite) override; + void set_satellite(const Gnss_Satellite & satellite) override; inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } inline void reset() override 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 41d2dcf38..bf9e45e74 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -63,7 +63,7 @@ SbasL1TelemetryDecoder::~SbasL1TelemetryDecoder() {} -void SbasL1TelemetryDecoder::set_satellite(Gnss_Satellite satellite) +void SbasL1TelemetryDecoder::set_satellite(const Gnss_Satellite & satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); telemetry_decoder_->set_satellite(satellite_); diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index 3b1af8da3..47325cad7 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -72,7 +72,7 @@ public: gr::basic_block_sptr get_left_block() override; gr::basic_block_sptr get_right_block() override; - void set_satellite(Gnss_Satellite satellite) override; + void set_satellite(const Gnss_Satellite & satellite) override; inline void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } inline void reset() override 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 8e70d49e7..97c4a9927 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 @@ -46,7 +46,7 @@ using google::LogMessage; galileo_e1b_telemetry_decoder_cc_sptr -galileo_e1b_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) +galileo_e1b_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) { return galileo_e1b_telemetry_decoder_cc_sptr(new galileo_e1b_telemetry_decoder_cc(satellite, dump)); } @@ -102,7 +102,7 @@ void galileo_e1b_telemetry_decoder_cc::deinterleaver(int rows, int cols, double galileo_e1b_telemetry_decoder_cc::galileo_e1b_telemetry_decoder_cc( - Gnss_Satellite satellite, + const Gnss_Satellite & satellite, bool dump) : gr::block("galileo_e1b_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) @@ -476,7 +476,7 @@ int galileo_e1b_telemetry_decoder_cc::general_work (int noutput_items __attribut } -void galileo_e1b_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite) +void galileo_e1b_telemetry_decoder_cc::set_satellite(const Gnss_Satellite & satellite) { d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); DLOG(INFO) << "Setting decoder Finite State Machine to satellite " << d_satellite; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h index a3f430232..95a618c7a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h @@ -51,7 +51,7 @@ class galileo_e1b_telemetry_decoder_cc; typedef boost::shared_ptr galileo_e1b_telemetry_decoder_cc_sptr; -galileo_e1b_telemetry_decoder_cc_sptr galileo_e1b_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); +galileo_e1b_telemetry_decoder_cc_sptr galileo_e1b_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); /*! * \brief This class implements a block that decodes the INAV data defined in Galileo ICD @@ -61,7 +61,7 @@ class galileo_e1b_telemetry_decoder_cc : public gr::block { public: ~galileo_e1b_telemetry_decoder_cc(); - void set_satellite(Gnss_Satellite satellite); //!< Set satellite PRN + void set_satellite(const Gnss_Satellite & satellite); //!< Set satellite PRN void set_channel(int channel); //!< Set receiver's channel int flag_even_word_arrived; @@ -73,8 +73,8 @@ public: private: friend galileo_e1b_telemetry_decoder_cc_sptr - galileo_e1b_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); - galileo_e1b_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); + galileo_e1b_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); + galileo_e1b_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); void viterbi_decoder(double *page_part_symbols, int *page_part_bits); 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 031c18983..4dbccde7a 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 @@ -50,7 +50,7 @@ using google::LogMessage; galileo_e5a_telemetry_decoder_cc_sptr -galileo_e5a_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) +galileo_e5a_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) { return galileo_e5a_telemetry_decoder_cc_sptr(new galileo_e5a_telemetry_decoder_cc(satellite, dump)); } @@ -179,7 +179,7 @@ void galileo_e5a_telemetry_decoder_cc::decode_word(double *page_symbols,int fram galileo_e5a_telemetry_decoder_cc::galileo_e5a_telemetry_decoder_cc( - Gnss_Satellite satellite, bool dump) : gr::block("galileo_e5a_telemetry_decoder_cc", + const Gnss_Satellite & satellite, 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))) { diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h index 81a609274..2389bfb2e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h @@ -55,7 +55,7 @@ class galileo_e5a_telemetry_decoder_cc; typedef boost::shared_ptr galileo_e5a_telemetry_decoder_cc_sptr; -galileo_e5a_telemetry_decoder_cc_sptr galileo_e5a_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); +galileo_e5a_telemetry_decoder_cc_sptr galileo_e5a_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); /*! @@ -76,8 +76,8 @@ public: private: friend galileo_e5a_telemetry_decoder_cc_sptr - galileo_e5a_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); - galileo_e5a_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); + galileo_e5a_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); + galileo_e5a_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); void viterbi_decoder(double *page_part_symbols, int *page_part_bits); 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 71827ffc5..e9189e213 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 @@ -43,14 +43,14 @@ using google::LogMessage; gps_l1_ca_telemetry_decoder_cc_sptr -gps_l1_ca_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) +gps_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) { return gps_l1_ca_telemetry_decoder_cc_sptr(new gps_l1_ca_telemetry_decoder_cc(satellite, dump)); } gps_l1_ca_telemetry_decoder_cc::gps_l1_ca_telemetry_decoder_cc( - Gnss_Satellite satellite, + const Gnss_Satellite & satellite, bool dump) : gr::block("gps_navigation_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) @@ -401,7 +401,7 @@ int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items __attribute_ } - void gps_l1_ca_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite) + void gps_l1_ca_telemetry_decoder_cc::set_satellite(const Gnss_Satellite & satellite) { d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); LOG(INFO) << "Setting decoder Finite State Machine to satellite " << d_satellite; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h index 8ccc0cb8d..49ae8e1d0 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h @@ -47,7 +47,7 @@ class gps_l1_ca_telemetry_decoder_cc; typedef boost::shared_ptr gps_l1_ca_telemetry_decoder_cc_sptr; gps_l1_ca_telemetry_decoder_cc_sptr -gps_l1_ca_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); +gps_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); /*! * \brief This class implements a block that decodes the NAV data defined in IS-GPS-200E @@ -57,8 +57,8 @@ class gps_l1_ca_telemetry_decoder_cc : public gr::block { public: ~gps_l1_ca_telemetry_decoder_cc(); - void set_satellite(Gnss_Satellite satellite); //!< Set satellite PRN - void set_channel(int channel); //!< Set receiver's channel + void set_satellite(const Gnss_Satellite & satellite); //!< Set satellite PRN + void set_channel(int channel); //!< Set receiver's channel /*! * \brief This is where all signal processing takes place @@ -68,9 +68,9 @@ public: private: friend gps_l1_ca_telemetry_decoder_cc_sptr - gps_l1_ca_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); + gps_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); - gps_l1_ca_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); + gps_l1_ca_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); bool gps_word_parityCheck(unsigned int gpsword); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc index 53178e4f9..693990124 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc @@ -41,14 +41,14 @@ using google::LogMessage; gps_l2c_telemetry_decoder_cc_sptr -gps_l2c_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) +gps_l2c_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) { return gps_l2c_telemetry_decoder_cc_sptr(new gps_l2c_telemetry_decoder_cc(satellite, dump)); } gps_l2c_telemetry_decoder_cc::gps_l2c_telemetry_decoder_cc( - Gnss_Satellite satellite, bool dump) : gr::block("gps_l2c_telemetry_decoder_cc", + const Gnss_Satellite & satellite, bool dump) : gr::block("gps_l2c_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) { @@ -202,7 +202,7 @@ int gps_l2c_telemetry_decoder_cc::general_work (int noutput_items __attribute__( } -void gps_l2c_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite) +void gps_l2c_telemetry_decoder_cc::set_satellite(const Gnss_Satellite & satellite) { d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); LOG(INFO) << "GPS L2C CNAV telemetry decoder in channel " << this->d_channel << " set to satellite " << d_satellite; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h index 5d99e19c1..240eac538 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h @@ -57,7 +57,7 @@ class gps_l2c_telemetry_decoder_cc; typedef boost::shared_ptr gps_l2c_telemetry_decoder_cc_sptr; gps_l2c_telemetry_decoder_cc_sptr -gps_l2c_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); +gps_l2c_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); /*! * \brief This class implements a block that decodes the SBAS integrity and corrections data defined in RTCA MOPS DO-229 @@ -67,8 +67,8 @@ class gps_l2c_telemetry_decoder_cc : public gr::block { public: ~gps_l2c_telemetry_decoder_cc(); - void set_satellite(Gnss_Satellite satellite); //!< Set satellite PRN - void set_channel(int channel); //!< Set receiver's channel + void set_satellite(const Gnss_Satellite & satellite); //!< Set satellite PRN + void set_channel(int channel); //!< Set receiver's channel /*! * \brief This is where all signal processing takes place @@ -79,8 +79,8 @@ public: private: friend gps_l2c_telemetry_decoder_cc_sptr - gps_l2c_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); - gps_l2c_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); + gps_l2c_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); + gps_l2c_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); bool d_dump; Gnss_Satellite d_satellite; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc index 96f1dd1b1..f06cf16fd 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc @@ -48,7 +48,7 @@ using google::LogMessage; sbas_l1_telemetry_decoder_cc_sptr -sbas_l1_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) +sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) { return sbas_l1_telemetry_decoder_cc_sptr(new sbas_l1_telemetry_decoder_cc(satellite, dump)); } @@ -56,7 +56,7 @@ sbas_l1_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) sbas_l1_telemetry_decoder_cc::sbas_l1_telemetry_decoder_cc( - Gnss_Satellite satellite, + const Gnss_Satellite & satellite, bool dump) : gr::block("sbas_l1_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), @@ -177,7 +177,7 @@ int sbas_l1_telemetry_decoder_cc::general_work (int noutput_items __attribute__( -void sbas_l1_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite) +void sbas_l1_telemetry_decoder_cc::set_satellite(const Gnss_Satellite & satellite) { d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); LOG(INFO) << "SBAS telemetry decoder in channel " << this->d_channel << " set to satellite " << d_satellite; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h index 4e9b6af96..ee0b2f732 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h @@ -47,7 +47,7 @@ class sbas_l1_telemetry_decoder_cc; typedef boost::shared_ptr sbas_l1_telemetry_decoder_cc_sptr; sbas_l1_telemetry_decoder_cc_sptr -sbas_l1_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); +sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); /*! * \brief This class implements a block that decodes the SBAS integrity and corrections data defined in RTCA MOPS DO-229 @@ -57,8 +57,8 @@ class sbas_l1_telemetry_decoder_cc : public gr::block { public: ~sbas_l1_telemetry_decoder_cc(); - void set_satellite(Gnss_Satellite satellite); //!< Set satellite PRN - void set_channel(int channel); //!< Set receiver's channel + void set_satellite(const Gnss_Satellite & satellite); //!< Set satellite PRN + void set_channel(int channel); //!< Set receiver's channel /*! * \brief This is where all signal processing takes place @@ -68,8 +68,8 @@ public: private: friend sbas_l1_telemetry_decoder_cc_sptr - sbas_l1_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); - sbas_l1_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); + sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); + sbas_l1_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); void viterbi_decoder(double *page_part_symbols, int *page_part_bits); void align_samples(); diff --git a/src/core/interfaces/telemetry_decoder_interface.h b/src/core/interfaces/telemetry_decoder_interface.h index 5b43794a8..4aac3a694 100644 --- a/src/core/interfaces/telemetry_decoder_interface.h +++ b/src/core/interfaces/telemetry_decoder_interface.h @@ -52,7 +52,7 @@ class TelemetryDecoderInterface : public GNSSBlockInterface { public: virtual void reset() = 0; - virtual void set_satellite(Gnss_Satellite sat) = 0; + virtual void set_satellite(const Gnss_Satellite & sat) = 0; virtual void set_channel(int channel) = 0; };