Projects/CurrentTester Commit

- Setup optimized

LabVIEW -

r47:48

parent child

The requested changes are too big and content was truncated. Show full diff

CurrentTester [LabVIEW]/CurrentTester.lvproj +10 -4

             				<Property Name="DistPart[6].SoftDep[9].upgradeCode" Type="Str">{9872BBBA-FB96-42A4-80A2-9605AC5CBCF1}</Property>
             				<Property Name="DistPart[6].SoftDepCount" Type="Int">12</Property>
             				<Property Name="DistPart[6].upgradeCode" Type="Str">{251E8668-4013-3671-857C-61D46B2AC827}</Property>
-            				<Property Name="DistPartCount" Type="Int">7</Property>
+            				<Property Name="DistPart[7].flavorID" Type="Str">_full_</Property>
+            				<Property Name="DistPart[7].productID" Type="Str">{68AA4B28-8BE7-4281-A587-2079311AC1CB}</Property>
+            				<Property Name="DistPart[7].productName" Type="Str">NI Measurement &amp; Automation Explorer 21.0</Property>
+            				<Property Name="DistPart[7].SoftDep[0].exclude" Type="Bool">false</Property>
+            				<Property Name="DistPart[7].SoftDep[0].productName" Type="Str">NI Error Reporting</Property>
+            				<Property Name="DistPart[7].SoftDep[0].upgradeCode" Type="Str">{42E818C6-2B08-4DE7-BD91-B0FD704C119A}</Property>
+            				<Property Name="DistPart[7].SoftDepCount" Type="Int">1</Property>
+            				<Property Name="DistPart[7].upgradeCode" Type="Str">{AE940F24-CC0E-4148-9A96-10FB04D9796D}</Property>
+            				<Property Name="DistPartCount" Type="Int">8</Property>
             				<Property Name="INST_author" Type="Str">INGUN Prüfmittelbau GmbH</Property>
             				<Property Name="INST_autoIncrement" Type="Bool">true</Property>
             				<Property Name="INST_buildLocation" Type="Path">../builds/Installer</Property>
             				<Property Name="INST_defaultDir" Type="Str">{624309A2-B0CB-4149-B964-A0FF8B968B6A}</Property>
             				<Property Name="INST_installerName" Type="Str">install.exe</Property>
             				<Property Name="INST_productName" Type="Str">CurrentTester</Property>
-            				<Property Name="INST_productVersion" Type="Str">1.0.1</Property>
+            				<Property Name="INST_productVersion" Type="Str">1.0.2</Property>
             				<Property Name="InstSpecBitness" Type="Str">32-bit</Property>
             				<Property Name="InstSpecVersion" Type="Str">21008000</Property>
             				<Property Name="MSI_arpCompany" Type="Str">INGUN Prüfmittelbau GmbH</Property>
-            				<Property Name="MSI_autoselectDrivers" Type="Bool">true</Property>
             				<Property Name="MSI_distID" Type="Str">{AB5F4332-2B71-46A5-83E2-74185A442847}</Property>
-            				<Property Name="MSI_hideNonRuntimes" Type="Bool">true</Property>
             				<Property Name="MSI_osCheck" Type="Int">0</Property>
             				<Property Name="MSI_upgradeCode" Type="Str">{56D92E14-C621-4E2A-AB27-053C9517B3F3}</Property>
             				<Property Name="RegDest[0].dirName" Type="Str">Software</Property>

CurrentTester [LabVIEW]/CurrentTester.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/Initialization.ini +19 -17

             SensorsEnable 4 = "True"
             SensorsEnable 5 = "True"
             SensorsEnable 6 = "True"
-            SensorsEnable 7 = "True"
+            SensorsEnable 7 = "False"
-            SensorsEnable 8 = "True"
+            SensorsEnable 8 = "False"
-            SensorsEnable 9 = "True"
+            SensorsEnable 9 = "False"
-            SensorsEnable 10 = "True"
+            SensorsEnable 10 = "False"
-            SensorsEnable 11 = "True"
+            SensorsEnable 11 = "False"
-            SensorsEnable 12 = "True"
+            SensorsEnable 12 = "False"
-            SensorsEnable 13 = "True"
+            SensorsEnable 13 = "False"
-            SensorsEnable 14 = "True"
+            SensorsEnable 14 = "False"
             SensorsDescription.<size(s)> = "15"
             SensorsDescription 0 = "NI-9212: Ch1"
             SensorsDescription 1 = "NI-9212: Ch2"
             SensorsDescription 12 = "NI-9219_3: Ch2"
             SensorsDescription 13 = "NI-9219_3: Ch3"
             SensorsDescription 14 = "NI-9219_3: Ch4"
-            VoltageDescription.<size(s)> = "4 2"
+            VoltageDescription.<size(s)> = "5 2"
             VoltageDescription 0 = "NI-9215: Ch1"
             VoltageDescription 1 = "Pr�flingsspannung [V]"
             VoltageDescription 2 = "NI-9215: Ch2"
             VoltageDescription 5 = "Strom [A]"
             VoltageDescription 6 = ""
             VoltageDescription 7 = "Widerstand [mOhm]"
+            VoltageDescription 8 = ""
+            VoltageDescription 9 = "Leistung [W]"
             CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc"
             [Hardware]
-            SimulateDevices = False
+            SimulateDevices = True
             DI_E-Stop = ""
             DI_Setup = ""
             PowerSupply_VISAName = "COM4"
             Measurement_Check = False
             DMM_VISAName = "NI9219_1/ai3"
             DMM_ContactLimits = "<size(s)=2> 0,000000 10,000000"
-            TemperatureGain = "<size(s)=15> 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000"
+            TemperatureGain = "<size(s)=15> 1,000000 0,752000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000"
-            TemperatureOffset = "<size(s)=15> 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000"
+            TemperatureOffset = "<size(s)=15> -130,000000 4,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000"
-            VoltageGain = "<size(s)=4> 1,000000 1,000000 1,000000 1,000000"
+            VoltageGain = "<size(s)=5> 0,010000 0,001000 1,000000 0,010000 1,000000"
-            VoltageOffset = "<size(s)=4> 0,000000 0,000000 0,000000 0,000000"
+            VoltageOffset = "<size(s)=5> 0,000000 0,000000 0,000000 0,000000 0,000000"
             AllowedContactFails = "2"
             [HSMP2]
             Configuration_AI_Thermocouple 0.CJC_Value = "25,000000"
             Configuration_AI_Thermocouple 1.Maximum = "250,000000"
             Configuration_AI_Thermocouple 1.Minimum = "-200,000000"
-            Configuration_AI_Thermocouple 1.Type = "K"
+            Configuration_AI_Thermocouple 1.Type = "N"
             Configuration_AI_Thermocouple 1.CJC_Source = "Built-In"
             Configuration_AI_Thermocouple 1.CJC_Value = "25,000000"
             Configuration_AI_Thermocouple 2.Maximum = "250,000000"
             Configuration_AI_NI9219_Resistance 10.R0 = "1000,000000"
             Configuration_AI_NI9219_Resistance 10.ABC = "<size(s)=3> 0,003810 -6,020000E-7 -6,000000E-12"
             Configuration_AI_NI9219_Type.<size(s)> = "11"
-            Configuration_AI_NI9219_Type 0 = "RTD"
+            Configuration_AI_NI9219_Type 0 = "Thermocouple"
             Configuration_AI_NI9219_Type 1 = "Thermocouple"
-            Configuration_AI_NI9219_Type 2 = "Resistance_Thermistor"
+            Configuration_AI_NI9219_Type 2 = "Thermocouple"
             Configuration_AI_NI9219_Type 3 = "Thermocouple"
             Configuration_AI_NI9219_Type 4 = "Resistance_Thermistor"
             Configuration_AI_NI9219_Type 5 = "Resistance_Thermistor"

CurrentTester [LabVIEW]/Initialization_HSMP1.ini +5 -3

             SensorsDescription 12 = ""
             SensorsDescription 13 = ""
             SensorsDescription 14 = ""
-            VoltageDescription.<size(s)> = "4 2"
+            VoltageDescription.<size(s)> = "5 2"
             VoltageDescription 0 = "Keithley: Ch2"
             VoltageDescription 1 = "Pr�flingsspannung [V]"
             VoltageDescription 2 = "Keithley: Ch4"
             VoltageDescription 5 = "Strom [A]"
             VoltageDescription 6 = ""
             VoltageDescription 7 = "Widerstand [mOhm]"
+            VoltageDescription 8 = ""
+            VoltageDescription 9 = "Leistung [W]"
             CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc"
             [Hardware]
             DMM_ContactLimits = "<size(s)=2> 0,0 10,0"
             TemperatureGain = "<size(s)=15> 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000"
             TemperatureOffset = "<size(s)=15> 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000"
-            VoltageGain = "<size(s)=4> 1,000000 1,000000 1,000000 1,000000"
+            VoltageGain = "<size(s)=5> 1,000000 1,000000 1,000000 1,000000 1,000000"
-            VoltageOffset = "<size(s)=4> 0,000000 0,000000 0,000000 0,000000"
+            VoltageOffset = "<size(s)=5> 0,000000 0,000000 0,000000 0,000000 0,000000"
             AllowedContactFails = "2"
             [HSMP1]

CurrentTester [LabVIEW]/Initialization_HSMP2.ini +5 -3

             SensorsDescription 12 = "NI-9219_3: Ch2"
             SensorsDescription 13 = "NI-9219_3: Ch3"
             SensorsDescription 14 = "NI-9219_3: Ch4"
-            VoltageDescription.<size(s)> = "4 2"
+            VoltageDescription.<size(s)> = "5 2"
             VoltageDescription 0 = "NI-9215: Ch1"
             VoltageDescription 1 = "Pr�flingsspannung [V]"
             VoltageDescription 2 = "NI-9215: Ch2"
             VoltageDescription 5 = "Strom [A]"
             VoltageDescription 6 = ""
             VoltageDescription 7 = "Widerstand [mOhm]"
+            VoltageDescription 8 = ""
+            VoltageDescription 9 = "Leistung [W]"
             CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc"
             [Hardware]
             DMM_ContactLimits = "<size(s)=2> 0,000000 10,000000"
             TemperatureGain = "<size(s)=15> 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000"
             TemperatureOffset = "<size(s)=15> 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000"
-            VoltageGain = "<size(s)=4> 1,000000 1,000000 1,000000 1,000000"
+            VoltageGain = "<size(s)=5> 1,000000 1,000000 1,000000 1,000000 1,000000"
-            VoltageOffset = "<size(s)=4> 0,000000 0,000000 0,000000 0,000000"
+            VoltageOffset = "<size(s)=5> 0,000000 0,000000 0,000000 0,000000 0,000000"
             AllowedContactFails = "2"
             [HSMP2]

CurrentTester [LabVIEW]/Initialization_SMP3.ini +5 -3

             SensorsDescription 12 = ""
             SensorsDescription 13 = ""
             SensorsDescription 14 = ""
-            VoltageDescription.<size(s)> = "4 2"
+            VoltageDescription.<size(s)> = "5 2"
             VoltageDescription 0 = "NI PXI-6281: Ch4"
             VoltageDescription 1 = "Pr�flingsspannung [V]"
             VoltageDescription 2 = "NI PXI-6281: Ch5"
             VoltageDescription 5 = "Strom [A]"
             VoltageDescription 6 = ""
             VoltageDescription 7 = "Widerstand [mOhm]"
+            VoltageDescription 8 = ""
+            VoltageDescription 9 = "Leistung [W]"
             CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc"
             [Hardware]
             DMM_ContactLimits = "<size(s)=2> 0,0 1,0"
             TemperatureGain = "<size(s)=15> 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000"
             TemperatureOffset = "<size(s)=15> 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000"
-            VoltageGain = "<size(s)=4> 1,000000 1,000000 1,000000 1,000000"
+            VoltageGain = "<size(s)=5> 1,000000 1,000000 1,000000 1,000000 1,000000"
-            VoltageOffset = "<size(s)=4> 0,000000 0,000000 0,000000 0,000000"
+            VoltageOffset = "<size(s)=5> 0,000000 0,000000 0,000000 0,000000 0,000000"
             AllowedContactFails = "2"
             [SMP3]

CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/PerformMeasurements.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Read_AIs_.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Setup_GetCurrent.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/Create_DVR.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/Delete_DVR.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/Measurements_GetValues.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Close.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi 0 0

NO CONTENT: modified file

CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages