diff --git a/app/pos2kml/msc/msc.sln b/app/pos2kml/msc/msc.sln index f9e24393566cc116add579ca648671933d1f1693..48bb0c379a650d7b06f4f1081ab5fe4ea2a02313 100644 --- a/app/pos2kml/msc/msc.sln +++ b/app/pos2kml/msc/msc.sln @@ -1,7 +1,9 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcproj", "{E7D8F3E9-5363-4E31-8F16-4256E570767A}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.489 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc", "msc.vcxproj", "{E7D8F3E9-5363-4E31-8F16-4256E570767A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {33063145-C24F-457F-B83D-3D709114A8CD} + EndGlobalSection EndGlobal diff --git a/src/rcv/ublox.c b/src/rcv/ublox.c index 76deb64505d32360bd863dc86089d28c7af68bfd..d61765f8d197e1b979d040cdc72bde488e7c7104 100644 --- a/src/rcv/ublox.c +++ b/src/rcv/ublox.c @@ -202,8 +202,8 @@ static int sig_idx(int sys, int code) else if (sys == SYS_GAL) { if (code==CODE_L1C) return 1; if (code==CODE_L1B) return 1; - if (code==CODE_L7Q) return 2; - if (code==CODE_L7I) return 2; + if (code==CODE_L7Q) return 3; + if (code==CODE_L7I) return 3; } else if (sys == SYS_QZS) { if (code==CODE_L1C) return 1; diff --git a/src/rtkcmn.c b/src/rtkcmn.c index 7316af5124384baa66bcd0dbaf68affc0c618490..edb1c86c1ca1fd5ff6dbc77b7b6e57ced0be1baa 100644 --- a/src/rtkcmn.c +++ b/src/rtkcmn.c @@ -203,7 +203,7 @@ const prcopt_t prcopt_default={ /* defaults processing options */ {30.0,0.03,0.3}, /* std[] */ {1E-4,1E-3,1E-4,1E-1,1E-2,0.0}, /* prn[] */ 5E-12, /* sclkstab */ - {3.0,0.25,0.0,1E-7,1E-3,0.0,0.0,0.0}, /* thresar */ + {3.0,0.25,0.0,1E-9,1E-5,0.0,0.0,0.0}, /* thresar */ 0.0,0.0,0.05,0.1,0.01, /* elmaskar,elmaskhold,thresslip,varholdamb,gainholdamb */ 30.0,1000.0,30.0, /* maxtdif,maxinno,maxgdop */ {0},{0},{0}, /* baseline,ru,rb */ diff --git a/src/rtklib.h b/src/rtklib.h index 988df473f3e3c7f5003918f6304a33e06b3adc7d..5ebb6b08dc8fe2db36ec6c17ec3cc0ca40ec180d 100644 --- a/src/rtklib.h +++ b/src/rtklib.h @@ -58,7 +58,7 @@ extern "C" { #define VER_RTKLIB "demo5" /* library version */ -#define PATCH_LEVEL "b31" /* patch level */ +#define PATCH_LEVEL "b31a" /* patch level */ #define COPYRIGHT_RTKLIB \ "Copyright (C) 2007-2018 T.Takasu\nAll rights reserved."