diff --git a/app/convbin/convbin.c b/app/convbin/convbin.c index a59bf30f74df823b01c682da8215f560538070a4..472b86c3ed761e98d8cc64802fa11016d24dd6f8 100644 --- a/app/convbin/convbin.c +++ b/app/convbin/convbin.c @@ -488,11 +488,11 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile, } if (nf>=1) opt->freqtype|=FREQTYPE_L1; if (nf>=2) opt->freqtype|=FREQTYPE_L2; - if (nf>=3) opt->freqtype|=FREQTYPE_L5; - if (nf>=4) opt->freqtype|=FREQTYPE_L6; - if (nf>=5) opt->freqtype|=FREQTYPE_L7; - if (nf>=6) opt->freqtype|=FREQTYPE_L8; - if (nf>=7) opt->freqtype|=FREQTYPE_L9; + if (nf>=3) opt->freqtype|=FREQTYPE_E5b; + if (nf>=4) opt->freqtype|=FREQTYPE_L5; + if (nf>=5) opt->freqtype|=FREQTYPE_E6; + if (nf>=6) opt->freqtype|=FREQTYPE_E5ab; + if (nf>=7) opt->freqtype|=FREQTYPE_S; if (*fmt) { if (!strcmp(fmt,"rtcm2")) format=STRFMT_RTCM2; diff --git a/app/rtkplot/plotdraw.cpp b/app/rtkplot/plotdraw.cpp index 80e97018972fdea77a883458aaa7b9317afb7983..f7613b2d16007c917dcb9db055d4cfd6e37e70c8 100644 --- a/app/rtkplot/plotdraw.cpp +++ b/app/rtkplot/plotdraw.cpp @@ -1029,7 +1029,7 @@ void __fastcall TPlot::DrawObsSlip(double *yp) else if (!*code||!strcmp(code,"1")||!strcmp(code,"2")) { if (obs->L[0]!=0.0&&obs->L[1]!=0.0&& satsys(obs->sat,NULL)!=SYS_GLO) { - gf=CLIGHT*(obs->L[0]/FREQ1-obs->L[1]/FREQ2); + gf=CLIGHT*(obs->L[0]/FREQL1-obs->L[1]/FREQL2); if (fabs(gfp[obs->sat-1]-gf)>THRESLIP) slip=1; gfp[obs->sat-1]=gf; } @@ -1220,7 +1220,7 @@ void __fastcall TPlot::DrawSky(int level) else if (!*code||!strcmp(code,"1")||!strcmp(code,"2")) { if (obs->L[0]!=0.0&&obs->L[1]!=0.0&& satsys(obs->sat,NULL)!=SYS_GLO) { - gf=CLIGHT*(obs->L[0]/FREQ1-obs->L[1]/FREQ2); + gf=CLIGHT*(obs->L[0]/FREQL1-obs->L[1]/FREQL2); if (fabs(gfp[obs->sat-1]-gf)>THRESLIP) slip=1; gfp[obs->sat-1]=gf; } diff --git a/app/rtkplot/rtkplot.cbproj b/app/rtkplot/rtkplot.cbproj index 20c77da77c83a190f73f5c75ff13046e73c6ee10..02a0bc87202f7118f7ded3f24295aab4e058acfc 100644 --- a/app/rtkplot/rtkplot.cbproj +++ b/app/rtkplot/rtkplot.cbproj @@ -83,7 +83,7 @@ <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <OutputExt>exe</OutputExt> <TASM_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;NFREQ=4;NEXOBS=3;$(TASM_Defines)</TASM_Defines> - <BCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;ENAIRN;NEXOBS=0;NFREQ=4;NEXOBS=3;$(BCC_Defines)</BCC_Defines> + <BCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;$(BCC_Defines)</BCC_Defines> <BRCC_Defines>_RTLDLL;WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;NFREQ=4;NEXOBS=3;$(BRCC_Defines)</BRCC_Defines> <BCC_UserSuppliedOptions> -tWM</BCC_UserSuppliedOptions> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> @@ -554,30 +554,30 @@ <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> + <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="Release_Build\rtkplot.exe" Configuration="Release" Class="ProjectOutput"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> + <RemoteName>rtkplot.exe</RemoteName> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> + <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32250mt.dll" Class="DependencyModule"> <Platform Name="Win32"> - <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="Release_Build\rtkplot.exe" Configuration="Release" Class="ProjectOutput"> + <DeployFile LocalName="..\..\src\rtcm3e.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> - <RemoteName>rtkplot.exe</RemoteName> + <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite> </Platform> </DeployFile> - <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile"> + <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile"> <Platform Name="Win32"> <RemoteDir>.\</RemoteDir> <Overwrite>true</Overwrite>