mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Merge branch 'next' of github.com:carlesfernandez/gnss-sdr into ism
This commit is contained in:
		| @@ -116,12 +116,16 @@ target_link_libraries(core_system_parameters | ||||
|     PUBLIC | ||||
|         Boost::date_time | ||||
|         Boost::serialization | ||||
|     PRIVATE | ||||
|         Boost::headers | ||||
|         Gflags::gflags | ||||
|         Glog::glog | ||||
| ) | ||||
|  | ||||
| if(ENABLE_GLOG_AND_GFLAGS) | ||||
|     target_link_libraries(core_system_parameters PRIVATE Gflags::gflags Glog::glog) | ||||
|     target_compile_definitions(core_system_parameters PRIVATE -DUSE_GLOG_AND_GFLAGS=1) | ||||
| else() | ||||
|     target_link_libraries(core_system_parameters PRIVATE absl::flags absl::log) | ||||
| endif() | ||||
|  | ||||
| # for gnss_sdr_make_unique.h | ||||
| target_include_directories(core_system_parameters | ||||
|     PUBLIC | ||||
|   | ||||
| @@ -353,7 +353,7 @@ int32_t Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& s | ||||
|                     d_DeltaT_LSF = static_cast<double>(read_navigation_signed(subframe_bits, D1_DELTA_T_LSF)); | ||||
|                     i_WN_LSF = static_cast<double>(read_navigation_signed(subframe_bits, D1_WN_LSF)); | ||||
|                     d_A0UTC = static_cast<double>(read_navigation_signed(subframe_bits, D1_A0UTC)); | ||||
|                     d_A0UTC = d_A0GPS * D1_A0GPS_LSB; | ||||
|                     d_A0UTC = d_A0UTC * D1_A0UTC_LSB; | ||||
|                     d_A1UTC = static_cast<double>(read_navigation_signed(subframe_bits, D1_A1UTC)); | ||||
|                     d_A1UTC = d_A1UTC * D1_A1UTC_LSB; | ||||
|  | ||||
|   | ||||
| @@ -19,11 +19,16 @@ | ||||
| #include "galileo_cnav_message.h" | ||||
| #include <boost/crc.hpp>             // for boost::crc_basic, boost::crc_optimal | ||||
| #include <boost/dynamic_bitset.hpp>  // for boost::dynamic_bitset | ||||
| #include <glog/logging.h> | ||||
| #include <algorithm>  // for reverse | ||||
| #include <algorithm>                 // for reverse | ||||
| #include <limits> | ||||
| #include <vector> | ||||
|  | ||||
| #if USE_GLOG_AND_GFLAGS | ||||
| #include <glog/logging.h> | ||||
| #else | ||||
| #include <absl/log/log.h> | ||||
| #endif | ||||
|  | ||||
| using CRC_Galileo_CNAV_type = boost::crc_optimal<24, 0x1864CFBU, 0x0, 0x0, false, false>; | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -23,11 +23,16 @@ | ||||
| #include "galileo_fnav_message.h" | ||||
| #include <boost/crc.hpp>  // for boost::crc_basic, boost::crc_optimal | ||||
| #include <boost/dynamic_bitset.hpp> | ||||
| #include <glog/logging.h> | ||||
| #include <algorithm>  // for reverse | ||||
| #include <iostream>   // for string, operator<< | ||||
| #include <iterator>   // for back_insert_iterator | ||||
|  | ||||
| #if USE_GLOG_AND_GFLAGS | ||||
| #include <glog/logging.h> | ||||
| #else | ||||
| #include <absl/log/log.h> | ||||
| #endif | ||||
|  | ||||
| using CRC_Galileo_FNAV_type = boost::crc_optimal<24, 0x1864CFBU, 0x0, 0x0, false, false>; | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -21,12 +21,16 @@ | ||||
| #include "reed_solomon.h" | ||||
| #include <boost/crc.hpp>             // for boost::crc_basic, boost::crc_optimal | ||||
| #include <boost/dynamic_bitset.hpp>  // for boost::dynamic_bitset | ||||
| #include <glog/logging.h>            // for DLOG | ||||
| #include <algorithm>                 // for reverse | ||||
| #include <iostream>                  // for operator<< | ||||
| #include <limits>                    // for std::numeric_limits | ||||
| #include <numeric>                   // for std::accumulate | ||||
|  | ||||
| #if USE_GLOG_AND_GFLAGS | ||||
| #include <glog/logging.h> | ||||
| #else | ||||
| #include <absl/log/log.h> | ||||
| #endif | ||||
|  | ||||
| using CRC_Galileo_INAV_type = boost::crc_optimal<24, 0x1864CFBU, 0x0, 0x0, false, false>; | ||||
|  | ||||
|   | ||||
| @@ -19,10 +19,15 @@ | ||||
| #include "glonass_gnav_navigation_message.h" | ||||
| #include "MATH_CONSTANTS.h"  // for TWO_N20, TWO_N30, TWO_N14, TWO_N15, TWO_N18 | ||||
| #include "gnss_satellite.h" | ||||
| #include <glog/logging.h> | ||||
| #include <cstddef>  // for size_t | ||||
| #include <ostream>  // for operator<< | ||||
|  | ||||
| #if USE_GLOG_AND_GFLAGS | ||||
| #include <glog/logging.h> | ||||
| #else | ||||
| #include <absl/log/log.h> | ||||
| #endif | ||||
|  | ||||
|  | ||||
| Glonass_Gnav_Navigation_Message::Glonass_Gnav_Navigation_Message() | ||||
| { | ||||
|   | ||||
| @@ -15,9 +15,14 @@ | ||||
|  */ | ||||
|  | ||||
| #include "gnss_satellite.h" | ||||
| #include <glog/logging.h> | ||||
| #include <utility> | ||||
|  | ||||
| #if USE_GLOG_AND_GFLAGS | ||||
| #include <glog/logging.h> | ||||
| #else | ||||
| #include <absl/log/log.h> | ||||
| #endif | ||||
|  | ||||
|  | ||||
| Gnss_Satellite::Gnss_Satellite(const std::string& system_, uint32_t PRN_) | ||||
| { | ||||
| @@ -386,7 +391,7 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ | ||||
|                     block_ = std::string("IIF");  // Plane C | ||||
|                     break; | ||||
|                 case 28: | ||||
|                     block_ = std::string("IIR");  // Plane B | ||||
|                     block_ = std::string("III");  // Plane B | ||||
|                     break; | ||||
|                 case 29: | ||||
|                     block_ = std::string("IIR-M");  // Plane C | ||||
| @@ -543,7 +548,7 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ | ||||
|             switch (PRN_) | ||||
|                 { | ||||
|                 case 1: | ||||
|                     block_ = std::string("FOC-FM10");  // Galileo Full Operational Capability (FOC) satellite FM10 / GSAT-0210, launched on May 24, 2016. | ||||
|                     block_ = std::string("FOC-FM10");  // Galileo Full Operational Capability (FOC) satellite FM10 / GSAT-0210, launched on May 24, 2016. NOT USABLE. | ||||
|                     break; | ||||
|                 case 2: | ||||
|                     block_ = std::string("FOC-FM11");  // Galileo Full Operational Capability (FOC) satellite FM11 / GSAT-0211, launched on May 24, 2016. | ||||
| @@ -557,6 +562,9 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ | ||||
|                 case 5: | ||||
|                     block_ = std::string("FOC-FM14");  // Galileo Full Operational Capability (FOC) satellite FM14 / GSAT-0214, launched on November 17, 2016. | ||||
|                     break; | ||||
|                 case 6: | ||||
|                     block_ = std::string("FOC-FM27");  // Galileo Full Operational Capability (FOC) satellite FM27 / GSAT0227, launched on Apr. 28, 2024. UNDER COMMISSIONING. | ||||
|                     break; | ||||
|                 case 7: | ||||
|                     block_ = std::string("FOC-FM7");  // Galileo Full Operational Capability (FOC) satellite FM7 / GSAT-0207, launched on November 17, 2016. | ||||
|                     break; | ||||
| @@ -576,16 +584,16 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ | ||||
|                     block_ = std::string("IOV-FM2");  // Galileo In-Orbit Validation (IOV) satellite FM2 (Flight Model 2) also known as GSAT0102, from French Guiana at 10:30 GMT on October 21, 2011. | ||||
|                     break; | ||||
|                 case 13: | ||||
|                     block_ = std::string("FOC-FM20");  // Galileo Full Operational Capability (FOC) satellite FM20 / GSAT0220, launched on Jul. 25, 2018. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM20");  // Galileo Full Operational Capability (FOC) satellite FM20 / GSAT0220, launched on Jul. 25, 2018. | ||||
|                     break; | ||||
|                 case 14: | ||||
|                     block_ = std::string("FOC-FM2*");  // Galileo Full Operational Capability (FOC) satellite FM2 / GSAT0202, launched into incorrect orbit on August 22, 2014. Moved to usable orbit in March, 2015. UNDER TESTING. | ||||
|                     block_ = std::string("FOC-FM2*");  // Galileo Full Operational Capability (FOC) satellite FM2 / GSAT0202, launched into incorrect orbit on August 22, 2014. Moved to usable orbit in March, 2015. Not usable since 18/02/2021. | ||||
|                     break; | ||||
|                 case 15: | ||||
|                     block_ = std::string("FOC-FM21");  // Galileo Full Operational Capability (FOC) satellite FM21 / GSAT0221, launched on Jul. 25, 2018. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM21");  // Galileo Full Operational Capability (FOC) satellite FM21 / GSAT0221, launched on Jul. 25, 2018. | ||||
|                     break; | ||||
|                 case 18: | ||||
|                     block_ = std::string("FOC-FM1*");  // Galileo Full Operational Capability (FOC) satellite FM1 / GSAT0201, launched into incorrect orbit on August 22, 2014. Moved to usable orbit in December, 2014. UNDER TESTING. | ||||
|                     block_ = std::string("FOC-FM1*");  // Galileo Full Operational Capability (FOC) satellite FM1 / GSAT0201, launched into incorrect orbit on August 22, 2014. Moved to usable orbit in December, 2014. Not usable since 18/02/2021. | ||||
|                     break; | ||||
|                 case 19: | ||||
|                     block_ = std::string("IOV-FM3");  // Galileo In-Orbit Validation (IOV) satellite FM3 (Flight Model 3) / GSAT0103, launched on October 12, 2012. | ||||
| @@ -594,7 +602,7 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ | ||||
|                     block_ = std::string("IOV-FM4**");  // Galileo In-Orbit Validation (IOV) satellite FM4 (Flight Model 4) / GSAT0104, launched on October 12, 2012. Payload power problem beginning May 27, 2014 led to permanent loss of E5 and E6 transmissions, E1 transmission restored. UNAVAILABLE FROM 2014-05-27 UNTIL FURTHER NOTICE | ||||
|                     break; | ||||
|                 case 21: | ||||
|                     block_ = std::string("FOC-FM15");  // Galileo Full Operational Capability (FOC) satellite FM15 / GSAT0215, launched on Dec. 12, 2017. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM15");  // Galileo Full Operational Capability (FOC) satellite FM15 / GSAT0215, launched on Dec. 12, 2017. | ||||
|                     break; | ||||
|                 case 22: | ||||
|                     block_ = std::string("FOC-FM4**");  // Galileo Full Operational Capability (FOC) satellite FM4 / GSAT0204, launched on March 27, 2015. REMOVED FROM ACTIVE SERVICE ON 2017-12-08 UNTIL FURTHER NOTICE FOR CONSTELLATION MANAGEMENT PURPOSES. | ||||
| @@ -603,28 +611,31 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ | ||||
|                     block_ = std::string("FOC-FM5");  // Galileo Full Operational Capability (FOC) satellite FM5 / GSAT0205, launched on Sept. 11, 2015. | ||||
|                     break; | ||||
|                 case 25: | ||||
|                     block_ = std::string("FOC-FM16");  // Galileo Full Operational Capability (FOC) satellite FM16 / GSAT0216, launched on Dec. 12, 2017. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM16");  // Galileo Full Operational Capability (FOC) satellite FM16 / GSAT0216, launched on Dec. 12, 2017. | ||||
|                     break; | ||||
|                 case 26: | ||||
|                     block_ = std::string("FOC-FM3");  // Galileo Full Operational Capability (FOC) satellite FM3 / GSAT0203, launched on March 27, 2015. | ||||
|                     break; | ||||
|                 case 27: | ||||
|                     block_ = std::string("FOC-FM17");  // Galileo Full Operational Capability (FOC) satellite FM17 / GSAT0217, launched on Dec. 12, 2017. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM17");  // Galileo Full Operational Capability (FOC) satellite FM17 / GSAT0217, launched on Dec. 12, 2017. | ||||
|                     break; | ||||
|                 case 29: | ||||
|                     block_ = std::string("FOC-FM25");  // Galileo Full Operational Capability (FOC) satellite FM25 / GSAT0225, launched on Apr. 28, 2024. UNDER COMMISSIONING. | ||||
|                     break; | ||||
|                 case 30: | ||||
|                     block_ = std::string("FOC-FM6");  // Galileo Full Operational Capability (FOC) satellite FM6 / GSAT0206, launched on Sept. 11, 2015. | ||||
|                     break; | ||||
|                 case 31: | ||||
|                     block_ = std::string("FOC-FM18");  // Galileo Full Operational Capability (FOC) satellite FM18 / GSAT0218, launched on Dec. 12, 2017. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM18");  // Galileo Full Operational Capability (FOC) satellite FM18 / GSAT0218, launched on Dec. 12, 2017. | ||||
|                     break; | ||||
|                 case 33: | ||||
|                     block_ = std::string("FOC-FM22");  // Galileo Full Operational Capability (FOC) satellite FM22 / GSAT0222, launched on Jul. 25, 2018. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM22");  // Galileo Full Operational Capability (FOC) satellite FM22 / GSAT0222, launched on Jul. 25, 2018. | ||||
|                     break; | ||||
|                 case 34: | ||||
|                     block_ = std::string("FOC-FM23");  // Galileo Full Operational Capability (FOC) satellite FM23 / GSAT0223, launched on December 5, 2021. | ||||
|                     break; | ||||
|                 case 36: | ||||
|                     block_ = std::string("FOC-FM19");  // Galileo Full Operational Capability (FOC) satellite FM19 / GSAT0219, launched on Jul. 25, 2018. UNDER COMMISSIONING. | ||||
|                     block_ = std::string("FOC-FM19");  // Galileo Full Operational Capability (FOC) satellite FM19 / GSAT0219, launched on Jul. 25, 2018. | ||||
|                     break; | ||||
|                 default: | ||||
|                     block_ = std::string("Unknown"); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez