Merge remote-tracking branch 'origin/SIDev'

S2GT.ini

 [CSPP-Template]
 WebServer.Enabled=False
 WebServer.TcpAccess="c+*.gsi.de"
+DefaultDataFileLocation=C:\User\S2GTData
 # The application uses decimal point as decimal delimiter.
 # Class attributes are specified as follows. All values are parsed as strings.
 # LibraryName:ClassName.AttributeName=""
@@ -193,8 +194,8 @@ CSPP_DSCAlarmViewer:CSPP_DSCAlarmViewer.ProcessURL_1 = "\\\\localhost\\CSPP_Syst
 [DSCTrendViewer]
 LVClassPath="CSPP_DSCTrendViewer.lvlib:CSPP_DSCTrendViewer.lvclass"
 CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
-CSPP_BaseActor:CSPP_BaseActor.Settings="Auto"
-CSPP_DSCTrendViewer:CSPP_DSCTrendViewer.Configuration_File="C:\\User\\CSPP-HTV\\S2GT-PressureTrend.xml"
+CSPP_BaseActor:CSPP_BaseActor.Settings="User"
+CSPP_DSCTrendViewer:CSPP_DSCTrendViewer.Configuration_File="C:\\User\\S2GTData\\CSPP-HTV\\S2GT-PressureTrend.xml"
 [DSClog]
 LVClassPath="CSPP_DSCMsgLogger.lvlib:CSPP_DSCMsgLogger.lvclass"
 CSPP_DSCMsgLogger:CSPP_DSCMsgLogger.Process="S2GT"
@@ -496,8 +497,8 @@ S2GT_MainGUI:S2GT_MainGUI.Valve="Valve"
 S2GT_MainGUI:S2GT_MainGUI.PAI="PressureAI"
 S2GT_MainGUI:S2GT_MainGUI.PAO="PressureAO"
 [PressureAI]
-LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
-#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
+#LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
+LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV-AIAvg.lvclass"
 CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="cDAQ1Mod2"
 CSPP_DeviceActor:CSPP_DeviceActor.Reset=False
 CSPP_DeviceActor:CSPP_DeviceActor.Selftest=True
@@ -514,7 +515,12 @@ BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Max=10
 BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=0
 BNT_DAQmx:BNT_DAQmx-MCSV.AI-Uncertainty=1E-3
 BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=10083
-# Default=-1; RSE=10083; NRSE=10078; Differential=10106;Pseudodifferential=12529 
+# Default=-1; RSE=10083; NRSE=10078; Differential=10106;Pseudodifferential=12529
+BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SamplesPerChannel=100
+BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.SampleRate=1000
+BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ClockSource="OnboardClock"
+BNT_DAQmx:BNT_DAQmx-MCSV-AIAvg.ActiveEdge="Rising"
+
 [PressureAI.URLs]
 PollingCounter="ni.var.psp://localhost/S2GT/PressureAI_PollingCounter?.1"
 PollingDeltaT="ni.var.psp://localhost/S2GT/PressureAI_PollingDeltaT?.1"
@@ -572,7 +578,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
 CSPP_BaseActor:CSPP_BaseActor.PVProxy="PressureAOProxy"
 CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
 BNT_DAQmx:BNT_DAQmx-MCSV.AO-Channels="AO0"
-BNT_DAQmx:BNT_DAQmx-MCSV.AO-Range_Max=5
+BNT_DAQmx:BNT_DAQmx-MCSV.AO-Range_Max=10
 BNT_DAQmx:BNT_DAQmx-MCSV.AO-Range_Min=0
 BNT_DAQmx:BNT_DAQmx-MCSV.AO-Uncertainty=1E-3
 BNT_DAQmx:BNT_DAQmx-MCSV.AO-TerminalConfiguration=-1

S2GT.lvproj

@@ -1228,7 +1228,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
 				<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
 				<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
 				<Property Name="Bld_userLogFile" Type="Path">/D/builds/S2GT/App/S2GT_BuildLog.txt</Property>
-				<Property Name="Bld_version.build" Type="Int">5</Property>
+				<Property Name="Bld_version.build" Type="Int">6</Property>
 				<Property Name="Destination[0].destName" Type="Str">S2GT.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">/D/builds/NI_AB_PROJECTNAME/App/S2GT.exe</Property>
 				<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
@@ -1242,7 +1242,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
 				<Property Name="Exe_iconItemID" Type="Ref">/My Computer/S2GT.ico</Property>
 				<Property Name="Exe_VardepHideDeployDlg" Type="Bool">true</Property>
 				<Property Name="Exe_VardepUndeployOnExit" Type="Bool">true</Property>
-				<Property Name="Source[0].itemID" Type="Str">{FBB34192-D685-4EA5-838E-60A5FC7D8E47}</Property>
+				<Property Name="Source[0].itemID" Type="Str">{3FF63091-8870-4218-9FE5-76AEFF4BFC69}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
 				<Property Name="Source[1].itemID" Type="Ref">/My Computer/README.md</Property>
@@ -1394,7 +1394,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
 				<Property Name="INST_defaultDir" Type="Str">{4F87F980-B8AB-404F-86B3-82775B05A184}</Property>
 				<Property Name="INST_installerName" Type="Str">install.exe</Property>
 				<Property Name="INST_productName" Type="Str">S2GT</Property>
-				<Property Name="INST_productVersion" Type="Str">1.0.4</Property>
+				<Property Name="INST_productVersion" Type="Str">1.0.5</Property>
 				<Property Name="InstSpecBitness" Type="Str">32-bit</Property>
 				<Property Name="InstSpecVersion" Type="Str">19018000</Property>
 				<Property Name="MSI_arpCompany" Type="Str">GSI Helmhotzzentrum für Schwerionenforschung GmbH</Property>