mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-18 21:23:02 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
This commit is contained in:
commit
9f02d327fd
@ -201,7 +201,7 @@ const int NSATGLO = (MAXPRNGLO - MINPRNGLO + 1); //!< number of GLONASS satell
|
||||
const int NSYSGLO = 1;
|
||||
*/
|
||||
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 NSYSGAL = 1;
|
||||
|
||||
@ -452,27 +452,28 @@ typedef struct
|
||||
} alm_t;
|
||||
|
||||
|
||||
typedef struct { /* GPS/QZS/GAL broadcast ephemeris type */
|
||||
int sat; /* satellite number */
|
||||
int iode,iodc; /* IODE,IODC */
|
||||
int sva; /* SV accuracy (URA index) */
|
||||
int svh; /* SV health (0:ok) */
|
||||
int week; /* GPS/QZS: gps week, GAL: galileo week */
|
||||
int code; /* GPS/QZS: code on L2, GAL/BDS: data sources */
|
||||
int flag; /* GPS/QZS: L2 P data flag, BDS: nav type */
|
||||
gtime_t toe,toc,ttr; /* Toe,Toc,T_trans */
|
||||
/* SV orbit parameters */
|
||||
double A,e,i0,OMG0,omg,M0,deln,OMGd,idot;
|
||||
double crc,crs,cuc,cus,cic,cis;
|
||||
double toes; /* Toe (s) in week */
|
||||
double fit; /* fit interval (h) */
|
||||
double f0,f1,f2; /* SV clock parameters (af0,af1,af2) */
|
||||
double tgd[4]; /* group delay parameters */
|
||||
/* GPS/QZS:tgd[0]=TGD */
|
||||
/* GAL :tgd[0]=BGD E5a/E1,tgd[1]=BGD E5b/E1 */
|
||||
/* BDS :tgd[0]=BGD1,tgd[1]=BGD2 */
|
||||
double isc[4]; /* GPS :isc[0]=ISCL1, isc[1]=ISCL2, isc[2]=ISCL5I, isc[3]=ISCL5Q */
|
||||
double Adot,ndot; /* Adot,ndot for CNAV */
|
||||
typedef struct
|
||||
{ /* GPS/QZS/GAL broadcast ephemeris type */
|
||||
int sat; /* satellite number */
|
||||
int iode, iodc; /* IODE,IODC */
|
||||
int sva; /* SV accuracy (URA index) */
|
||||
int svh; /* SV health (0:ok) */
|
||||
int week; /* GPS/QZS: gps week, GAL: galileo week */
|
||||
int code; /* GPS/QZS: code on L2, GAL/BDS: data sources */
|
||||
int flag; /* GPS/QZS: L2 P data flag, BDS: nav type */
|
||||
gtime_t toe, toc, ttr; /* Toe,Toc,T_trans */
|
||||
/* SV orbit parameters */
|
||||
double A, e, i0, OMG0, omg, M0, deln, OMGd, idot;
|
||||
double crc, crs, cuc, cus, cic, cis;
|
||||
double toes; /* Toe (s) in week */
|
||||
double fit; /* fit interval (h) */
|
||||
double f0, f1, f2; /* SV clock parameters (af0,af1,af2) */
|
||||
double tgd[4]; /* group delay parameters */
|
||||
/* GPS/QZS:tgd[0]=TGD */
|
||||
/* GAL :tgd[0]=BGD E5a/E1,tgd[1]=BGD E5b/E1 */
|
||||
/* BDS :tgd[0]=BGD1,tgd[1]=BGD2 */
|
||||
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;
|
||||
|
||||
|
||||
|
@ -649,9 +649,7 @@ if(ENABLE_TESTING)
|
||||
foreach(kernel ${h_files})
|
||||
get_filename_component(kernel ${kernel} NAME)
|
||||
string(REPLACE ".h" "" kernel ${kernel})
|
||||
if(NOT ${kernel} MATCHES puppet*)
|
||||
VOLK_ADD_TEST(${kernel} "volk_gnsssdr_test_all")
|
||||
endif(NOT ${kernel} MATCHES puppet*)
|
||||
VOLK_ADD_TEST(${kernel} "volk_gnsssdr_test_all")
|
||||
endforeach()
|
||||
|
||||
endif(ENABLE_TESTING)
|
||||
|
@ -39,7 +39,7 @@ int main(int argc, char* argv[])
|
||||
float def_tol = 1e-6;
|
||||
lv_32fc_t def_scalar = 327.0;
|
||||
int def_iter = 1;
|
||||
int def_vlen = 131071;
|
||||
int def_vlen = 8111;
|
||||
bool def_benchmark_mode = true;
|
||||
std::string def_kernel_regex = "";
|
||||
|
||||
|
@ -546,9 +546,15 @@ std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int
|
||||
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.
|
||||
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:
|
||||
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;
|
||||
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:
|
||||
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;
|
||||
@ -582,6 +588,12 @@ std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int
|
||||
case 31:
|
||||
block_ = std::string("FOC-FM18"); // Galileo Full Operational Capability (FOC) satellite FM18 / GSAT0218, launched on Dec. 12, 2017. UNDER COMMISSIONING.
|
||||
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:
|
||||
block_ = std::string("Unknown(Simulated)");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user