mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	cpplint: fix whitespace/semicolon
This commit is contained in:
		| @@ -158,7 +158,6 @@ double adjcp(rtcm_t *rtcm, int sat, int freq, double cp) | |||||||
| { | { | ||||||
|     if (rtcm->cp[sat - 1][freq] == 0.0) |     if (rtcm->cp[sat - 1][freq] == 0.0) | ||||||
|         { |         { | ||||||
|             ; |  | ||||||
|         } |         } | ||||||
|     else if (cp < rtcm->cp[sat - 1][freq] - 750.0) |     else if (cp < rtcm->cp[sat - 1][freq] - 750.0) | ||||||
|         { |         { | ||||||
| @@ -1860,7 +1859,6 @@ int decode_type1047(rtcm_t *rtcm) | |||||||
|     eph_t eph = {0, -1, -1, 0, 0, 0, 0, 0, {0, 0.0}, {0, 0.0}, {0, 0.0}, |     eph_t eph = {0, -1, -1, 0, 0, 0, 0, 0, {0, 0.0}, {0, 0.0}, {0, 0.0}, | ||||||
|         0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, |         0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, | ||||||
|         0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, {0.0}, {0.0}, 0.0, 0.0}; |         0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, {0.0}, {0.0}, 0.0, 0.0}; | ||||||
|     ; |  | ||||||
|     double toc; |     double toc; | ||||||
|     double sqrtA; |     double sqrtA; | ||||||
|     char *msg; |     char *msg; | ||||||
|   | |||||||
| @@ -3142,7 +3142,6 @@ int readblq(const char *file, const char *sta, double *odisp) | |||||||
|     sscanf(sta, "%16s", staname); |     sscanf(sta, "%16s", staname); | ||||||
|     for (p = staname; (*p = static_cast<char>(toupper(static_cast<int>(*p)))); p++) |     for (p = staname; (*p = static_cast<char>(toupper(static_cast<int>(*p)))); p++) | ||||||
|         { |         { | ||||||
|             ; |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     if (!(fp = fopen(file, "re"))) |     if (!(fp = fopen(file, "re"))) | ||||||
| @@ -3163,7 +3162,6 @@ int readblq(const char *file, const char *sta, double *odisp) | |||||||
|                 } |                 } | ||||||
|             for (p = name; (*p = static_cast<char>(toupper(static_cast<int>(*p)))); p++) |             for (p = name; (*p = static_cast<char>(toupper(static_cast<int>(*p)))); p++) | ||||||
|                 { |                 { | ||||||
|                     ; |  | ||||||
|                 } |                 } | ||||||
|             if (strcmp(name, staname) != 0) |             if (strcmp(name, staname) != 0) | ||||||
|                 { |                 { | ||||||
|   | |||||||
| @@ -1002,35 +1002,35 @@ void detslp_gf_L1L5(rtk_t *rtk, const obsd_t *obs, int i, int j, | |||||||
| void detslp_dop(rtk_t *rtk __attribute__((unused)), const obsd_t *obs __attribute__((unused)), int i __attribute__((unused)), int rcv __attribute__((unused)), | void detslp_dop(rtk_t *rtk __attribute__((unused)), const obsd_t *obs __attribute__((unused)), int i __attribute__((unused)), int rcv __attribute__((unused)), | ||||||
|     const nav_t *nav __attribute__((unused))) |     const nav_t *nav __attribute__((unused))) | ||||||
| { | { | ||||||
| /* detection with doppler disabled because of clock-jump issue (v.2.3.0) */ |     /* detection with doppler disabled because of clock-jump issue (v.2.3.0) */ | ||||||
| #if 0 | #if 0 | ||||||
|     int f,sat = obs[i].sat; |     int f, sat = obs[i].sat; | ||||||
|     double tt,dph,dpt,lam,thres; |     double tt, dph, dpt, lam, thres; | ||||||
|  |  | ||||||
|     trace(3,"detslp_dop: i=%d rcv=%d\n",i,rcv); |     trace(3, "detslp_dop: i=%d rcv=%d\n", i, rcv); | ||||||
|  |  | ||||||
|     for (f = 0;f<rtk->opt.nf;f++) |     for (f = 0; f < rtk->opt.nf; f++) | ||||||
|         { |         { | ||||||
|             if (obs[i].L[f] == 0.0 || obs[i].D[f] == 0.0 || rtk->ph[rcv-1][sat-1][f] == 0.0) |             if (obs[i].L[f] == 0.0 || obs[i].D[f] == 0.0 || rtk->ph[rcv - 1][sat - 1][f] == 0.0) | ||||||
|                 { |                 { | ||||||
|                     continue; |                     continue; | ||||||
|                 } |                 } | ||||||
|             if (fabs(tt = timediff(obs[i].time,rtk->pt[rcv-1][sat-1][f]))<DTTOL) continue; |             if (fabs(tt = timediff(obs[i].time, rtk->pt[rcv - 1][sat - 1][f])) < DTTOL) continue; | ||||||
|             if ((lam = nav->lam[sat-1][f])<=0.0) continue; |             if ((lam = nav->lam[sat - 1][f]) <= 0.0) continue; | ||||||
|  |  | ||||||
|             /* cycle slip threshold (cycle) */ |             /* cycle slip threshold (cycle) */ | ||||||
|             thres = MAXACC*tt*tt/2.0/lam+rtk->opt.err[4]*fabs(tt)*4.0; |             thres = MAXACC * tt * tt / 2.0 / lam + rtk->opt.err[4] * fabs(tt) * 4.0; | ||||||
|  |  | ||||||
|             /* phase difference and doppler x time (cycle) */ |             /* phase difference and doppler x time (cycle) */ | ||||||
|             dph = obs[i].L[f]-rtk->ph[rcv-1][sat-1][f]; |             dph = obs[i].L[f] - rtk->ph[rcv - 1][sat - 1][f]; | ||||||
|             dpt = -obs[i].D[f]*tt; |             dpt = -obs[i].D[f] * tt; | ||||||
|  |  | ||||||
|             if (fabs(dph-dpt)<=thres) continue; |             if (fabs(dph - dpt) <= thres) continue; | ||||||
|  |  | ||||||
|             rtk->slip[sat-1][f]| = 1; |             rtk->slip[sat - 1][f] | = 1; | ||||||
|  |  | ||||||
|             errmsg(rtk,"slip detected (sat=%2d rcv=%d L%d=%.3f %.3f thres=%.3f)\n", |             errmsg(rtk, "slip detected (sat=%2d rcv=%d L%d=%.3f %.3f thres=%.3f)\n", | ||||||
|                     sat,rcv,f+1,dph,dpt,thres); |                 sat, rcv, f + 1, dph, dpt, thres); | ||||||
|         } |         } | ||||||
| #endif | #endif | ||||||
| } | } | ||||||
| @@ -1814,26 +1814,26 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x, | |||||||
|                             nb[b]++; |                             nb[b]++; | ||||||
|                         } |                         } | ||||||
| #if 0 /* residuals referenced to reference satellite (2.4.2 p11) */ | #if 0 /* residuals referenced to reference satellite (2.4.2 p11) */ | ||||||
|                 /* restore single-differenced residuals assuming sum equal zero */ |                     /* restore single-differenced residuals assuming sum equal zero */ | ||||||
|                 if (f<nf) |                     if (f < nf) | ||||||
|                     { |                         { | ||||||
|                         for (j=0,s=0.0;j<MAXSAT;j++) s+=rtk->ssat[j].resc[f]; |                             for (j = 0, s = 0.0; j < MAXSAT; j++) s += rtk->ssat[j].resc[f]; | ||||||
|                         s/=nb[b]+1; |                             s /= nb[b] + 1; | ||||||
|                         for (j=0;j<MAXSAT;j++) |                             for (j = 0; j < MAXSAT; j++) | ||||||
|                             { |                                 { | ||||||
|                                 if (j == sat[i]-1||rtk->ssat[j].resc[f]!=0.0) rtk->ssat[j].resc[f]-=s; |                                     if (j == sat[i] - 1 || rtk->ssat[j].resc[f] != 0.0) rtk->ssat[j].resc[f] -= s; | ||||||
|                             } |                                 } | ||||||
|                     } |                         } | ||||||
|                 else |                     else | ||||||
|                     { |                         { | ||||||
|                         for (j=0,s=0.0;j<MAXSAT;j++) s+=rtk->ssat[j].resp[f-nf]; |                             for (j = 0, s = 0.0; j < MAXSAT; j++) s += rtk->ssat[j].resp[f - nf]; | ||||||
|                         s/=nb[b]+1; |                             s /= nb[b] + 1; | ||||||
|                         for (j=0;j<MAXSAT;j++) |                             for (j = 0; j < MAXSAT; j++) | ||||||
|                             { |                                 { | ||||||
|                                 if (j == sat[i]-1||rtk->ssat[j].resp[f-nf]!=0.0) |                                     if (j == sat[i] - 1 || rtk->ssat[j].resp[f - nf] != 0.0) | ||||||
|                                     rtk->ssat[j].resp[f-nf]-=s; |                                         rtk->ssat[j].resp[f - nf] -= s; | ||||||
|                             } |                                 } | ||||||
|                     } |                         } | ||||||
| #endif | #endif | ||||||
|                     b++; |                     b++; | ||||||
|                 } |                 } | ||||||
| @@ -2323,21 +2323,21 @@ int valpos(rtk_t *rtk, const double *v, const double *R, const int *vflg, | |||||||
|                 sat1, sat2, stype, freq + 1, v[i], std::sqrt(R[i + i * nv])); |                 sat1, sat2, stype, freq + 1, v[i], std::sqrt(R[i + i * nv])); | ||||||
|         } |         } | ||||||
| #if 0 /* omitted v.2.4.0 */ | #if 0 /* omitted v.2.4.0 */ | ||||||
|     if (stat&&nv>NP(opt)) |     if (stat && nv > NP(opt)) | ||||||
|         { |         { | ||||||
|             /* chi-square validation */ |             /* chi-square validation */ | ||||||
|             for (i = 0; i<nv; i++) vv += v[i]*v[i]/R[i+i*nv]; |             for (i = 0; i < nv; i++) vv += v[i] * v[i] / R[i + i * nv]; | ||||||
|  |  | ||||||
|             if (vv > chisqr[nv-NP(opt)-1]) |             if (vv > chisqr[nv - NP(opt) - 1]) | ||||||
|                 { |                 { | ||||||
|                     errmsg(rtk,"residuals validation failed (nv=%d np=%d vv=%.2f cs=%.2f)\n", |                     errmsg(rtk, "residuals validation failed (nv=%d np=%d vv=%.2f cs=%.2f)\n", | ||||||
|                             nv, NP(opt), vv, chisqr[nv-NP(opt)-1]); |                         nv, NP(opt), vv, chisqr[nv - NP(opt) - 1]); | ||||||
|                     stat = 0; |                     stat = 0; | ||||||
|                 } |                 } | ||||||
|             else |             else | ||||||
|                 { |                 { | ||||||
|                     trace(3,"valpos : validation ok (%s nv=%d np=%d vv=%.2f cs=%.2f)\n", |                     trace(3, "valpos : validation ok (%s nv=%d np=%d vv=%.2f cs=%.2f)\n", | ||||||
|                             rtk->tstr, nv, NP(opt), vv, chisqr[nv-NP(opt)-1]); |                         rtk->tstr, nv, NP(opt), vv, chisqr[nv - NP(opt) - 1]); | ||||||
|                 } |                 } | ||||||
|         } |         } | ||||||
| #endif | #endif | ||||||
| @@ -2790,11 +2790,9 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav) | |||||||
|     /* count rover/base station observations */ |     /* count rover/base station observations */ | ||||||
|     for (nu = 0; nu < n && obs[nu].rcv == 1; nu++) |     for (nu = 0; nu < n && obs[nu].rcv == 1; nu++) | ||||||
|         { |         { | ||||||
|             ; |  | ||||||
|         } |         } | ||||||
|     for (nr = 0; nu + nr < n && obs[nu + nr].rcv == 2; nr++) |     for (nr = 0; nu + nr < n && obs[nu + nr].rcv == 2; nr++) | ||||||
|         { |         { | ||||||
|             ; |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     time = rtk->sol.time; /* previous epoch */ |     time = rtk->sol.time; /* previous epoch */ | ||||||
|   | |||||||
| @@ -1157,7 +1157,6 @@ int waittcpsvr(tcpsvr_t *tcpsvr, char *msg) | |||||||
|         } |         } | ||||||
|     while (accsock(tcpsvr, msg)) |     while (accsock(tcpsvr, msg)) | ||||||
|         { |         { | ||||||
|             ; |  | ||||||
|         } |         } | ||||||
|     updatetcpsvr(tcpsvr, msg); |     updatetcpsvr(tcpsvr, msg); | ||||||
|     return tcpsvr->svr.state == 2; |     return tcpsvr->svr.state == 2; | ||||||
| @@ -2848,7 +2847,6 @@ void strsendcmd(stream_t *str, const char *cmd) | |||||||
|  |  | ||||||
|             if (!*msg || *msg == '#') |             if (!*msg || *msg == '#') | ||||||
|                 { /* null or comment */ |                 { /* null or comment */ | ||||||
|                     ; |  | ||||||
|                 } |                 } | ||||||
|             else if (*msg == '!') |             else if (*msg == '!') | ||||||
|                 { /* binary escape */ |                 { /* binary escape */ | ||||||
|   | |||||||
| @@ -244,7 +244,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_sc::start_tracking() | |||||||
|     d_acq_code_phase_samples = corrected_acq_phase_samples; |     d_acq_code_phase_samples = corrected_acq_phase_samples; | ||||||
|  |  | ||||||
|     d_carrier_frequency_hz = d_acq_carrier_doppler_hz + (DFRQ1_GLO * static_cast<double>(GLONASS_PRN.at(d_acquisition_gnss_synchro->PRN))); |     d_carrier_frequency_hz = d_acq_carrier_doppler_hz + (DFRQ1_GLO * static_cast<double>(GLONASS_PRN.at(d_acquisition_gnss_synchro->PRN))); | ||||||
|     ; |  | ||||||
|     d_carrier_doppler_hz = d_acq_carrier_doppler_hz; |     d_carrier_doppler_hz = d_acq_carrier_doppler_hz; | ||||||
|  |  | ||||||
|     d_carrier_phase_step_rad = GLONASS_TWO_PI * d_carrier_frequency_hz / static_cast<double>(d_fs_in); |     d_carrier_phase_step_rad = GLONASS_TWO_PI * d_carrier_frequency_hz / static_cast<double>(d_fs_in); | ||||||
|   | |||||||
| @@ -242,7 +242,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_sc::start_tracking() | |||||||
|     d_acq_code_phase_samples = corrected_acq_phase_samples; |     d_acq_code_phase_samples = corrected_acq_phase_samples; | ||||||
|  |  | ||||||
|     d_carrier_frequency_hz = d_acq_carrier_doppler_hz + (DFRQ2_GLO * static_cast<double>(GLONASS_PRN.at(d_acquisition_gnss_synchro->PRN))); |     d_carrier_frequency_hz = d_acq_carrier_doppler_hz + (DFRQ2_GLO * static_cast<double>(GLONASS_PRN.at(d_acquisition_gnss_synchro->PRN))); | ||||||
|     ; |  | ||||||
|     d_carrier_doppler_hz = d_acq_carrier_doppler_hz; |     d_carrier_doppler_hz = d_acq_carrier_doppler_hz; | ||||||
|  |  | ||||||
|     d_carrier_phase_step_rad = GLONASS_TWO_PI * d_carrier_frequency_hz / static_cast<double>(d_fs_in); |     d_carrier_phase_step_rad = GLONASS_TWO_PI * d_carrier_frequency_hz / static_cast<double>(d_fs_in); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez