mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-05 17:04:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2018-07-28 18:49:31 +02:00
commit 9f02d327fd
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
4 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/algorithms/libs/rtklib/rtklib.h
View File

@ -201,7 +201,7 @@ const int NSATGLO = (MAXPRNGLO - MINPRNGLO + 1); //!< number of GLONASS satell
const int NSYSGLO = 1; const int NSYSGLO = 1;
*/ */
const int MINPRNGAL = 1; //!< min satellite PRN number of Galileo const int MINPRNGAL = 1; //!< min satellite PRN number of Galileo
const int MAXPRNGAL = 30; //!< max satellite PRN number of Galileo const int MAXPRNGAL = 36; //!< max satellite PRN number of Galileo
const int NSATGAL = (MAXPRNGAL - MINPRNGAL + 1); //!< number of Galileo satellites const int NSATGAL = (MAXPRNGAL - MINPRNGAL + 1); //!< number of Galileo satellites
const int NSYSGAL = 1; const int NSYSGAL = 1;
@ -452,27 +452,28 @@ typedef struct
} alm_t; } alm_t;
typedef struct { /* GPS/QZS/GAL broadcast ephemeris type */ typedef struct
int sat; /* satellite number */ { /* GPS/QZS/GAL broadcast ephemeris type */
int iode,iodc; /* IODE,IODC */ int sat; /* satellite number */
int sva; /* SV accuracy (URA index) */ int iode, iodc; /* IODE,IODC */
int svh; /* SV health (0:ok) */ int sva; /* SV accuracy (URA index) */
int week; /* GPS/QZS: gps week, GAL: galileo week */ int svh; /* SV health (0:ok) */
int code; /* GPS/QZS: code on L2, GAL/BDS: data sources */ int week; /* GPS/QZS: gps week, GAL: galileo week */
int flag; /* GPS/QZS: L2 P data flag, BDS: nav type */ int code; /* GPS/QZS: code on L2, GAL/BDS: data sources */
gtime_t toe,toc,ttr; /* Toe,Toc,T_trans */ int flag; /* GPS/QZS: L2 P data flag, BDS: nav type */
/* SV orbit parameters */ gtime_t toe, toc, ttr; /* Toe,Toc,T_trans */
double A,e,i0,OMG0,omg,M0,deln,OMGd,idot; /* SV orbit parameters */
double crc,crs,cuc,cus,cic,cis; double A, e, i0, OMG0, omg, M0, deln, OMGd, idot;
double toes; /* Toe (s) in week */ double crc, crs, cuc, cus, cic, cis;
double fit; /* fit interval (h) */ double toes; /* Toe (s) in week */
double f0,f1,f2; /* SV clock parameters (af0,af1,af2) */ double fit; /* fit interval (h) */
double tgd[4]; /* group delay parameters */ double f0, f1, f2; /* SV clock parameters (af0,af1,af2) */
/* GPS/QZS:tgd[0]=TGD */ double tgd[4]; /* group delay parameters */
/* GAL :tgd[0]=BGD E5a/E1,tgd[1]=BGD E5b/E1 */ /* GPS/QZS:tgd[0]=TGD */
/* BDS :tgd[0]=BGD1,tgd[1]=BGD2 */ /* GAL :tgd[0]=BGD E5a/E1,tgd[1]=BGD E5b/E1 */
double isc[4]; /* GPS :isc[0]=ISCL1, isc[1]=ISCL2, isc[2]=ISCL5I, isc[3]=ISCL5Q */ /* BDS :tgd[0]=BGD1,tgd[1]=BGD2 */
double Adot,ndot; /* Adot,ndot for CNAV */ double isc[4]; /* GPS :isc[0]=ISCL1, isc[1]=ISCL2, isc[2]=ISCL5I, isc[3]=ISCL5Q */
double Adot, ndot; /* Adot,ndot for CNAV */
} eph_t; } eph_t;

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
View File

@ -649,9 +649,7 @@ if(ENABLE_TESTING)
foreach(kernel ${h_files}) foreach(kernel ${h_files})
get_filename_component(kernel ${kernel} NAME) get_filename_component(kernel ${kernel} NAME)
string(REPLACE ".h" "" kernel ${kernel}) string(REPLACE ".h" "" kernel ${kernel})
if(NOT ${kernel} MATCHES puppet*) VOLK_ADD_TEST(${kernel} "volk_gnsssdr_test_all")
VOLK_ADD_TEST(${kernel} "volk_gnsssdr_test_all")
endif(NOT ${kernel} MATCHES puppet*)
endforeach() endforeach()
endif(ENABLE_TESTING) endif(ENABLE_TESTING)

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
View File

@ -39,7 +39,7 @@ int main(int argc, char* argv[])
float def_tol = 1e-6; float def_tol = 1e-6;
lv_32fc_t def_scalar = 327.0; lv_32fc_t def_scalar = 327.0;
int def_iter = 1; int def_iter = 1;
int def_vlen = 131071; int def_vlen = 8111;
bool def_benchmark_mode = true; bool def_benchmark_mode = true;
std::string def_kernel_regex = ""; std::string def_kernel_regex = "";

12
src/core/system_parameters/gnss_satellite.cc
View File

@ -546,9 +546,15 @@ std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int
case 12: case 12:
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. 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; break;
case 13:
block_ = std::string("FOC-FM20"); // Galileo Full Operational Capability (FOC) satellite FM20 / GSAT0220, launched on Jul. 25, 2018. UNDER COMMISSIONING.
break;
case 14: 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. UNDER TESTING.
break; break;
case 15:
block_ = std::string("FOC-FM21"); // Galileo Full Operational Capability (FOC) satellite FM21 / GSAT0221, launched on Jul. 25, 2018. UNDER COMMISSIONING.
break;
case 18: 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. UNDER TESTING.
break; break;
@ -582,6 +588,12 @@ std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int
case 31: 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. UNDER COMMISSIONING.
break; break;
case 33:
block_ = std::string("FOC-FM22"); // Galileo Full Operational Capability (FOC) satellite FM22 / GSAT0222, launched on Jul. 25, 2018. UNDER COMMISSIONING.
break;
case 36:
block_ = std::string("FOC-FM19"); // Galileo Full Operational Capability (FOC) satellite FM19 / GSAT0219, launched on Jul. 25, 2018. UNDER COMMISSIONING.
break;
default: default:
block_ = std::string("Unknown(Simulated)"); block_ = std::string("Unknown(Simulated)");
} }