mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 07:13:03 +00:00 
			
		
		
		
	Merge branch 'glonass' of https://github.com/gnss-sdr/gnss-sdr into glonass
This commit is contained in:
		| @@ -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()); |     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     telemetry_decoder_->set_satellite(satellite_); |     telemetry_decoder_->set_satellite(satellite_); | ||||||
|   | |||||||
| @@ -74,7 +74,7 @@ public: | |||||||
|     gr::basic_block_sptr get_left_block() override; |     gr::basic_block_sptr get_left_block() override; | ||||||
|     gr::basic_block_sptr get_right_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 set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } | ||||||
|  |  | ||||||
|     inline void reset() override |     inline void reset() override | ||||||
|   | |||||||
| @@ -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()); |     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     telemetry_decoder_->set_satellite(satellite_); |     telemetry_decoder_->set_satellite(satellite_); | ||||||
|   | |||||||
| @@ -75,7 +75,7 @@ public: | |||||||
|     gr::basic_block_sptr get_left_block() override; |     gr::basic_block_sptr get_left_block() override; | ||||||
|     gr::basic_block_sptr get_right_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 set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } | ||||||
|  |  | ||||||
|     inline void reset() override |     inline void reset() override | ||||||
|   | |||||||
| @@ -67,7 +67,7 @@ GlonassL1CaTelemetryDecoder::~GlonassL1CaTelemetryDecoder() | |||||||
| {} | {} | ||||||
|  |  | ||||||
|  |  | ||||||
| void GlonassL1CaTelemetryDecoder::set_satellite(Gnss_Satellite satellite) | void GlonassL1CaTelemetryDecoder::set_satellite(const Gnss_Satellite & satellite) | ||||||
| { | { | ||||||
|     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); |     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     telemetry_decoder_->set_satellite(satellite_); |     telemetry_decoder_->set_satellite(satellite_); | ||||||
|   | |||||||
| @@ -63,12 +63,12 @@ public: | |||||||
|     { |     { | ||||||
|         return "GLONASS_L1_CA_Telemetry_Decoder"; |         return "GLONASS_L1_CA_Telemetry_Decoder"; | ||||||
|     } |     } | ||||||
|     void connect(gr::top_block_sptr top_block); |     void connect(gr::top_block_sptr top_block) override; | ||||||
|     void disconnect(gr::top_block_sptr top_block); |     void disconnect(gr::top_block_sptr top_block) override; | ||||||
|     gr::basic_block_sptr get_left_block(); |     gr::basic_block_sptr get_left_block() override; | ||||||
|     gr::basic_block_sptr get_right_block(); |     gr::basic_block_sptr get_right_block() override; | ||||||
|     void set_satellite(Gnss_Satellite satellite); |     void set_satellite(const Gnss_Satellite & satellite) override; | ||||||
|     void set_channel(int channel){telemetry_decoder_->set_channel(channel);} |     void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);} | ||||||
|     void reset() |     void reset() | ||||||
|     { |     { | ||||||
|         return; |         return; | ||||||
|   | |||||||
| @@ -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()); |     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     telemetry_decoder_->set_satellite(satellite_); |     telemetry_decoder_->set_satellite(satellite_); | ||||||
|   | |||||||
| @@ -69,7 +69,7 @@ public: | |||||||
|     gr::basic_block_sptr get_left_block() override; |     gr::basic_block_sptr get_left_block() override; | ||||||
|     gr::basic_block_sptr get_right_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 set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } | ||||||
|  |  | ||||||
|     inline void reset() override |     inline void reset() override | ||||||
|   | |||||||
| @@ -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()); |     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     telemetry_decoder_->set_satellite(satellite_); |     telemetry_decoder_->set_satellite(satellite_); | ||||||
|   | |||||||
| @@ -69,7 +69,7 @@ public: | |||||||
|     gr::basic_block_sptr get_left_block() override; |     gr::basic_block_sptr get_left_block() override; | ||||||
|     gr::basic_block_sptr get_right_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 set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } | ||||||
|  |  | ||||||
|     inline void reset() override |     inline void reset() override | ||||||
|   | |||||||
| @@ -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()); |     satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     telemetry_decoder_->set_satellite(satellite_); |     telemetry_decoder_->set_satellite(satellite_); | ||||||
|   | |||||||
| @@ -72,7 +72,7 @@ public: | |||||||
|     gr::basic_block_sptr get_left_block() override; |     gr::basic_block_sptr get_left_block() override; | ||||||
|     gr::basic_block_sptr get_right_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 set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } | ||||||
|  |  | ||||||
|     inline void reset() override |     inline void reset() override | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ using google::LogMessage; | |||||||
|  |  | ||||||
|  |  | ||||||
| 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_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)); |     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( | galileo_e1b_telemetry_decoder_cc::galileo_e1b_telemetry_decoder_cc( | ||||||
|         Gnss_Satellite satellite, |         const Gnss_Satellite & satellite, | ||||||
|         bool dump) : |         bool dump) : | ||||||
|                    gr::block("galileo_e1b_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), |                    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))) |                            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()); |     d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     DLOG(INFO) << "Setting decoder Finite State Machine to satellite " << d_satellite; |     DLOG(INFO) << "Setting decoder Finite State Machine to satellite " << d_satellite; | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ class galileo_e1b_telemetry_decoder_cc; | |||||||
|  |  | ||||||
| typedef boost::shared_ptr<galileo_e1b_telemetry_decoder_cc> galileo_e1b_telemetry_decoder_cc_sptr; | typedef boost::shared_ptr<galileo_e1b_telemetry_decoder_cc> 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 |  * \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: | public: | ||||||
|     ~galileo_e1b_telemetry_decoder_cc(); |     ~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 |     void set_channel(int channel);                 //!< Set receiver's channel | ||||||
|     int flag_even_word_arrived; |     int flag_even_word_arrived; | ||||||
|  |  | ||||||
| @@ -73,8 +73,8 @@ public: | |||||||
|  |  | ||||||
| private: | private: | ||||||
|     friend galileo_e1b_telemetry_decoder_cc_sptr |     friend 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); | ||||||
|     galileo_e1b_telemetry_decoder_cc(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); |     void viterbi_decoder(double *page_part_symbols, int *page_part_bits); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -50,7 +50,7 @@ using google::LogMessage; | |||||||
|  |  | ||||||
|  |  | ||||||
| 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_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)); |     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( | 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)), | ||||||
|                 gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) |                 gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) | ||||||
| { | { | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ class galileo_e5a_telemetry_decoder_cc; | |||||||
|  |  | ||||||
| typedef boost::shared_ptr<galileo_e5a_telemetry_decoder_cc> galileo_e5a_telemetry_decoder_cc_sptr; | typedef boost::shared_ptr<galileo_e5a_telemetry_decoder_cc> 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: | private: | ||||||
|     friend galileo_e5a_telemetry_decoder_cc_sptr |     friend 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); | ||||||
|     galileo_e5a_telemetry_decoder_cc(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); |     void viterbi_decoder(double *page_part_symbols, int *page_part_bits); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -49,14 +49,14 @@ using google::LogMessage; | |||||||
|  |  | ||||||
|  |  | ||||||
| glonass_l1_ca_telemetry_decoder_cc_sptr | glonass_l1_ca_telemetry_decoder_cc_sptr | ||||||
| glonass_l1_ca_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump) | glonass_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump) | ||||||
| { | { | ||||||
|     return glonass_l1_ca_telemetry_decoder_cc_sptr(new glonass_l1_ca_telemetry_decoder_cc(satellite, dump)); |     return glonass_l1_ca_telemetry_decoder_cc_sptr(new glonass_l1_ca_telemetry_decoder_cc(satellite, dump)); | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
| glonass_l1_ca_telemetry_decoder_cc::glonass_l1_ca_telemetry_decoder_cc( | glonass_l1_ca_telemetry_decoder_cc::glonass_l1_ca_telemetry_decoder_cc( | ||||||
|         Gnss_Satellite satellite, |         const Gnss_Satellite & satellite, | ||||||
|         bool dump) : |         bool dump) : | ||||||
|         gr::block("glonass_l1_ca_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), |         gr::block("glonass_l1_ca_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), | ||||||
|         gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) |         gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))) | ||||||
| @@ -415,7 +415,7 @@ int glonass_l1_ca_telemetry_decoder_cc::general_work (int noutput_items __attrib | |||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
| void glonass_l1_ca_telemetry_decoder_cc::set_satellite(Gnss_Satellite satellite) | void glonass_l1_ca_telemetry_decoder_cc::set_satellite(const Gnss_Satellite & satellite) | ||||||
| { | { | ||||||
|     d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); |     d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|     DLOG(INFO) << "Setting decoder Finite State Machine to satellite "<< d_satellite; |     DLOG(INFO) << "Setting decoder Finite State Machine to satellite "<< d_satellite; | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ class glonass_l1_ca_telemetry_decoder_cc; | |||||||
|  |  | ||||||
| typedef boost::shared_ptr<glonass_l1_ca_telemetry_decoder_cc> glonass_l1_ca_telemetry_decoder_cc_sptr; | typedef boost::shared_ptr<glonass_l1_ca_telemetry_decoder_cc> glonass_l1_ca_telemetry_decoder_cc_sptr; | ||||||
|  |  | ||||||
| glonass_l1_ca_telemetry_decoder_cc_sptr glonass_l1_ca_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); | glonass_l1_ca_telemetry_decoder_cc_sptr glonass_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); | ||||||
|  |  | ||||||
| /*! | /*! | ||||||
|  * \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1 |  * \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1 | ||||||
| @@ -62,9 +62,9 @@ glonass_l1_ca_telemetry_decoder_cc_sptr glonass_l1_ca_make_telemetry_decoder_cc( | |||||||
| class glonass_l1_ca_telemetry_decoder_cc : public gr::block | class glonass_l1_ca_telemetry_decoder_cc : public gr::block | ||||||
| { | { | ||||||
| public: | public: | ||||||
|     ~glonass_l1_ca_telemetry_decoder_cc();          //!< Class destructor |     ~glonass_l1_ca_telemetry_decoder_cc();                  //!< Class destructor | ||||||
|     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 |     void set_channel(int channel);                          //!< Set receiver's channel | ||||||
|  |  | ||||||
|     /*! |     /*! | ||||||
|      * \brief This is where all signal processing takes place |      * \brief This is where all signal processing takes place | ||||||
| @@ -74,8 +74,8 @@ public: | |||||||
|  |  | ||||||
| private: | private: | ||||||
|     friend glonass_l1_ca_telemetry_decoder_cc_sptr |     friend glonass_l1_ca_telemetry_decoder_cc_sptr | ||||||
|     glonass_l1_ca_make_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); |     glonass_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); | ||||||
|     glonass_l1_ca_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); |     glonass_l1_ca_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); | ||||||
|  |  | ||||||
|     void decode_string(double *symbols, int frame_length); |     void decode_string(double *symbols, int frame_length); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -43,14 +43,14 @@ | |||||||
| using google::LogMessage; | using google::LogMessage; | ||||||
|  |  | ||||||
| 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) | ||||||
| { | { | ||||||
|     return gps_l1_ca_telemetry_decoder_cc_sptr(new gps_l1_ca_telemetry_decoder_cc(satellite, 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( | gps_l1_ca_telemetry_decoder_cc::gps_l1_ca_telemetry_decoder_cc( | ||||||
|         Gnss_Satellite satellite, |         const Gnss_Satellite & satellite, | ||||||
|         bool dump) : |         bool dump) : | ||||||
|         gr::block("gps_navigation_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), |         gr::block("gps_navigation_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), | ||||||
|         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()); |      d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); | ||||||
|      LOG(INFO) << "Setting decoder Finite State Machine to satellite "  << d_satellite; |      LOG(INFO) << "Setting decoder Finite State Machine to satellite "  << d_satellite; | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ class gps_l1_ca_telemetry_decoder_cc; | |||||||
| typedef boost::shared_ptr<gps_l1_ca_telemetry_decoder_cc> gps_l1_ca_telemetry_decoder_cc_sptr; | typedef boost::shared_ptr<gps_l1_ca_telemetry_decoder_cc> gps_l1_ca_telemetry_decoder_cc_sptr; | ||||||
|  |  | ||||||
| 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 |  * \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: | public: | ||||||
|     ~gps_l1_ca_telemetry_decoder_cc(); |     ~gps_l1_ca_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 |     void set_channel(int channel);                         //!< Set receiver's channel | ||||||
|  |  | ||||||
|     /*! |     /*! | ||||||
|      * \brief This is where all signal processing takes place |      * \brief This is where all signal processing takes place | ||||||
| @@ -68,9 +68,9 @@ public: | |||||||
|  |  | ||||||
| private: | private: | ||||||
|     friend gps_l1_ca_telemetry_decoder_cc_sptr |     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); |     bool gps_word_parityCheck(unsigned int gpsword); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,14 +41,14 @@ | |||||||
| using google::LogMessage; | using google::LogMessage; | ||||||
|  |  | ||||||
| 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) | ||||||
| { | { | ||||||
|     return gps_l2c_telemetry_decoder_cc_sptr(new gps_l2c_telemetry_decoder_cc(satellite, 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( | 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)), | ||||||
|                 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()); |     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; |     LOG(INFO) << "GPS L2C CNAV telemetry decoder in channel " << this->d_channel << " set to satellite " << d_satellite; | ||||||
|   | |||||||
| @@ -57,7 +57,7 @@ class gps_l2c_telemetry_decoder_cc; | |||||||
| typedef boost::shared_ptr<gps_l2c_telemetry_decoder_cc> gps_l2c_telemetry_decoder_cc_sptr; | typedef boost::shared_ptr<gps_l2c_telemetry_decoder_cc> gps_l2c_telemetry_decoder_cc_sptr; | ||||||
|  |  | ||||||
| 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 |  * \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: | public: | ||||||
|     ~gps_l2c_telemetry_decoder_cc(); |     ~gps_l2c_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 |     void set_channel(int channel);                         //!< Set receiver's channel | ||||||
|  |  | ||||||
|     /*! |     /*! | ||||||
|      * \brief This is where all signal processing takes place |      * \brief This is where all signal processing takes place | ||||||
| @@ -79,8 +79,8 @@ public: | |||||||
|  |  | ||||||
| private: | private: | ||||||
|     friend gps_l2c_telemetry_decoder_cc_sptr |     friend 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); | ||||||
|     gps_l2c_telemetry_decoder_cc(Gnss_Satellite satellite, bool dump); |     gps_l2c_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump); | ||||||
|  |  | ||||||
|     bool d_dump; |     bool d_dump; | ||||||
|     Gnss_Satellite d_satellite; |     Gnss_Satellite d_satellite; | ||||||
|   | |||||||
| @@ -48,7 +48,7 @@ using google::LogMessage; | |||||||
|  |  | ||||||
|  |  | ||||||
| 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) | ||||||
| { | { | ||||||
|     return sbas_l1_telemetry_decoder_cc_sptr(new sbas_l1_telemetry_decoder_cc(satellite, 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( | sbas_l1_telemetry_decoder_cc::sbas_l1_telemetry_decoder_cc( | ||||||
|         Gnss_Satellite satellite, |         const Gnss_Satellite & satellite, | ||||||
|         bool dump) : |         bool dump) : | ||||||
|                 gr::block("sbas_l1_telemetry_decoder_cc", |                 gr::block("sbas_l1_telemetry_decoder_cc", | ||||||
|                 gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), |                 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()); |     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; |     LOG(INFO) << "SBAS telemetry decoder in channel " << this->d_channel << " set to satellite " << d_satellite; | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ class sbas_l1_telemetry_decoder_cc; | |||||||
| typedef boost::shared_ptr<sbas_l1_telemetry_decoder_cc> sbas_l1_telemetry_decoder_cc_sptr; | typedef boost::shared_ptr<sbas_l1_telemetry_decoder_cc> sbas_l1_telemetry_decoder_cc_sptr; | ||||||
|  |  | ||||||
| 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 |  * \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: | public: | ||||||
|     ~sbas_l1_telemetry_decoder_cc(); |     ~sbas_l1_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 |     void set_channel(int channel);                         //!< Set receiver's channel | ||||||
|  |  | ||||||
|     /*! |     /*! | ||||||
|      * \brief This is where all signal processing takes place |      * \brief This is where all signal processing takes place | ||||||
| @@ -68,8 +68,8 @@ public: | |||||||
|  |  | ||||||
| private: | private: | ||||||
|     friend sbas_l1_telemetry_decoder_cc_sptr |     friend 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); | ||||||
|     sbas_l1_telemetry_decoder_cc(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 viterbi_decoder(double *page_part_symbols, int *page_part_bits); | ||||||
|     void align_samples(); |     void align_samples(); | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ class TelemetryDecoderInterface : public GNSSBlockInterface | |||||||
| { | { | ||||||
| public: | public: | ||||||
|     virtual void reset() = 0; |     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; |     virtual void set_channel(int channel) = 0; | ||||||
| }; | }; | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Gastd
					Gastd