From f1fc435c351f5ef383190be29ce6b3c25401e6f1 Mon Sep 17 00:00:00 2001
From: Tim Everett <tim.everett3@gmail.com>
Date: Sat, 9 Nov 2019 10:44:01 -0700
Subject: [PATCH] - More updates for Embarcadero project files - Misc minor
source file cleanup
---
app/pos2kml/bcc/_pos2kml.cbproj | 2 +-
app/pos2kml/msc/msc.sln | 14 +-
app/rtknavi/rtknavi.cbproj | 283 ++++++++++++++++++++++++-
app/rtkplot_qt/plotdraw.cpp | 4 +-
app/rtkpost_win64/rtkpost_win64.cbproj | 27 ++-
src/preceph.c | 2 +-
src/rinex.c | 4 +-
util/testlex/outlexion.c | 2 +-
8 files changed, 308 insertions(+), 30 deletions(-)
diff --git a/app/pos2kml/bcc/_pos2kml.cbproj b/app/pos2kml/bcc/_pos2kml.cbproj
index 7bebe1b..1391661 100644
--- a/app/pos2kml/bcc/_pos2kml.cbproj
+++ b/app/pos2kml/bcc/_pos2kml.cbproj
@@ -5,7 +5,7 @@
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
<FrameworkType>None</FrameworkType>
- <ProjectVersion>18.4</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Console</AppType>
diff --git a/app/pos2kml/msc/msc.sln b/app/pos2kml/msc/msc.sln
index 48bb0c3..0e76de4 100644
--- a/app/pos2kml/msc/msc.sln
+++ b/app/pos2kml/msc/msc.sln
@@ -7,19 +7,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcxproj", "{E7D8
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Debug|Win32.ActiveCfg = Debug|Win32
- {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Debug|Win32.Build.0 = Debug|Win32
- {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Release|Win32.ActiveCfg = Release|Win32
- {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Release|Win32.Build.0 = Release|Win32
+ {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Debug|x86.ActiveCfg = Debug|Win32
+ {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Debug|x86.Build.0 = Debug|Win32
+ {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Release|x86.ActiveCfg = Release|Win32
+ {E7D8F3E9-5363-4E31-8F16-4256E570767A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {33063145-C24F-457F-B83D-3D709114A8CD}
+ SolutionGuid = {63470E00-432E-4F72-8777-0C56CECC0A69}
EndGlobalSection
EndGlobal
diff --git a/app/rtknavi/rtknavi.cbproj b/app/rtknavi/rtknavi.cbproj
index d9ba7e3..6e603f9 100644
--- a/app/rtknavi/rtknavi.cbproj
+++ b/app/rtknavi/rtknavi.cbproj
@@ -6,7 +6,7 @@
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
<FrameworkType>VCL</FrameworkType>
- <ProjectVersion>18.5</ProjectVersion>
+ <ProjectVersion>18.7</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType>
@@ -522,13 +522,13 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\rtcm2.c" Configuration="Release" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\rcv\novatel.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
@@ -568,13 +568,13 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile">
+ <DeployFile LocalName="..\..\src\rtkcmn.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
@@ -944,6 +944,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Colors">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
@@ -980,6 +986,36 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_NotificationIcon24">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_NotificationIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
@@ -1004,6 +1040,12 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="Android_Strings">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
@@ -1123,6 +1165,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1024x768">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1134,6 +1187,39 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch1536x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1668x2388">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1145,6 +1231,61 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch2048x1536">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048x2732">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2224">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2388x1668">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2732x2048">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1156,6 +1297,116 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPad_Launch768x1024">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1125">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1136x640">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1242x2688">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1334">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch1792">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2208">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2436">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch2688x1242">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
@@ -1189,6 +1440,28 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
+ <DeployClass Name="iPhone_Launch750">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch828">
+ <Platform Name="iOSDevice32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSDevice64">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
diff --git a/app/rtkplot_qt/plotdraw.cpp b/app/rtkplot_qt/plotdraw.cpp
index 53c375d..f6ef3db 100644
--- a/app/rtkplot_qt/plotdraw.cpp
+++ b/app/rtkplot_qt/plotdraw.cpp
@@ -968,7 +968,7 @@ void Plot::DrawObsSlip(QPainter &c,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;
}
@@ -1155,7 +1155,7 @@ void Plot::DrawSky(QPainter &c,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/rtkpost_win64/rtkpost_win64.cbproj b/app/rtkpost_win64/rtkpost_win64.cbproj
index 4b1cabc..267011a 100644
--- a/app/rtkpost_win64/rtkpost_win64.cbproj
+++ b/app/rtkpost_win64/rtkpost_win64.cbproj
@@ -59,7 +59,7 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
- <BCC_Defines>WIN32;TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;$(BCC_Defines)</BCC_Defines>
+ <BCC_Defines>TRACE;ENAGLO;ENAGAL;ENAQZS;ENACMP;ENAIRN;NFREQ=4;NEXOBS=3;$(BCC_Defines)</BCC_Defines>
<ILINK_LinkwithRegEx>false</ILINK_LinkwithRegEx>
<ILINK_LinkwithMidas>false</ILINK_LinkwithMidas>
<ILINK_LinkwithZLib>false</ILINK_LinkwithZLib>
@@ -107,6 +107,7 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
<UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
+ <BCC_Defines>WIN32;$(BCC_Defines)</BCC_Defines>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
@@ -117,6 +118,7 @@
<BRCC_Defines>_RTLDLL;WIN32;TRACE;MKL;ENAGLO;ENAQZS;ENAGAL;ENACMP;NFREQ=4;NEXOBS=3;$(BRCC_Defines)</BRCC_Defines>
<UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
<UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
+ <BCC_Defines>WIN64;$(BCC_Defines)</BCC_Defines>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
@@ -143,6 +145,9 @@
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
<AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
@@ -419,8 +424,8 @@
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
</Parameters>
<Excluded_Packages>
- <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 サーãƒãƒ¼ パッケージ</Excluded_Packages>
- <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP サーãƒãƒ¼ パッケージ</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\bcboffice2k260.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\bcbofficexp260.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
</Excluded_Packages>
<ProjectProperties>
<ProjectProperties Name="AutoShowDeps">False</ProjectProperties>
@@ -470,6 +475,12 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
+ <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile">
+ <Platform Name="Win32">
+ <RemoteDir>.\</RemoteDir>
+ <Overwrite>true</Overwrite>
+ </Platform>
+ </DeployFile>
<DeployFile LocalName="..\..\src\pntpos.c" Configuration="Release" Class="ProjectFile">
<Platform Name="Win64">
<RemoteDir>.\</RemoteDir>
@@ -481,12 +492,6 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile">
- <Platform Name="Win64">
- <RemoteDir>.\</RemoteDir>
- <Overwrite>true</Overwrite>
- </Platform>
- </DeployFile>
<DeployFile LocalName="rtkpost_win64.res" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
@@ -498,8 +503,8 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
- <DeployFile LocalName="..\..\src\ephemeris.c" Configuration="Release" Class="ProjectFile">
- <Platform Name="Win32">
+ <DeployFile LocalName="..\..\src\ionex.c" Configuration="Release" Class="ProjectFile">
+ <Platform Name="Win64">
<RemoteDir>.\</RemoteDir>
<Overwrite>true</Overwrite>
</Platform>
diff --git a/src/preceph.c b/src/preceph.c
index 772f6f1..be01263 100644
--- a/src/preceph.c
+++ b/src/preceph.c
@@ -606,7 +606,7 @@ static int pephclk(gtime_t time, int sat, const nav_t *nav, double *dts,
if (nav->nc<2||
timediff(time,nav->pclk[0].time)<-MAXDTE||
timediff(time,nav->pclk[nav->nc-1].time)>MAXDTE) {
- trace(3,"no prec clock %s sat=%2d\n",time_str(time,0),sat);
+ trace(4,"no prec clock %s sat=%2d\n",time_str(time,0),sat);
return 1;
}
/* binary search */
diff --git a/src/rinex.c b/src/rinex.c
index 5d351aa..a55abc5 100644
--- a/src/rinex.c
+++ b/src/rinex.c
@@ -2079,12 +2079,12 @@ static int obsindex(double ver, int sys, const unsigned char *code,
return i;
}
else {
- id=code2obs(code[i],NULL);
+ id=code2obs(code[i],NULL);
if (id[0]==tobs[1]) return i;
}
}
else { /* ver.3 */
- id=code2obs(code[i],NULL);
+ id=code2obs(code[i],NULL);
if (!strcmp(id,tobs+1)) return i;
}
}
diff --git a/util/testlex/outlexion.c b/util/testlex/outlexion.c
index 5e52a23..cf28c3e 100644
--- a/util/testlex/outlexion.c
+++ b/util/testlex/outlexion.c
@@ -45,7 +45,7 @@ static void printtec(int index, gtime_t time, double sec, const nav_t *nav,
pos[0]=(lat0-dpos*i)*D2R;
pos[1]=(lon0+dpos*j)*D2R;
if (lexioncorr(time,nav,pos,azel,&ion,&var)) {
- /*tec=ion*FREQ1*FREQ1/40.3E16;*/ /* L1 iono delay -> tecu */
+ /*tec=ion*FREQL1*FREQL1/40.3E16;*/ /* L1 iono delay -> tecu */
fprintf(fp,"%7.3f ",ion);
}
else {
--
GitLab