Changeset 4264 in ntrip for trunk/BNC/bncpppclient.cpp
- Timestamp:
- Jun 22, 2012, 11:23:02 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/bncpppclient.cpp
r4149 r4264 160 160 // -------------------- 161 161 if (obs.satSys == 'G') { 162 if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs. L1() && obs.L2() ) {162 if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs.l1() && obs.l2() ) { 163 163 double f1 = t_CST::freq1; 164 164 double f2 = t_CST::freq2; … … 177 177 satData->P2 = obs.C2; 178 178 } 179 satData->L1 = obs. L1() * t_CST::c / f1;180 satData->L2 = obs. L2() * t_CST::c / f2;179 satData->L1 = obs.l1() * t_CST::c / f1; 180 satData->L2 = obs.l2() * t_CST::c / f2; 181 181 satData->P3 = c1 * satData->P1 + c2 * satData->P2; 182 182 satData->L3 = c1 * satData->L1 + c2 * satData->L2; … … 193 193 // ------------------------ 194 194 else if (obs.satSys == 'R') { 195 if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs. L1() && obs.L2() ) {195 if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs.l1() && obs.l2() ) { 196 196 double f1 = 1602000000.0 + 562500.0 * obs.slotNum; 197 197 double f2 = 1246000000.0 + 437500.0 * obs.slotNum; … … 210 210 satData->P2 = obs.C2; 211 211 } 212 satData->L1 = obs. L1() * t_CST::c / f1;213 satData->L2 = obs. L2() * t_CST::c / f2;212 satData->L1 = obs.l1() * t_CST::c / f1; 213 satData->L2 = obs.l2() * t_CST::c / f2; 214 214 satData->P3 = c1 * satData->P1 + c2 * satData->P2; 215 215 satData->L3 = c1 * satData->L1 + c2 * satData->L2; … … 226 226 // ------------------------ 227 227 else if (obs.satSys == 'E') { 228 if ( obs.C1 && obs.C5 && obs. L1() && obs.L5) {228 if ( obs.C1 && obs.C5 && obs.l1() && obs.L5) { 229 229 double f1 = t_CST::freq1; 230 230 double f5 = t_CST::freq5; … … 234 234 satData->P1 = obs.C1; 235 235 satData->P5 = obs.C5; 236 satData->L1 = obs. L1() * t_CST::c / f1;236 satData->L1 = obs.l1() * t_CST::c / f1; 237 237 satData->L5 = obs.L5 * t_CST::c / f5; 238 238 satData->P3 = c1 * satData->P1 + c5 * satData->P5;
Note:
See TracChangeset
for help on using the changeset viewer.