Changeset 5666 in ntrip
- Timestamp:
- May 26, 2014, 5:10:21 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
r5662 r5666 281 281 struct ClockOrbit co; 282 282 memset(&co, 0, sizeof(co)); 283 co. GPSEpochTime= static_cast<int>(epoTime.gpssec());284 co. GLONASSEpochTime= static_cast<int>(fmod(epoTime.gpssec(), 86400.0))283 co.EpochTime[CLOCKORBIT_SATGPS] = static_cast<int>(epoTime.gpssec()); 284 co.EpochTime[CLOCKORBIT_SATGLONASS] = static_cast<int>(fmod(epoTime.gpssec(), 86400.0)) 285 285 + 3 * 3600 - gnumleap(year, month, day); 286 co. ClockDataSupplied= 1;287 co. OrbitDataSupplied= 1;286 co.Supplied[COBOFS_CLOCK] = 1; 287 co.Supplied[COBOFS_ORBIT] = 1; 288 288 co.SatRefDatum = DATUM_ITRF; 289 289 co.SSRIOD = _IOD; … … 291 291 co.SSRSolutionID = _SID; 292 292 293 struct Bias bias;293 struct CodeBias bias; 294 294 memset(&bias, 0, sizeof(bias)); 295 bias. GPSEpochTime = co.GPSEpochTime;296 bias. GLONASSEpochTime = co.GLONASSEpochTime;295 bias.EpochTime[CLOCKORBIT_SATGPS] = co.EpochTime[CLOCKORBIT_SATGPS]; 296 bias.EpochTime[CLOCKORBIT_SATGLONASS] = co.EpochTime[CLOCKORBIT_SATGLONASS]; 297 297 298 298 // Default Update Interval … … 421 421 struct ClockOrbit::SatData* sd = 0; 422 422 if (prn[0] == 'G') { 423 sd = co.Sat + co.NumberOf GPSSat;424 ++co.NumberOf GPSSat;423 sd = co.Sat + co.NumberOfSat[CLOCKORBIT_SATGPS]; 424 ++co.NumberOfSat[CLOCKORBIT_SATGPS]; 425 425 } 426 426 else if (prn[0] == 'R') { 427 sd = co.Sat + CLOCKORBIT_NUMGPS + co.NumberOf GLONASSSat;428 ++co.NumberOf GLONASSSat;427 sd = co.Sat + CLOCKORBIT_NUMGPS + co.NumberOfSat[CLOCKORBIT_SATGLONASS]; 428 ++co.NumberOfSat[CLOCKORBIT_SATGLONASS]; 429 429 } 430 430 if (sd) { … … 434 434 } 435 435 436 struct Bias::BiasSat* biasSat = 0;436 struct CodeBias::BiasSat* biasSat = 0; 437 437 if (prn[0] == 'G') { 438 biasSat = bias.Sat + bias.NumberOf GPSSat;439 ++bias.NumberOf GPSSat;438 biasSat = bias.Sat + bias.NumberOfSat[CLOCKORBIT_SATGPS]; 439 ++bias.NumberOfSat[CLOCKORBIT_SATGPS]; 440 440 } 441 441 else if (prn[0] == 'R') { 442 biasSat = bias.Sat + CLOCKORBIT_NUMGPS + bias.NumberOf GLONASSSat;443 ++bias.NumberOf GLONASSSat;442 biasSat = bias.Sat + CLOCKORBIT_NUMGPS + bias.NumberOfSat[CLOCKORBIT_SATGLONASS]; 443 ++bias.NumberOfSat[CLOCKORBIT_SATGLONASS]; 444 444 } 445 445 … … 572 572 // ------------------------------------ 573 573 if (_samplRtcmEphCorr == 0.0) { 574 if (co.NumberOf GPSSat > 0 || co.NumberOfGLONASSSat> 0) {574 if (co.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) { 575 575 char obuffer[CLOCKORBIT_BUFFERSIZE]; 576 576 int len = MakeClockOrbit(&co, COTYPE_AUTO, 0, obuffer, sizeof(obuffer)); … … 584 584 // -------------------------------------- 585 585 else { 586 if (co.NumberOf GPSSat> 0) {586 if (co.NumberOfSat[CLOCKORBIT_SATGPS] > 0) { 587 587 char obuffer[CLOCKORBIT_BUFFERSIZE]; 588 588 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { … … 594 594 } 595 595 } 596 int mmsg = (co.NumberOf GLONASSSat> 0) ? 1 : 0;596 int mmsg = (co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ? 1 : 0; 597 597 int len2 = MakeClockOrbit(&co, COTYPE_GPSCLOCK, mmsg, obuffer, sizeof(obuffer)); 598 598 if (len2 > 0) { … … 600 600 } 601 601 } 602 if (co.NumberOf GLONASSSat> 0) {602 if (co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) { 603 603 char obuffer[CLOCKORBIT_BUFFERSIZE]; 604 604 if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) { … … 620 620 // ------ 621 621 QByteArray hlpBufferBias; 622 if (bias.NumberOf GPSSat > 0 || bias.NumberOfGLONASSSat> 0) {622 if (bias.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || bias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) { 623 623 char obuffer[CLOCKORBIT_BUFFERSIZE]; 624 int len = Make Bias(&bias, BTYPE_AUTO, 0, obuffer, sizeof(obuffer));624 int len = MakeCodeBias(&bias, BTYPE_AUTO, 0, obuffer, sizeof(obuffer)); 625 625 if (len > 0) { 626 626 hlpBufferBias = QByteArray(obuffer, len);
Note:
See TracChangeset
for help on using the changeset viewer.