diff --git a/src/rcv/binex.c b/src/rcv/binex.c index 9e595c9ac..fbb27e124 100644 --- a/src/rcv/binex.c +++ b/src/rcv/binex.c @@ -995,8 +995,8 @@ static uint8_t *decode_bnx_7f_05_obs(raw_t *raw, uint8_t *buff, int sat, freq=code2freq(sys,codes[code[k]],fcn); data->P[i]=range[k]; data->L[i]=phase[k]*freq/CLIGHT; - data->D[i]=dopp[k]; - data->SNR[i]=cnr[k]; + data->D[i]=(float)dopp[k]; + data->SNR[i]=(float)cnr[k]; data->code[i]=codes[code[k]]; data->LLI[i]=slip[k]?1:0; mask[k]=1; @@ -1016,8 +1016,8 @@ static uint8_t *decode_bnx_7f_05_obs(raw_t *raw, uint8_t *buff, int sat, freq=code2freq(sys,codes[code[k]],fcn); data->P[i]=range[k]; data->L[i]=phase[k]*freq/CLIGHT; - data->D[i]=dopp[k]; - data->SNR[i]=cnr[k]; + data->D[i]=(float)dopp[k]; + data->SNR[i]=(float)cnr[k]; data->code[i]=codes[code[k]]; data->LLI[i]=slip[k]?1:0; mask[k]=1; diff --git a/src/rcv/crescent.c b/src/rcv/crescent.c index 1293ce454..3b7d0ad00 100644 --- a/src/rcv/crescent.c +++ b/src/rcv/crescent.c @@ -145,7 +145,7 @@ static int decode_cresraw(raw_t *raw) raw->obs.data[n].P[0]=pr; raw->obs.data[n].L[0]=cp*freq/CLIGHT; raw->obs.data[n].D[0]=-(float)(dop*freq/CLIGHT); - raw->obs.data[n].SNR[0]=snr; + raw->obs.data[n].SNR[0]=(float)snr; raw->obs.data[n].LLI[0]=(uint8_t)lli; raw->obs.data[n].code[0]=CODE_L1C; @@ -256,7 +256,7 @@ static int decode_cresraw2(raw_t *raw) raw->obs.data[n].P[j]=pr[j]==0.0?0.0:pr[j]-toff; raw->obs.data[n].L[j]=cp[j]==0.0?0.0:cp[j]-toff*freq[j]/CLIGHT; raw->obs.data[n].D[j]=-(float)dop[j]; - raw->obs.data[n].SNR[j]=snr[j]; + raw->obs.data[n].SNR[j]=(float)snr[j]; raw->obs.data[n].LLI[j]=(uint8_t)lli[j]; raw->obs.data[n].code[j]=j==0?CODE_L1C:CODE_L2P; } @@ -461,7 +461,7 @@ static int decode_cresgloraw(raw_t *raw) raw->obs.data[n].P[j]=pr[j]==0.0?0.0:pr[j]-toff; raw->obs.data[n].L[j]=cp[j]==0.0?0.0:cp[j]-toff*freq[j]/CLIGHT; raw->obs.data[n].D[j]=-(float)dop[j]; - raw->obs.data[n].SNR[j]=snr[j]; + raw->obs.data[n].SNR[j]=(float)snr[j]; raw->obs.data[n].LLI[j]=(uint8_t)lli[j]; raw->obs.data[n].code[j]=j==0?CODE_L1C:CODE_L2P; } diff --git a/src/rcv/javad.c b/src/rcv/javad.c index 77f64ee6d..83e5f8622 100644 --- a/src/rcv/javad.c +++ b/src/rcv/javad.c @@ -1612,7 +1612,7 @@ static int decode_xE(raw_t *raw, char sig) if ((idx=checkpri(sys,code,raw->opt,idx))>=0) { if (!settag(raw->obuf.data+i,raw->time)) continue; - raw->obuf.data[i].SNR[idx]=cnr*0.25; + raw->obuf.data[i].SNR[idx]=(float)(cnr*0.25); } } return 0; diff --git a/src/rcv/novatel.c b/src/rcv/novatel.c index 89a0b1796..c5a18c754 100644 --- a/src/rcv/novatel.c +++ b/src/rcv/novatel.c @@ -180,7 +180,7 @@ static int obsindex(obs_t *obs, gtime_t time, int sat) obs->data[i].sat=sat; for (j=0;jdata[i].L[j]=obs->data[i].P[j]=0.0; - obs->data[i].D[j]=obs->data[i].SNR[j]=0.0; + obs->data[i].D[j]=obs->data[i].SNR[j]=0.0f; obs->data[i].LLI[j]=0; obs->data[i].code[j]=CODE_NONE; } @@ -438,7 +438,7 @@ static int decode_rangecmpb(raw_t *raw) raw->obs.data[index].L [idx]=adr; raw->obs.data[index].P [idx]=psr; raw->obs.data[index].D [idx]=(float)dop; - raw->obs.data[index].SNR[idx]=snr; + raw->obs.data[index].SNR[idx]=(float)snr; raw->obs.data[index].LLI[idx]=(uint8_t)lli; raw->obs.data[index].code[idx]=(uint8_t)code; } @@ -521,7 +521,7 @@ static int decode_rangeb(raw_t *raw) raw->obs.data[index].L [idx]=-adr; raw->obs.data[index].P [idx]=psr; raw->obs.data[index].D [idx]=(float)dop; - raw->obs.data[index].SNR[idx]=snr; + raw->obs.data[index].SNR[idx]=(float)snr; raw->obs.data[index].LLI[idx]=(uint8_t)lli; raw->obs.data[index].code[idx]=(uint8_t)code; } @@ -1113,7 +1113,7 @@ static int decode_rgeb(raw_t *raw) raw->obs.data[index].L [freq]=-adr; /* flip sign */ raw->obs.data[index].P [freq]=psr; raw->obs.data[index].D [freq]=(float)dop; - raw->obs.data[index].SNR[freq]=0.0<=snr&&snr<255.0?snr:0; + raw->obs.data[index].SNR[freq]=0.0<=snr&&snr<255.0?(float)snr:0.0f; raw->obs.data[index].LLI[freq]=(uint8_t)lli; raw->obs.data[index].code[freq]=freq==0?CODE_L1C:CODE_L2P; } @@ -1178,7 +1178,7 @@ static int decode_rged(raw_t *raw) raw->obs.data[index].L [freq]=adr; raw->obs.data[index].P [freq]=psr; raw->obs.data[index].D [freq]=(float)dop; - raw->obs.data[index].SNR[freq]=snr; + raw->obs.data[index].SNR[freq]=(float)snr; raw->obs.data[index].LLI[freq]=(uint8_t)lli; raw->obs.data[index].code[freq]=freq==0?CODE_L1C:CODE_L2P; } diff --git a/src/rcv/nvs.c b/src/rcv/nvs.c index 120e28e6e..f48cfbcb5 100644 --- a/src/rcv/nvs.c +++ b/src/rcv/nvs.c @@ -67,7 +67,6 @@ static int decode_xf5raw(raw_t *raw) { gtime_t time; double tadj=0.0,toff=0.0,tn; - int dTowInt; double dTowUTC, dTowGPS, dTowFrac, L1, P1, D1; double gpsutcTimescale; uint8_t rcvTimeScaleCorr, sys, carrNo; @@ -105,7 +104,7 @@ static int decode_xf5raw(raw_t *raw) dTowGPS = dTowUTC + gpsutcTimescale; /* Tweak pseudoranges to allow Rinex to represent the NVS time of measure */ - dTowInt = 10.0*floor((dTowGPS/10.0)+0.5); + int dTowInt = (int)(10.0*floor((dTowGPS/10.0)+0.5)); dTowFrac = dTowGPS - (double) dTowInt; time=gpst2time(week, dTowInt*0.001); @@ -262,7 +261,7 @@ static int decode_gloephem(int sat, raw_t *raw) geph.acc[0]=R8(p+51) * 1e+6; geph.acc[1]=R8(p+59) * 1e+6; geph.acc[2]=R8(p+67) * 1e+6; - tb = R8(p+75) * 1e-3; + tb = (int)(R8(p+75) * 1e-3); tk = tb; geph.gamn =R4(p+83); geph.taun =R4(p+87) * 1e-3; diff --git a/src/rcv/rt17.c b/src/rcv/rt17.c index 10e41643c..b7974efe1 100644 --- a/src/rcv/rt17.c +++ b/src/rcv/rt17.c @@ -1705,7 +1705,7 @@ static int DecodeType17(raw_t *Raw, uint32_t rif) if (Flags1 & M_BIT6) /* L1 data valid */ { /* Measure of L1 signal strength (dB * 4) */ - obs->SNR[0] = U1(p)*0.25; + obs->SNR[0] = (float)(U1(p)*0.25); p++; /* Full L1 C/A code or P-code pseudorange (meters) */ @@ -1725,7 +1725,7 @@ static int DecodeType17(raw_t *Raw, uint32_t rif) if (Flags1 & M_BIT0) /* L2 data loaded */ { /* Measure of L2 signal strength (dB * 4) */ - obs->SNR[1] = U1(p)*0.25; + obs->SNR[1] = (float)(U1(p)*0.25); p++; /* L2 Continuous Phase (cycles) */ @@ -1784,7 +1784,7 @@ static int DecodeType17(raw_t *Raw, uint32_t rif) if (Flags1 & M_BIT6) /* L1 data valid */ { /* Measure of satellite signal strength (dB) */ - obs->SNR[0] = R8(p); + obs->SNR[0] = (float)R8(p); p += 8; /* Full L1 C/A code or P-code pseudorange (meters) */ @@ -1797,7 +1797,7 @@ static int DecodeType17(raw_t *Raw, uint32_t rif) p += 8; /* L1 Doppler (Hz) */ - obs->D[0] = R8(p); + obs->D[0] = (float)R8(p); p += 8; /* Reserved 8 bytes */ @@ -1807,7 +1807,7 @@ static int DecodeType17(raw_t *Raw, uint32_t rif) if (Flags1 & M_BIT0) /* L2 data loaded */ { /* Measure of L2 signal strength (dB) */ - obs->SNR[1] = R8(p); + obs->SNR[1] = (float)R8(p); p += 8; /* L2 Continuous Phase (cycles) */ @@ -1833,7 +1833,7 @@ static int DecodeType17(raw_t *Raw, uint32_t rif) p++; /* U1 Reserved byte */ /* L2 Doppler (Hz) */ - obs->D[1] = R8(p); + obs->D[1] = (float)R8(p); p += 8; } } diff --git a/src/rcv/skytraq.c b/src/rcv/skytraq.c index 0f1c0eba1..af06743f4 100644 --- a/src/rcv/skytraq.c +++ b/src/rcv/skytraq.c @@ -269,7 +269,7 @@ static int decode_stqraw(raw_t *raw) raw->obs.data[n].P[0]=pr1; raw->obs.data[n].L[0]=cp1; - raw->obs.data[n].D[0]=!(ind&2)?0.0:R4(p+18); + raw->obs.data[n].D[0]=!(ind&2)?0.0f:(float)R4(p+18); raw->obs.data[n].SNR[0]=U1(p+1); raw->obs.data[n].LLI[0]=0; raw->obs.data[n].code[0]=sys==SYS_CMP?CODE_L2I:CODE_L1C; @@ -289,7 +289,7 @@ static int decode_stqraw(raw_t *raw) for (j=1;jobs.data[n].L[j]=raw->obs.data[n].P[j]=0.0; - raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0; + raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0f; raw->obs.data[n].LLI[j]=0; raw->obs.data[n].code[j]=CODE_NONE; } @@ -301,7 +301,7 @@ static int decode_stqraw(raw_t *raw) /* decode skytraq extended raw measurement data v.1 (0xE5) -------------------*/ static int decode_stqrawx(raw_t *raw) { - uint8_t *p=raw->buff+4,ind; + uint8_t *p=raw->buff+4; double tow,peri,pr1,cp1; int i,j,k,ver,week,nsat,sys,sig,prn,sat,n=0,idx; @@ -335,7 +335,7 @@ static int decode_stqrawx(raw_t *raw) if (sys==SYS_GLO) { raw->nav.geph[prn-1].frq=(int)(U1(p+2)&0xF)-7; } - ind=U2(p+27); + uint16_t ind=U2(p+27); pr1=!(ind&1)?0.0:R8(p+ 4); cp1=!(ind&4)?0.0:R8(p+12); cp1-=floor((cp1+1E9)/2E9)*2E9; /* -10^9 < cp1 < 10^9 */ @@ -349,7 +349,7 @@ static int decode_stqrawx(raw_t *raw) raw->obs.data[n].rcv=0; for (k=0;kobs.data[n].L[k]=raw->obs.data[n].P[k]=0.0; - raw->obs.data[n].D[k]=raw->obs.data[n].SNR[k]=0.0; + raw->obs.data[n].D[k]=raw->obs.data[n].SNR[k]=0.0f; raw->obs.data[n].LLI[k]=0; raw->obs.data[n].code[k]=CODE_NONE; } @@ -357,7 +357,7 @@ static int decode_stqrawx(raw_t *raw) } raw->obs.data[j].P[idx]=pr1; raw->obs.data[j].L[idx]=cp1; - raw->obs.data[j].D[idx]=!(ind&2)?0.0:R4(p+20); + raw->obs.data[j].D[idx]=!(ind&2)?0.0f:(float)R4(p+20); raw->obs.data[j].SNR[idx]=U1(p+3); raw->obs.data[j].LLI[idx]=0; raw->obs.data[j].code[idx]=sig; diff --git a/src/rcv/swiftnav.c b/src/rcv/swiftnav.c index 2fba8f2e3..d6eb43b6d 100644 --- a/src/rcv/swiftnav.c +++ b/src/rcv/swiftnav.c @@ -351,7 +351,7 @@ static int sisa_index(double value) else if (value<=0.5) return (int)(value/0.01); else if (value<=1.0) return (int)((value-0.5)/0.02)+50; else if (value<=2.0) return (int)((value-1.0)/0.04)+75; - return ((int)(value-2.0)/0.16)+100; + return (int)((value-2.0)/0.16)+100; } /* SBP checksum calculation --------------------------------------------------*/ @@ -533,7 +533,7 @@ static int decode_msgobs(raw_t *raw) { raw->obuf.data[ii].P[freq] = (flags & 0x1) ? pseudorange : 0.0; raw->obuf.data[ii].L[freq] = (flags & 0x2) ? carr_phase : 0.0; raw->obuf.data[ii].D[freq] = (flags & 0x8) ? (float)freq_doppler : 0.0f; - raw->obuf.data[ii].SNR[freq] = cn0_int * 0.25; + raw->obuf.data[ii].SNR[freq] = (float)(cn0_int * 0.25); raw->obuf.data[ii].code[freq] = code; if (flags & 0x2) { @@ -1570,7 +1570,7 @@ extern int input_sbpjsonf(raw_t *raw, FILE *fp) { pcPayloadBeg = (uint8_t *)strchr((char *)pcTmp, '\"') + 1; pcPayloadEnd = (uint8_t *)strchr((char *)pcPayloadBeg, '\"') - 1; if ((NULL == pcPayloadBeg) || (NULL == pcPayloadEnd)) return 0; - uPayloadSize = pcPayloadEnd - pcPayloadBeg + 1; + uPayloadSize = (uint32_t)(pcPayloadEnd - pcPayloadBeg) + 1; pcPayloadEnd[1] = 0; /* fprintf(stderr, "%4d: %s\n", uPayloadSize, pcPayloadBeg); */ memset(puPayloadTmp, 0, sizeof(puPayloadTmp)); diff --git a/src/rcv/ublox.c b/src/rcv/ublox.c index c09405307..5363f3e67 100644 --- a/src/rcv/ublox.c +++ b/src/rcv/ublox.c @@ -363,8 +363,8 @@ static int decode_rxmraw(raw_t *raw) for (j=1;jobs.data[n].L[j]=raw->obs.data[n].P[j]=0.0; - raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0; - raw->obs.data[n].Lstd[j]=raw->obs.data[n].Pstd[j]=0.0; + raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0f; + raw->obs.data[n].Lstd[j]=raw->obs.data[n].Pstd[j]=0.0f; raw->obs.data[n].LLI[j]=0; raw->obs.data[n].code[j]=CODE_NONE; } @@ -524,8 +524,8 @@ static int decode_rxmrawx(raw_t *raw) raw->obs.data[n].rcv=0; for (k=0;kobs.data[n].L[k]=raw->obs.data[n].P[k]=0.0; - raw->obs.data[n].D[k]=raw->obs.data[n].SNR[k]=0.0; - raw->obs.data[n].Lstd[k]=raw->obs.data[n].Pstd[k]=0.0; + raw->obs.data[n].D[k]=raw->obs.data[n].SNR[k]=0.0f; + raw->obs.data[n].Lstd[k]=raw->obs.data[n].Pstd[k]=0.0f; raw->obs.data[n].LLI[k]=0; raw->obs.data[n].code[k]=CODE_NONE; } @@ -533,10 +533,10 @@ static int decode_rxmrawx(raw_t *raw) } raw->obs.data[j].L[idx]=L; raw->obs.data[j].P[idx]=P; - raw->obs.data[j].Lstd[idx] = rcvstds ? cpstd * 0.004 : 0; - raw->obs.data[j].Pstd[idx] = rcvstds ? 0.01 * pow(2, prstd) : 0.0; + raw->obs.data[j].Lstd[idx] = rcvstds ? (float)(cpstd * 0.004) : 0.0f; + raw->obs.data[j].Pstd[idx] = rcvstds ? (float)(0.01 * pow(2, prstd)) : 0.0f; raw->obs.data[j].D[idx]=(float)D; - raw->obs.data[j].SNR[idx]=cn0; + raw->obs.data[j].SNR[idx]=(float)cn0; raw->obs.data[j].LLI[idx]=(uint8_t)LLI; raw->obs.data[j].code[idx]=(uint8_t)code; if (L!=0.0) raw->lockflag[sat-1][idx]=0; /* clear slip carry-forward flag if valid phase*/ @@ -693,9 +693,9 @@ static int decode_trkmeas(raw_t *raw) raw->obs.data[n].P[0]=tau*CLIGHT; raw->obs.data[n].L[0]=-adr; raw->obs.data[n].D[0]=(float)dop; - raw->obs.data[n].SNR[0]=snr; + raw->obs.data[n].SNR[0]=(float)snr; raw->obs.data[n].code[0]=sys==SYS_CMP?CODE_L2I:CODE_L1C; - raw->obs.data[n].Lstd[0] = rcvstds ? (8 - qi) * 0.004 : 0; + raw->obs.data[n].Lstd[0] = rcvstds ? (float)((8 - qi) * 0.004) : 0.0f; raw->obs.data[n].LLI[0]=raw->lockt[sat-1][1]>0.0?1:0; if (sys==SYS_SBS) { /* half-cycle valid */ raw->obs.data[n].LLI[0]|=lock2>142?0:2; @@ -711,8 +711,8 @@ static int decode_trkmeas(raw_t *raw) } for (j=1;jobs.data[n].L[j]=raw->obs.data[n].P[j]=0.0; - raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0; - raw->obs.data[n].Lstd[j]=raw->obs.data[n].Pstd[j]=0.0; + raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0f; + raw->obs.data[n].Lstd[j]=raw->obs.data[n].Pstd[j]=0.0f; raw->obs.data[n].LLI[j]=0; raw->obs.data[n].code[j]=CODE_NONE; } @@ -820,14 +820,14 @@ static int decode_trkd5(raw_t *raw) raw->obs.data[n].P[0]=tau*CLIGHT; raw->obs.data[n].L[0]=-adr; raw->obs.data[n].D[0]=(float)dop; - raw->obs.data[n].SNR[0]=snr; + raw->obs.data[n].SNR[0]=(float)snr; raw->obs.data[n].code[0]=sys==SYS_CMP?CODE_L2I:CODE_L1C; raw->obs.data[n].LLI[0]=raw->lockt[sat-1][1]>0.0?1:0; raw->lockt[sat-1][1]=0.0; for (j=1;jobs.data[n].L[j]=raw->obs.data[n].P[j]=0.0; - raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0; + raw->obs.data[n].D[j]=raw->obs.data[n].SNR[j]=0.0f; raw->obs.data[n].LLI[j]=0; raw->obs.data[n].code[j]=CODE_NONE; } diff --git a/src/rcv/unicore.c b/src/rcv/unicore.c index c578b8419..395a0e778 100644 --- a/src/rcv/unicore.c +++ b/src/rcv/unicore.c @@ -816,14 +816,14 @@ static int decode_obsvmb(raw_t* raw) raw->obs.data[index].L[idx] = -adr; raw->obs.data[index].P[idx] = psr; raw->obs.data[index].D[idx] = (float)dop; - raw->obs.data[index].SNR[idx] = snr; + raw->obs.data[index].SNR[idx] = (float)snr; raw->obs.data[index].LLI[idx] = (uint8_t)lli; raw->obs.data[index].code[idx] = (uint8_t)code; if (rcvstds) { double pstd = U2(p + 20) * 0.01; // Meters - raw->obs.data[index].Pstd[idx] = pstd; + raw->obs.data[index].Pstd[idx] = (float)pstd; double lstd = U2(p + 22) * 0.0001; // Cycles - raw->obs.data[index].Lstd[idx] = lstd; + raw->obs.data[index].Lstd[idx] = (float)lstd; } } } diff --git a/src/rinex.c b/src/rinex.c index 4b3beea7f..4deeaeeef 100644 --- a/src/rinex.c +++ b/src/rinex.c @@ -915,14 +915,14 @@ static int decode_obsdata(FILE *fp, char *buff, double ver, int mask, switch (ind->type[i]) { case 0: obs->P[p[i]]=val[i]; obs->code[p[i]]=ind->code[i]; - obs->Pstd[p[i]] = std[i] > 0 ? 0.01 * pow(2, std[i] + 5) : 0; + obs->Pstd[p[i]] = std[i] > 0 ? (float)(0.01 * pow(2, std[i] + 5)) : 0.0f; break; case 1: obs->L[p[i]]=val[i]; obs->LLI[p[i]]=lli[i]; - obs->Lstd[p[i]] = std[i] > 0 ? std[i] * 0.004 : 0; + obs->Lstd[p[i]] = std[i] > 0 ? (float)(std[i] * 0.004) : 0.0f; break; case 2: obs->D[p[i]]=(float)val[i]; break; - case 3: obs->SNR[p[i]]=val[i]; break; + case 3: obs->SNR[p[i]]=(float)val[i]; break; } trace(4, "obs: i=%d f=%d P=%14.3f L=%14.3f LLI=%d code=%d\n",i,p[i],obs->P[p[i]], obs->L[p[i]],obs->LLI[p[i]],obs->code[p[i]]); @@ -1352,7 +1352,7 @@ static int decode_geph(double ver, int sat, gtime_t toc, double *data, if (ver >= 3.05) { geph->flags = (int)data[15]; // Status flags geph->dtaun = data[16]; - geph->sva = data[17]; + geph->sva = (int)data[17]; geph->svh |= ((int)data[18]) << 1; // Extended SVH } /* some receiver output >128 for minus frequency number */ @@ -1618,7 +1618,7 @@ static int readrnxclk(FILE *fp, const char *opt, double ver, int index, nav_t *n if (std > 0) { if (last_std_idx < 0) { for (int j = 0; j < i; j++) - if (nav->pclk[j].clk[k][0] != 0) nav->pclk[j].std[k][0] = std; + if (nav->pclk[j].clk[k][0] != 0) nav->pclk[j].std[k][0] = (float)std; } else { // Linear interpolation of the variance. for (int j = last_std_idx + 1; j < i; j++) { @@ -1637,7 +1637,7 @@ static int readrnxclk(FILE *fp, const char *opt, double ver, int index, nav_t *n if (last_std_idx >= 0) { double last_std = nav->pclk[last_std_idx].std[k][0]; for (int j = last_std_idx + 1; j < nav->nc; j++) - if (nav->pclk[j].clk[k][0] != 0) nav->pclk[j].std[k][0] = last_std; + if (nav->pclk[j].clk[k][0] != 0) nav->pclk[j].std[k][0] = (float)last_std; } } @@ -1732,7 +1732,7 @@ extern int rnxcomment(rnxopt_t *opt, const char *format, ...) { if (!*opt->comment[i]) break; } // Copy while wrapping overflow into the next comment line. - for (int j = 0, rem = strlen(buff); rem > 0; i++) { + for (int j = 0, rem = (int)strlen(buff); rem > 0; i++) { if (i >= MAXCOMMENT) return 0; int indent = j > 0 ? 2 : 0; // Indent overflow lines int n = rem > 60 - indent ? 60 - indent : rem; @@ -2555,13 +2555,13 @@ extern int outrnxobsb(FILE *fp, const rnxopt_t *opt, const obsd_t *obs, int n, case 'P': { // To RTKLib RINEX encoding float std = obs[ind[i]].Pstd[k]; - int stdi = std > 0.0003125 ? log2(std * 100) - 5 + 0.5 : 0; + int stdi = std > 0.0003125 ? (int)trunc(log2(std * 100) - 5 + 0.5) : 0; outrnxobsf(fp,obs[ind[i]].P[k],-1,stdi); break; } case 'L': { // To RTKLib RINEX encoding - int lstdi = obs[ind[i]].Lstd[k] / 0.004 + 0.5; + int lstdi = (int)trunc(obs[ind[i]].Lstd[k] / 0.004 + 0.5); outrnxobsf(fp,obs[ind[i]].L[k]+dL,obs[ind[i]].LLI[k],lstdi); break; } diff --git a/src/rtcm3.c b/src/rtcm3.c index 7a284241b..0969bfe4c 100644 --- a/src/rtcm3.c +++ b/src/rtcm3.c @@ -377,7 +377,7 @@ static int decode_type1002(rtcm_t *rtcm) rtcm->obs.data[index].L[0]=pr1*freq/CLIGHT+cp1; } rtcm->obs.data[index].LLI[0]=lossoflock(rtcm,sat,0,lock1); - rtcm->obs.data[index].SNR[0]=snratio(cnr1*0.25); + rtcm->obs.data[index].SNR[0]=(float)snratio(cnr1*0.25); rtcm->obs.data[index].code[0]=code?CODE_L1P:CODE_L1C; } return sync?0:1; @@ -434,7 +434,7 @@ static int decode_type1004(rtcm_t *rtcm) rtcm->obs.data[index].L[0]=pr1*freq[0]/CLIGHT+cp1; } rtcm->obs.data[index].LLI[0]=lossoflock(rtcm,sat,0,lock1); - rtcm->obs.data[index].SNR[0]=snratio(cnr1*0.25); + rtcm->obs.data[index].SNR[0]=(float)snratio(cnr1*0.25); rtcm->obs.data[index].code[0]=code1?CODE_L1P:CODE_L1C; if (pr21!=(int)0xFFFFE000) { @@ -445,7 +445,7 @@ static int decode_type1004(rtcm_t *rtcm) rtcm->obs.data[index].L[1]=pr1*freq[1]/CLIGHT+cp2; } rtcm->obs.data[index].LLI[1]=lossoflock(rtcm,sat,1,lock2); - rtcm->obs.data[index].SNR[1]=snratio(cnr2*0.25); + rtcm->obs.data[index].SNR[1]=(float)snratio(cnr2*0.25); rtcm->obs.data[index].code[1]=L2codes[code2]; } rtcm->obsflag=!sync; @@ -682,7 +682,7 @@ static int decode_type1010(rtcm_t *rtcm) rtcm->obs.data[index].L[0]=pr1*freq1/CLIGHT+cp1; } rtcm->obs.data[index].LLI[0]=lossoflock(rtcm,sat,0,lock1); - rtcm->obs.data[index].SNR[0]=snratio(cnr1*0.25); + rtcm->obs.data[index].SNR[0]=(float)snratio(cnr1*0.25); rtcm->obs.data[index].code[0]=code?CODE_L1P:CODE_L1C; } return sync?0:1; @@ -737,7 +737,7 @@ static int decode_type1012(rtcm_t *rtcm) rtcm->obs.data[index].L[0]=pr1*freq1/CLIGHT+cp1; } rtcm->obs.data[index].LLI[0]=lossoflock(rtcm,sat,0,lock1); - rtcm->obs.data[index].SNR[0]=snratio(cnr1*0.25); + rtcm->obs.data[index].SNR[0]=(float)snratio(cnr1*0.25); rtcm->obs.data[index].code[0]=code1?CODE_L1P:CODE_L1C; if (pr21!=(int)0xFFFFE000) { @@ -749,7 +749,7 @@ static int decode_type1012(rtcm_t *rtcm) rtcm->obs.data[index].L[1]=pr1*freq2/CLIGHT+cp2; } rtcm->obs.data[index].LLI[1]=lossoflock(rtcm,sat,1,lock2); - rtcm->obs.data[index].SNR[1]=snratio(cnr2*0.25); + rtcm->obs.data[index].SNR[1]=(float)snratio(cnr2*0.25); rtcm->obs.data[index].code[1]=code2?CODE_L2P:CODE_L2C; } rtcm->obsflag=!sync; @@ -759,7 +759,7 @@ static int decode_type1012(rtcm_t *rtcm) static int decode_type1013(rtcm_t *rtcm) { unsigned i = 24 + 12; - if (i + 58 > rtcm->len * 8) { + if (i + 58 > (size_t)rtcm->len * 8) { trace(2,"rtcm3 1013 length error: len=%d\n", rtcm->len); return -1; } @@ -775,14 +775,14 @@ static int decode_type1013(rtcm_t *rtcm) unsigned leaps = getbitu(rtcm->buff, i, 8); i += 8; - if (i + nmsg * 29 > rtcm->len * 8) { + if (i + nmsg * 29 > (size_t)rtcm->len * 8) { trace(2,"rtcm3 1013 length error: len=%d nm=%d\n", rtcm->len, nmsg); return -1; } rtcm->nmsg = nmsg; uint8_t sync[32]; - for (int n = 0; n < nmsg; n++) { + for (unsigned n = 0; n < nmsg; n++) { rtcm->msgs[n] = getbitu(rtcm->buff, i, 12); i += 12; sync[n] = getbitu(rtcm->buff, i, 1); @@ -2266,7 +2266,7 @@ static void save_msm_obs(rtcm_t *rtcm, int sys, msm_h_t *h, const double *r, } rtcm->obs.data[index].LLI[idx[k]]= lossoflock(rtcm,sat,idx[k],lock[j])+(half[j]?2:0); - rtcm->obs.data[index].SNR [idx[k]]=cnr[j]; + rtcm->obs.data[index].SNR[idx[k]]=(float)cnr[j]; rtcm->obs.data[index].code[idx[k]]=code[k]; } j++; diff --git a/src/rtcm3e.c b/src/rtcm3e.c index d5beb3a4b..d7e92a7f6 100644 --- a/src/rtcm3e.c +++ b/src/rtcm3e.c @@ -795,20 +795,20 @@ static int encode_type1013(rtcm_t *rtcm, int sync) int i = 24; const double ep[] = {2000, 1, 1, 12, 0, 0}; gtime_t utc = gpst2utc(rtcm->time); - int leaps = timediff(rtcm->time, utc); + int leaps = (int)round(timediff(rtcm->time, utc)); double mjd = 51544.5 + (timediff(utc, epoch2time(ep))) / 86400.0; - uint32_t mjdi = floor(mjd); - uint32_t tod = round((mjd - mjdi) * 86400.0); + uint32_t mjdi = (uint32_t)floor(mjd); + uint32_t tod = (uint32_t)round((mjd - mjdi) * 86400.0); setbitu(rtcm->buff, i, 12, 1013 ); i += 12; // Message no. setbitu(rtcm->buff, i, 12, 0 ); i += 12; // Ref station id. - setbitu(rtcm->buff, i, 16, mjd ); i += 16; // MJD. + setbitu(rtcm->buff, i, 16, mjdi ); i += 16; // MJD. setbitu(rtcm->buff, i, 17, tod ); i += 17; // Time of day, seconds. setbitu(rtcm->buff, i, 5, rtcm->nmsg); i += 5; // Number of messages. setbitu(rtcm->buff, i, 8, leaps ); i += 8; // Leap seconds, GPST-UTC. for (int n = 0; n < rtcm->nmsg; n++) { setbitu(rtcm->buff, i, 12, rtcm->msgs[n]); i+=12; // Message ID. setbitu(rtcm->buff, i, 1, 1 ); i+= 1; // Synchronous. - setbitu(rtcm->buff, i, 16, round(rtcm->tint[n] * 10.0)); i+= 16; // Interval. + setbitu(rtcm->buff, i, 16, (unsigned)round(rtcm->tint[n] * 10.0)); i+= 16; // Interval. } rtcm->nbit=i; return 1; diff --git a/src/rtkpos.c b/src/rtkpos.c index 3a53e203f..d1e15985a 100644 --- a/src/rtkpos.c +++ b/src/rtkpos.c @@ -1764,11 +1764,11 @@ static int resamb_LAMBDA(rtk_t *rtk, double *bias, double *xa,int gps,int glo,in coeff[i] = coeff[i]*opt->thresar[0]+ar_poly_coeffs[i][j]; } /* generate adjusted AR ratio based on # of sat pairs */ - rtk->sol.thres = coeff[0]; + rtk->sol.thres = (float)coeff[0]; for (i=1;i<3;i++) { - rtk->sol.thres = rtk->sol.thres*1.0/(nb1+1.0)+coeff[i]; + rtk->sol.thres = (float)(rtk->sol.thres*1.0/(nb1+1.0)+coeff[i]); } - rtk->sol.thres = MIN(MAX(rtk->sol.thres,opt->thresar[5]),opt->thresar[6]); + rtk->sol.thres = (float)MIN(MAX(rtk->sol.thres,opt->thresar[5]),opt->thresar[6]); } else rtk->sol.thres=(float)opt->thresar[0]; /* validation by popular ratio-test of residuals*/ @@ -1826,9 +1826,9 @@ static int resamb_LAMBDA(rtk_t *rtk, double *bias, double *xa,int gps,int glo,in static int manage_amb_LAMBDA(rtk_t *rtk, double *bias, double *xa, const int *sat, int nf, int ns) { int gps1=-1,glo1=-1,sbas1=-1,gps2,glo2,sbas2,nb,rerun,dly; - float ratio1,posvar=0; /* calc position variance, will skip AR if too high to avoid false fix */ + double posvar = 0; for (int i=0;i<3;i++) posvar+=rtk->P[i+i*rtk->nx]; posvar/=3.0; /* maintain compatibility with previous code */ @@ -1891,7 +1891,7 @@ static int manage_amb_LAMBDA(rtk_t *rtk, double *bias, double *xa, const int *sa sbas1=(rtk->opt.navsys&SYS_GLO)?glo1:((rtk->opt.navsys&SYS_SBS)?1:0); /* first attempt to resolve ambiguities */ nb=resamb_LAMBDA(rtk,bias,xa,gps1,glo1,sbas1); - ratio1=rtk->sol.ratio; + float ratio1=rtk->sol.ratio; /* reject bad satellites if AR filtering enabled */ if (rtk->opt.arfilter) { rerun=0; @@ -2027,7 +2027,7 @@ static int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr, if (opt->mode!=PMODE_MOVEB) { /* check if exceeded max age of differential */ - rtk->sol.age=dt; + rtk->sol.age=(float)dt; if (fabs(rtk->sol.age)>opt->maxtdiff) { errmsg(rtk,"age of differential error (age=%.1f)\n",rtk->sol.age); free(rs); free(dts); free(var); free(y); free(e); free(azel); free(freq); diff --git a/src/stream.c b/src/stream.c index 54344fc5c..a5a2e4a15 100644 --- a/src/stream.c +++ b/src/stream.c @@ -578,7 +578,7 @@ static int statexserial(serial_t *serial, char *msg) p+=sprintf(p,"serial:\n"); p+=sprintf(p," state = %d\n",state); if (!state) return 0; - p+=sprintf(p," dev = %d\n",(int)serial->dev); + p+=sprintf(p," dev = %p\n",serial->dev); p+=sprintf(p," error = %d\n",serial->error); #ifdef WIN32 p+=sprintf(p," buffsize= %d\n",serial->buffsize);