Index: trunk/BNC/Example_Configs/16_Upload.bnc
===================================================================
--- trunk/BNC/Example_Configs/16_Upload.bnc	(revision 9915)
+++ trunk/BNC/Example_Configs/16_Upload.bnc	(revision 9918)
@@ -6,9 +6,9 @@
 autoStart=0
 casterUrlList=http://Example:Configs@products.igs-ip.net:2101, http://User:Pass@euref-ip.net:2101, http://User:Pass@igs-ip.net:2101, http://User:Pass@mgex.igs-ip.net:2101
-cmbBds=0
+cmbBds=2
 cmbBsxFile=
-cmbGal=0
-cmbGlo=0
-cmbGps=0
+cmbGal=2
+cmbGlo=2
+cmbGps=2
 cmbIrnss=0
 cmbMaxres=
@@ -18,5 +18,4 @@
 cmbSbas=0
 cmbStreams=
-cmbUseGlonass=0
 corrIntr=1 day
 corrPath=
@@ -25,6 +24,5 @@
 ephOutPort=
 ephPath=
-ephV2=0
-ephVersion=4
+ephVersion=3
 font=
 logFile=Output/Upload.log
@@ -47,5 +45,5 @@
 reqcAction=
 reqcComment=
-reqcEndDateTime=
+reqcEndDateTime=2099-01-01T00:00:00
 reqcLogSummaryOnly=0
 reqcNavFile=
@@ -73,9 +71,9 @@
 reqcRnxVersion=
 reqcRunBy=
-reqcSampling=
-reqcSkyPlotSignals=
-reqcStartDateTime=
+reqcSampling=1 sec
+reqcSkyPlotSignals=G:1&2&5 R:1&2&3 E:1&7 C:2&6 J:1&2 I:5&9 S:1&5
+reqcStartDateTime=1967-11-02T00:00:00
 reqcUseObsTypes=
-reqcV2Priority=
+reqcV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:18&DPX I:ABCX S:1&C S:5&IQX
 rnxAppend=0
 rnxIntr=1 day
@@ -86,7 +84,6 @@
 rnxSkel=skl
 rnxSkelPath=
-rnxV2=0
-rnxV2Priority=CWPX_?
-rnxVersion=4
+rnxV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:18&DPX I:ABCX S:1&C S:5&IQX
+rnxVersion=3
 serialAutoNMEA=Auto
 serialBaudRate=9600
@@ -95,5 +92,5 @@
 serialFlowControl=OFF
 serialHeightNMEA=
-serialManualNMEASampling=0
+serialManualNMEASampling=10
 serialMountPoint=
 serialParity=NONE
@@ -123,18 +120,13 @@
 trafo_scr=
 trafo_t0=
-uploadAntexFile=Input/igs14.atx
-uploadEphHost=
-uploadEphMountpoint=
+uploadAntexFile=Input/igs20.atx
 uploadEphMountpointsOut=
-uploadEphPassword=
-uploadEphPort=
-uploadEphSample=5
 uploadIntr=1 day
-uploadMountpointsOut="products.igs-ip.net,2101,CLOCK,2,user,pass,IGS14,IGS-SSR,0,Output/BNC0SSRRTS${V3PROD}.sp3,Output/BNC0SSRRTS${V3PROD}.clk,,,,,0 byte(s),"
-uploadSamplBiaSnx=0
-uploadSamplClkRnx=0
-uploadSamplRtcmEph=0
-uploadSamplRtcmEphCorr=0
-uploadSamplSp3=0
+uploadMountpointsOut="products.igs-ip.net,2101,CLOCK,2,user,pass,IGS20,IGS-SSR,0,Output/BKG0MGXRTS${V3PROD}.sp3,Output/BKG0MGXRTS${V3PROD}.clk,Output/BKG0MGXRTS${V3PROD}.bia,,,,0 byte(s),"
+uploadSamplBiaSnx=60
+uploadSamplClkRnx=5
+uploadSamplRtcmEph=5
+uploadSamplRtcmEphCorr=5
+uploadSamplSp3=1
 
 [PPP]
@@ -151,18 +143,18 @@
 ionoFile=
 ionoMount=
-lcBDS=no
-lcGLONASS=no
-lcGPS=no
-lcGalileo=no
+lcBDS=Pi&Li
+lcGLONASS=Pi&Li
+lcGPS=Pi&Li
+lcGalileo=Pi&Li
 logPath=
 mapSpeedSlider=100
 mapWinDotColor=red
 mapWinDotSize=
-maxResC1=4.0
+maxResC1=3.0
 maxResGIM=3.0
 maxResL1=0.03
 minEle=0
 minObs=5
-modelObs=Ionosphere-free PPP
+modelObs=Uncombined PPP
 nmeaPath=
 plotCoordinates=
@@ -172,6 +164,6 @@
 seedingTime=0
 sigmaC1=2.0
-sigmaGIM=4.0
-sigmaL1=0.01
+sigmaGIM=5.0
+sigmaL1=0.02
 snxtroAc=
 snxtroIntr=1 hour
@@ -179,4 +171,3 @@
 snxtroSampl=1 sec
 snxtroSol=
-staTable=",,,,,,,"
-useOpenStreetMap=false
+staTable=",,,,,,,,,,,"
Index: trunk/BNC/Example_Configs/17_Combi.bnc
===================================================================
--- trunk/BNC/Example_Configs/17_Combi.bnc	(revision 9915)
+++ trunk/BNC/Example_Configs/17_Combi.bnc	(revision 9918)
@@ -24,6 +24,5 @@
 ephOutPort=
 ephPath=
-ephV2=0
-ephVersion=4
+ephVersion=3
 font=
 logFile=Output/Combi.log
@@ -73,8 +72,8 @@
 reqcRunBy=
 reqcSampling=1 sec
-reqcSkyPlotSignals=C:2&7 E:1&5 G:1&2&5 J:1&2 R:1&2&3 S:1&5 I:5&9
+reqcSkyPlotSignals=G:1&2&5 R:1&2&3 E:1&7 C:2&6 J:1&2 I:5&9 S:1&5
 reqcStartDateTime=1967-11-02T00:00:00
 reqcUseObsTypes=
-reqcV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX
+reqcV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:18&DPX I:ABCX S:1&C S:5&IQX
 rnxAppend=0
 rnxIntr=1 day
@@ -85,7 +84,6 @@
 rnxSkel=skl
 rnxSkelPath=
-rnxV2=0
-rnxV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX
-rnxVersion=4
+rnxV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:18&DPX I:ABCX S:1&C S:5&IQX
+rnxVersion=3
 serialAutoNMEA=Auto
 serialBaudRate=9600
@@ -105,5 +103,5 @@
 sslClientCertPath=
 sslIgnoreErrors=0
-startTab=15
+startTab=16
 statusTab=0
 trafo_dx=
@@ -122,9 +120,9 @@
 trafo_scr=
 trafo_t0=
-uploadAntexFile=Input/igs14.atx
+uploadAntexFile=Input/igs20.atx
 uploadEphMountpointsOut=
 uploadIntr=1 day
-uploadMountpointsOut="products.igs-ip.net,2101,SSRA02IGS1_T,2,,,IGS14,IGS-SSR,2,Output/BNC0SSRRTS${V3PROD}.sp3,Output/BNC0SSRRTS${V3PROD}.clk,,,,,0 byte(s),"
-uploadSamplBiaSnx=60
+uploadMountpointsOut="products.igs-ip.net,2101,SSRA02IGS1_T,2,,,IGS20,IGS-SSR,2,Output/BKG0MGXRTS${V3PROD}.sp3,Output/BKG0MGXRTS${V3PROD}.clk,Output/BKG0MGXRTS${V3PROD}.bia,,,,0 byte(s),"
+uploadSamplBiaSnx=5
 uploadSamplClkRnx=5
 uploadSamplRtcmEph=5
@@ -175,3 +173,2 @@
 snxtroSol=
 staTable=@Invalid()
-useOpenStreetMap=false
Index: trunk/BNC/Example_Configs/18_CombiPPP.bnc
===================================================================
--- trunk/BNC/Example_Configs/18_CombiPPP.bnc	(revision 9915)
+++ trunk/BNC/Example_Configs/18_CombiPPP.bnc	(revision 9918)
@@ -24,6 +24,5 @@
 ephOutPort=
 ephPath=
-ephV2=0
-ephVersion=4
+ephVersion=3
 font=
 logFile=Output/CombiPPP.log
@@ -73,8 +72,8 @@
 reqcRunBy=
 reqcSampling=1 sec
-reqcSkyPlotSignals=C:2&7 E:1&5 G:1&2&5 J:1&2 R:1&2&3 S:1&5 I:5&9
+reqcSkyPlotSignals=G:1&2&5 R:1&2&3 E:1&7 C:2&6 J:1&2 I:5&9 S:1&5
 reqcStartDateTime=1967-11-02T00:00:00
 reqcUseObsTypes=
-reqcV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX
+reqcV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:18&DPX I:ABCX S:1&C S:5&IQX
 rnxAppend=0
 rnxIntr=1 day
@@ -85,7 +84,6 @@
 rnxSkel=skl
 rnxSkelPath=
-rnxV2=0
-rnxV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX
-rnxVersion=4
+rnxV2Priority=G:12&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:18&DPX I:ABCX S:1&C S:5&IQX
+rnxVersion=3
 serialAutoNMEA=Auto
 serialBaudRate=9600
@@ -105,5 +103,5 @@
 sslClientCertPath=
 sslIgnoreErrors=0
-startTab=11
+startTab=12
 statusTab=3
 trafo_dx=
@@ -122,9 +120,9 @@
 trafo_scr=
 trafo_t0=
-uploadAntexFile=Input/igs14.atx
+uploadAntexFile=Input/igs20.atx
 uploadEphMountpointsOut=
 uploadIntr=1 day
-uploadMountpointsOut="products.igs-ip.net,2101,SSRA02IGS1_T,2,,,IGS14,IGS-SSR,2,Output/BNC0SSRRTS${V3PROD}.sp3,Output/BNC0SSRRTS${V3PROD}.clk,,,,,0 byte(s),"
-uploadSamplBiaSnx=60
+uploadMountpointsOut="products.igs-ip.net,2101,SSRA02IGS1_T,2,,,IGS20,IGS-SSR,2,Output/BKG0MGXRTS${V3PROD}.sp3,Output/BKG0MGXRTS${V3PROD}.clk,Output/BKG0MGXRTS${V3PROD}.bia,,,,0 byte(s),"
+uploadSamplBiaSnx=5
 uploadSamplClkRnx=5
 uploadSamplRtcmEph=5
@@ -133,5 +131,5 @@
 
 [PPP]
-antexFile=Input/igs14.atx
+antexFile=Input/igs20.atx
 audioResponse=
 blqFile=Input/BNC.BLQ
@@ -139,5 +137,5 @@
 corrMount=INTERNAL
 corrWaitTime=5
-crdFile=Input/BNC_ITRF2014.CRD
+crdFile=Input/BNC_IGS20.CRD
 dataSource=Real-Time Streams
 eleWgtCode=2
@@ -174,4 +172,3 @@
 snxtroSampl=1 sec
 snxtroSol=
-staTable="FFMJ00DEU0,0.02,0.02,0.05,100.0,100.0,100.0,0.1,3e-6,0,"
-useOpenStreetMap=false
+staTable="FFMJ00DEU0,0.02,0.02,0.05,100.0,100.0,100.0,0.1,3e-6,0,G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX,"