Index: CurrentTester [LabVIEW]/CurrentTester.lvproj =================================================================== diff --git a/CurrentTester [LabVIEW]/CurrentTester.lvproj b/CurrentTester [LabVIEW]/CurrentTester.lvproj --- a/CurrentTester [LabVIEW]/CurrentTester.lvproj (revision 68) +++ b/CurrentTester [LabVIEW]/CurrentTester.lvproj (revision 69) @@ -488,6 +488,7 @@ + @@ -510,6 +511,7 @@ + @@ -571,6 +573,15 @@ + + + + + + + + + @@ -650,6 +661,16 @@ true + + true + + + true + + + true + + =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/CurrentTester.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/CurrentTester.vi b/CurrentTester [LabVIEW]/CurrentTester.vi --- a/CurrentTester [LabVIEW]/CurrentTester.vi (revision 68) +++ b/CurrentTester [LabVIEW]/CurrentTester.vi (revision 69) Index: CurrentTester [LabVIEW]/Initialization.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization.ini b/CurrentTester [LabVIEW]/Initialization.ini --- a/CurrentTester [LabVIEW]/Initialization.ini (revision 68) +++ b/CurrentTester [LabVIEW]/Initialization.ini (revision 69) @@ -1,7 +1,7 @@ [Tester] -TesterType = "SMP3" -TesterName = "Strommessplatz 3" -MaxCurrent = 130 +TesterType = "HSMP2" +TesterName = "Hochstrommessplatz 2" +MaxCurrent = 2000 MaxTemperature = 250 MaxAmbientTemperature = 50 TemperatureWarning- = 10 @@ -14,34 +14,34 @@ SensorsEnable 5 = "True" SensorsEnable 6 = "True" SensorsEnable 7 = "True" -SensorsEnable 8 = "False" -SensorsEnable 9 = "False" +SensorsEnable 8 = "True" +SensorsEnable 9 = "True" SensorsEnable 10 = "False" SensorsEnable 11 = "False" SensorsEnable 12 = "False" SensorsEnable 13 = "False" SensorsEnable 14 = "False" SensorsDescription. = "15" -SensorsDescription 0 = "NI-9210: Ch0" -SensorsDescription 1 = "NI-9210: Ch1" -SensorsDescription 2 = "NI-9210: Ch2" -SensorsDescription 3 = "NI-9210: Ch3" -SensorsDescription 4 = "NI-9219: Ch0" -SensorsDescription 5 = "NI-9219: Ch1" -SensorsDescription 6 = "NI-9219: Ch2" -SensorsDescription 7 = "NI-9219: Ch3" -SensorsDescription 8 = "" -SensorsDescription 9 = "" -SensorsDescription 10 = "" -SensorsDescription 11 = "" -SensorsDescription 12 = "" -SensorsDescription 13 = "" -SensorsDescription 14 = "" +SensorsDescription 0 = "NI-9212: Ch0" +SensorsDescription 1 = "NI-9212: Ch1" +SensorsDescription 2 = "NI-9212: Ch2" +SensorsDescription 3 = "NI-9212: Ch3" +SensorsDescription 4 = "NI-9212: Ch4" +SensorsDescription 5 = "NI-9212: Ch5" +SensorsDescription 6 = "NI-9212: Ch6" +SensorsDescription 7 = "NI-9212: Ch7" +SensorsDescription 8 = "NI-9219_1: Ch0" +SensorsDescription 9 = "NI-9219_1: Ch1" +SensorsDescription 10 = "NI-9219_1: Ch2" +SensorsDescription 11 = "NI-9219_2: Ch0" +SensorsDescription 12 = "NI-9219_2: Ch1" +SensorsDescription 13 = "NI-9219_2: Ch2" +SensorsDescription 14 = "NI-9219_2: Ch3" VoltageDescription. = "5 2" -VoltageDescription 0 = "NI PXI-6281: Ch3" +VoltageDescription 0 = "NI-9215: Ch0" VoltageDescription 1 = "Prüflingsspannung [V]" -VoltageDescription 2 = "NI PXI-6281: Ch4" -VoltageDescription 3 = "Shunt- Spannung [V]" +VoltageDescription 2 = "NI-9219_1: Ch2" +VoltageDescription 3 = "Zero Flux- Spannung [V]" VoltageDescription 4 = "" VoltageDescription 5 = "Strom [A]" VoltageDescription 6 = "" @@ -51,145 +51,235 @@ CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] -SimulateDevices = True -DI_E-Stop = "PXI1Slot5/port0/line5" -DI_Setup = "PXI1Slot5/port0/line4" -PowerSupply_VISAName = "COM4" -PowerSupply_Address = "1" -PowerSupply_Baudrate = "9600" -PowerSupply_OutputVoltage = "5,500000" -PowerSupply_OverVoltageProtection = "6,000000" +SimulateDevices = False +DI_E-Stop = "" +DI_Setup = "" +PowerSupply_VISAName = "TCPIP0::10.1.2.40::30000::SOCKET" +PowerSupply_Address = "0" +PowerSupply_Baudrate = "0" +PowerSupply_OutputVoltage = "10,000000" +PowerSupply_OverVoltageProtection = "9,800000" PowerSupply_MinCurrent = "0" PowerSupply_Check = False -PowerSupply_WarningPower = "200,000000" -PowerSupply_AbortPower = "250,000000" -PowerSupply_PID = "False" -PowerSupply_PID_Time = "0,100000" +PowerSupply_WarningPower = "4000,000000" +PowerSupply_AbortPower = "5000,000000" +PowerSupply_PID = "FALSE" +PowerSupply_PID_Time = "1,000000" PowerSupply_PID_ProportionalGain = "0,100000" PowerSupply_PID_IntegralTime = "0,180000" PowerSupply_PID_DerivativeTime = "0,000000" -AbortCurrentDifference = "50" +AbortCurrentDifference = "0,000000" Measurement_Channels. = "17" -Measurement_Channels 0 = "PXI1Slot5/ai4" -Measurement_Channels 1 = "PXI1Slot5/ai5" -Measurement_Channels 2 = "NI9210/ai0" -Measurement_Channels 3 = "NI9210/ai1" -Measurement_Channels 4 = "NI9210/ai2" -Measurement_Channels 5 = "NI9210/ai3" -Measurement_Channels 6 = "NI9219/ai0" -Measurement_Channels 7 = "NI9219/ai1" -Measurement_Channels 8 = "NI9219/ai2" -Measurement_Channels 9 = "NI9219/ai3" -Measurement_Channels 10 = "" -Measurement_Channels 11 = "" -Measurement_Channels 12 = "" -Measurement_Channels 13 = "" -Measurement_Channels 14 = "" -Measurement_Channels 15 = "" -Measurement_Channels 16 = "" -Measurement_Sample = " 1,000000 1,000000 2,000000 2,000000 2,000000 2,000000 40,000000 40,000000 40,000000 40,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000" -ShuntResistance = 0,001 +Measurement_Channels 0 = "NI9215/ai0" +Measurement_Channels 1 = "NI9219_1/ai2" +Measurement_Channels 2 = "NI9212/ai0" +Measurement_Channels 3 = "NI9212/ai1" +Measurement_Channels 4 = "NI9212/ai2" +Measurement_Channels 5 = "NI9212/ai3" +Measurement_Channels 6 = "NI9212/ai4" +Measurement_Channels 7 = "NI9212/ai5" +Measurement_Channels 8 = "NI9212/ai6" +Measurement_Channels 9 = "NI9212/ai7" +Measurement_Channels 10 = "NI9219_1/ai0" +Measurement_Channels 11 = "NI9219_1/ai1" +Measurement_Channels 12 = "NI9219_1/ai2" +Measurement_Channels 13 = "NI9219_2/ai0" +Measurement_Channels 14 = "NI9219_2/ai1" +Measurement_Channels 15 = "NI9219_2/ai2" +Measurement_Channels 16 = "NI9219_2/ai3" +Measurement_Sample = " 40,000000 40,000000 2,000000 2,000000 2,000000 2,000000 2,000000 2,000000 2,000000 2,000000 40,000000 40,000000 40,000000 40,000000 40,000000 40,000000 40,000000" +ShuntResistance = "0,005" Measurement_Check = False Measurement_Delay = "1" -DMM_VISAName = "PXI1Slot3" -DMM_ContactLimits = " 0,0 1,0" +DMM_VISAName = "NI9219_1/ai3" +DMM_ContactLimits = " -1,000000 1,000000" TemperatureGain = " 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 = " 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 = " 1,000000 1,000000 1,000000 1,000000 1,000000" +VoltageGain = " 1,000000 -1,000000 1,000000 1,000000 1,000000" VoltageOffset = " 0,000000 0,000000 0,000000 0,000000 0,000000" AllowedContactFails = "2" -[SMP3] -DMM_Function = "2-wire Resistance" -DMM_AutoRange = False -DMM_Range = "0,020000" -DMM_Resolution = "0,001000" +[HSMP2] +DMM_Configuration.Maximum = "10500,000000" +DMM_Configuration.Minimum = "0,000000" +DMM_Configuration.Configuration = "4-Wire" +DMM_Configuration.CurrentExcitationSource = "Internal" +DMM_Configuration.CurrentExcitationValue = "0,000500" +DMM_Sample = "40,000000" Configuration_AI_Voltage. = "2" -Configuration_AI_Voltage 0.Maximum = "5,000000" -Configuration_AI_Voltage 0.Minimum = "-5,000000" +Configuration_AI_Voltage 0.Maximum = "10,000000" +Configuration_AI_Voltage 0.Minimum = "-10,000000" Configuration_AI_Voltage 0.InputTerminalConfiguration = "Differential" -Configuration_AI_Voltage 1.Maximum = "1,000000" -Configuration_AI_Voltage 1.Minimum = "-1,000000" +Configuration_AI_Voltage 1.Maximum = "10,000000" +Configuration_AI_Voltage 1.Minimum = "0,000000" Configuration_AI_Voltage 1.InputTerminalConfiguration = "Differential" -Configuration_AI_Thermocouple. = "8" +Configuration_AI_Thermocouple. = "15" Configuration_AI_Thermocouple 0.Maximum = "250,000000" -Configuration_AI_Thermocouple 0.Minimum = "-200,000000" +Configuration_AI_Thermocouple 0.Minimum = "0,000000" Configuration_AI_Thermocouple 0.Type = "K" Configuration_AI_Thermocouple 0.CJC_Source = "Built-In" 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.Minimum = "0,000000" Configuration_AI_Thermocouple 1.Type = "K" 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_Thermocouple 2.Minimum = "-200,000000" +Configuration_AI_Thermocouple 2.Minimum = "0,000000" Configuration_AI_Thermocouple 2.Type = "K" Configuration_AI_Thermocouple 2.CJC_Source = "Built-In" Configuration_AI_Thermocouple 2.CJC_Value = "25,000000" Configuration_AI_Thermocouple 3.Maximum = "250,000000" -Configuration_AI_Thermocouple 3.Minimum = "-200,000000" +Configuration_AI_Thermocouple 3.Minimum = "0,000000" Configuration_AI_Thermocouple 3.Type = "K" Configuration_AI_Thermocouple 3.CJC_Source = "Built-In" Configuration_AI_Thermocouple 3.CJC_Value = "10,000000" Configuration_AI_Thermocouple 4.Maximum = "250,000000" -Configuration_AI_Thermocouple 4.Minimum = "-200,000000" +Configuration_AI_Thermocouple 4.Minimum = "0,000000" Configuration_AI_Thermocouple 4.Type = "K" Configuration_AI_Thermocouple 4.CJC_Source = "Built-In" Configuration_AI_Thermocouple 4.CJC_Value = "25,000000" Configuration_AI_Thermocouple 5.Maximum = "250,000000" -Configuration_AI_Thermocouple 5.Minimum = "-200,000000" +Configuration_AI_Thermocouple 5.Minimum = "0,000000" Configuration_AI_Thermocouple 5.Type = "K" Configuration_AI_Thermocouple 5.CJC_Source = "Built-In" Configuration_AI_Thermocouple 5.CJC_Value = "25,000000" Configuration_AI_Thermocouple 6.Maximum = "250,000000" -Configuration_AI_Thermocouple 6.Minimum = "-200,000000" +Configuration_AI_Thermocouple 6.Minimum = "0,000000" Configuration_AI_Thermocouple 6.Type = "K" Configuration_AI_Thermocouple 6.CJC_Source = "Built-In" Configuration_AI_Thermocouple 6.CJC_Value = "25,000000" Configuration_AI_Thermocouple 7.Maximum = "250,000000" -Configuration_AI_Thermocouple 7.Minimum = "-200,000000" +Configuration_AI_Thermocouple 7.Minimum = "0,000000" Configuration_AI_Thermocouple 7.Type = "K" Configuration_AI_Thermocouple 7.CJC_Source = "Built-In" Configuration_AI_Thermocouple 7.CJC_Value = "25,000000" -Configuration_AI_NI9219_Resistance. = "4" -Configuration_AI_NI9219_Resistance 0.Maximum = "10500,000000" +Configuration_AI_Thermocouple 8.Maximum = "250,000000" +Configuration_AI_Thermocouple 8.Minimum = "0,000000" +Configuration_AI_Thermocouple 8.Type = "K" +Configuration_AI_Thermocouple 8.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 8.CJC_Value = "25,000000" +Configuration_AI_Thermocouple 9.Maximum = "250,000000" +Configuration_AI_Thermocouple 9.Minimum = "0,000000" +Configuration_AI_Thermocouple 9.Type = "K" +Configuration_AI_Thermocouple 9.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 9.CJC_Value = "25,000000" +Configuration_AI_Thermocouple 10.Maximum = "250,000000" +Configuration_AI_Thermocouple 10.Minimum = "0,000000" +Configuration_AI_Thermocouple 10.Type = "K" +Configuration_AI_Thermocouple 10.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 10.CJC_Value = "25,000000" +Configuration_AI_Thermocouple 11.Maximum = "250,000000" +Configuration_AI_Thermocouple 11.Minimum = "-200,000000" +Configuration_AI_Thermocouple 11.Type = "K" +Configuration_AI_Thermocouple 11.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 11.CJC_Value = "25,000000" +Configuration_AI_Thermocouple 12.Maximum = "250,000000" +Configuration_AI_Thermocouple 12.Minimum = "-200,000000" +Configuration_AI_Thermocouple 12.Type = "K" +Configuration_AI_Thermocouple 12.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 12.CJC_Value = "25,000000" +Configuration_AI_Thermocouple 13.Maximum = "250,000000" +Configuration_AI_Thermocouple 13.Minimum = "-200,000000" +Configuration_AI_Thermocouple 13.Type = "K" +Configuration_AI_Thermocouple 13.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 13.CJC_Value = "10,000000" +Configuration_AI_Thermocouple 14.Maximum = "250,000000" +Configuration_AI_Thermocouple 14.Minimum = "-200,000000" +Configuration_AI_Thermocouple 14.Type = "K" +Configuration_AI_Thermocouple 14.CJC_Source = "Built-In" +Configuration_AI_Thermocouple 14.CJC_Value = "25,000000" +Configuration_AI_NI9219_Resistance. = "7" +Configuration_AI_NI9219_Resistance 0.Maximum = "800,000000" Configuration_AI_NI9219_Resistance 0.Minimum = "0,000000" -Configuration_AI_NI9219_Resistance 0.Configuration = "2-Wire" +Configuration_AI_NI9219_Resistance 0.Configuration = "4-Wire" Configuration_AI_NI9219_Resistance 0.CurrentExcitationSource = "Internal" Configuration_AI_NI9219_Resistance 0.CurrentExcitationValue = "0,000500" Configuration_AI_NI9219_Resistance 0.RTD_Type = "Pt3750" Configuration_AI_NI9219_Resistance 0.R0 = "1000,000000" -Configuration_AI_NI9219_Resistance 0.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" +Configuration_AI_NI9219_Resistance 0.ABC = " 1,224E-3 2,31E-4 3,938074E-9" Configuration_AI_NI9219_Resistance 1.Maximum = "250,000000" -Configuration_AI_NI9219_Resistance 1.Minimum = "-200,000000" +Configuration_AI_NI9219_Resistance 1.Minimum = "0,000000" Configuration_AI_NI9219_Resistance 1.Configuration = "2-Wire" Configuration_AI_NI9219_Resistance 1.CurrentExcitationSource = "Internal" Configuration_AI_NI9219_Resistance 1.CurrentExcitationValue = "0,000500" Configuration_AI_NI9219_Resistance 1.RTD_Type = "Pt3750" Configuration_AI_NI9219_Resistance 1.R0 = "1000,000000" -Configuration_AI_NI9219_Resistance 1.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" +Configuration_AI_NI9219_Resistance 1.ABC = " 1,224E-3 2,31E-4 3,938074E-9" Configuration_AI_NI9219_Resistance 2.Maximum = "250,000000" -Configuration_AI_NI9219_Resistance 2.Minimum = "-200,000000" +Configuration_AI_NI9219_Resistance 2.Minimum = "0,000000" Configuration_AI_NI9219_Resistance 2.Configuration = "2-Wire" Configuration_AI_NI9219_Resistance 2.CurrentExcitationSource = "Internal" Configuration_AI_NI9219_Resistance 2.CurrentExcitationValue = "0,000500" Configuration_AI_NI9219_Resistance 2.RTD_Type = "Pt3750" Configuration_AI_NI9219_Resistance 2.R0 = "1000,000000" -Configuration_AI_NI9219_Resistance 2.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" +Configuration_AI_NI9219_Resistance 2.ABC = " 3,81E-3 -6,02E-7 -6E-12" Configuration_AI_NI9219_Resistance 3.Maximum = "250,000000" -Configuration_AI_NI9219_Resistance 3.Minimum = "-200,000000" +Configuration_AI_NI9219_Resistance 3.Minimum = "0,000000" Configuration_AI_NI9219_Resistance 3.Configuration = "2-Wire" Configuration_AI_NI9219_Resistance 3.CurrentExcitationSource = "Internal" Configuration_AI_NI9219_Resistance 3.CurrentExcitationValue = "0,000500" Configuration_AI_NI9219_Resistance 3.RTD_Type = "Pt3750" Configuration_AI_NI9219_Resistance 3.R0 = "1000,000000" Configuration_AI_NI9219_Resistance 3.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" -Configuration_AI_NI9219_Type. = "4" -Configuration_AI_NI9219_Type 0 = "Thermocouple" -Configuration_AI_NI9219_Type 1 = "Thermocouple" +Configuration_AI_NI9219_Resistance 4.Maximum = "10500,000000" +Configuration_AI_NI9219_Resistance 4.Minimum = "0,000000" +Configuration_AI_NI9219_Resistance 4.Configuration = "2-Wire" +Configuration_AI_NI9219_Resistance 4.CurrentExcitationSource = "Internal" +Configuration_AI_NI9219_Resistance 4.CurrentExcitationValue = "0,000500" +Configuration_AI_NI9219_Resistance 4.RTD_Type = "Pt3750" +Configuration_AI_NI9219_Resistance 4.R0 = "1000,000000" +Configuration_AI_NI9219_Resistance 4.ABC = " 0,001224 0,000231 3,938074E-9" +Configuration_AI_NI9219_Resistance 5.Maximum = "250,000000" +Configuration_AI_NI9219_Resistance 5.Minimum = "0,000000" +Configuration_AI_NI9219_Resistance 5.Configuration = "2-Wire" +Configuration_AI_NI9219_Resistance 5.CurrentExcitationSource = "Internal" +Configuration_AI_NI9219_Resistance 5.CurrentExcitationValue = "0,000500" +Configuration_AI_NI9219_Resistance 5.RTD_Type = "Pt3750" +Configuration_AI_NI9219_Resistance 5.R0 = "1000,000000" +Configuration_AI_NI9219_Resistance 5.ABC = " 0,001224 0,000231 3,938074E-9" +Configuration_AI_NI9219_Resistance 6.Maximum = "250,000000" +Configuration_AI_NI9219_Resistance 6.Minimum = "0,000000" +Configuration_AI_NI9219_Resistance 6.Configuration = "2-Wire" +Configuration_AI_NI9219_Resistance 6.CurrentExcitationSource = "Internal" +Configuration_AI_NI9219_Resistance 6.CurrentExcitationValue = "0,000500" +Configuration_AI_NI9219_Resistance 6.RTD_Type = "Pt3750" +Configuration_AI_NI9219_Resistance 6.R0 = "1000,000000" +Configuration_AI_NI9219_Resistance 6.ABC = " 0,003810 -6,020000E-7 -6,000000E-12" +Configuration_AI_NI9219_Type. = "7" +Configuration_AI_NI9219_Type 0 = "RTD" +Configuration_AI_NI9219_Type 1 = "Resistance_Thermistor" Configuration_AI_NI9219_Type 2 = "Thermocouple" -Configuration_AI_NI9219_Type 3 = "Thermocouple" +Configuration_AI_NI9219_Type 3 = "Resistance_RTD" +Configuration_AI_NI9219_Type 4 = "Resistance_RTD" +Configuration_AI_NI9219_Type 5 = "Resistance_RTD" +Configuration_AI_NI9219_Type 6 = "Resistance_RTD" +POS_Config.IP = "10.1.2.1" +POS_Config.Port = "502" +POS_AxesNames. = "3" +POS_AxesNames 0 = "X" +POS_AxesNames 1 = "Y" +POS_AxesNames 2 = "Z" +POS_Reference_Axes = " 1,000000 1,000000 308,000000" +POS_Limits_Axis1 = " 0 155" +POS_Limits_Axis2 = " 0 303" +POS_Limits_Axis3 = " 0 309" +POS_AxesFlipped. = "3" +POS_AxesFlipped 0 = "True" +POS_AxesFlipped 1 = "True" +POS_AxesFlipped 2 = "False" +Pos_MaxVelocity = "300" +Pos_MaxAcceleration = "15000" +Pos_MaxJerk = "140000" +Pos_DO_E-Stop_Index = "0" +Pos_DO_Setup_Index = "2" +ForceLimit_Axis3 = " 0,000000" +ForceLimit_Axis3_Text. = "1" +ForceLimit_Axis3_Text 0 = "" +ForceLimit_Axis3_AO_Limits = " 0,000000 100,000000" +ForceLimit_AI_Index = "0" +AirCooling_AI_Index = "1" +AirCooling_AO_Index = "0" [DefaultValues] WorkingStroke = "0" @@ -202,7 +292,7 @@ Sensors+ 0 = "True" Sensors+ 1 = "True" Sensors+ 2 = "True" -Sensors+ 3 = "True" +Sensors+ 3 = "False" Sensors+ 4 = "False" Sensors+ 5 = "False" Sensors+ 6 = "False" @@ -240,7 +330,7 @@ [Pathes] User = "C:\Work\CurrentTester\support\User.txt" -ReportsFolder = "C:\Work\CurrentTester\support\ResultData_SMP3" +ReportsFolder = "C:\Work\CurrentTester\support\ResultData_HSMP2" ProtocolsFolder = "\\orion\G K S - Test1\01_Access\Anlagen" CurrentProfilesFolder = "\\orion\labview\CurrentTester\support\CurrentProfiles" Applicants = "C:\Work\CurrentTester\support\Applicants.txt" @@ -262,12 +352,12 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "26" +Info. = "32" Info 0 = "Aktivierter Not-Halt oder eine Tür steht offen! Ein Teststart ist nicht möglich" Info 1 = "Zum Anlegen eines neuen Tests "Neuer Test" klicken" Info 2 = "Grunddaten anlegen oder bestehenden Test öffnen" Info 3 = "Testdaten anlegen" -Info 4 = "Der Schlüsselschalter muss in die Position "Einrichten" gebracht werden um die Einrichtbuttons zu aktivieren oder in die Position "Automatik" um den Test starten zu können oder den Strom manuell einzustellen!" +Info 4 = "Zur manuellen Stromeinstellung sollte die Schutztürenfreigabe aufgehoben werden, zum Verfahren der Achsen sollte der Automatikbetrieb der Anlagensteuerung aktiviert werden!" Info 5 = "Test geladen" Info 6 = "Laufende Prüfung..." Info 7 = "Prüfung erfolgreich abgeschlossen" @@ -289,7 +379,13 @@ Info 23 = "Testbericht erstellt" Info 24 = "Test ist gespeichert" Info 25 = "Testdaten werden geändert... Bitte warten" -Result. = "26" +Info 26 = "Achsen werden initialisiert..." +Info 27 = "Referenzfahrt läuft..." +Info 28 = "X-Achse wird referenziert..." +Info 29 = "Y-Achse wird referenziert..." +Info 30 = "Z-Achse wird referenziert..." +Info 31 = "Position wird angefahren..." +Result. = "32" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -316,6 +412,12 @@ Result 23 = "Bereit" Result 24 = "Bereit" Result 25 = "Bereit" +Result 26 = "" +Result 27 = "Einrichtbetrieb" +Result 28 = "Einrichtbetrieb" +Result 29 = "Einrichtbetrieb" +Result 30 = "Einrichtbetrieb" +Result 31 = "Einrichtbetrieb" [DialogMessages] Messages. = "13" Index: CurrentTester [LabVIEW]/Initialization_HSMP1.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization_HSMP1.ini b/CurrentTester [LabVIEW]/Initialization_HSMP1.ini --- a/CurrentTester [LabVIEW]/Initialization_HSMP1.ini (revision 68) +++ b/CurrentTester [LabVIEW]/Initialization_HSMP1.ini (revision 69) @@ -90,7 +90,7 @@ Measurement_Sample = " 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000" ShuntResistance = 0,00006 Measurement_Check = False -Measurement_Delay = "1" +Measurement_Delay = "3" DMM_VISAName = "COM1" DMM_ContactLimits = " 0,0 10,0" TemperatureGain = " 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" =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eButtonsState.ctl =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eButtonsState.ctl b/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eButtonsState.ctl --- a/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eButtonsState.ctl (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eButtonsState.ctl (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ChangeTestData.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ChangeTestData.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ChangeTestData.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ChangeTestData.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ChangeTestData.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraph.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraph.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraph.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraph.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraph.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraphCurves_Protocol.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraphCurves_Protocol.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraphCurves_Protocol.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraphCurves_Protocol.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraphCurves_Protocol.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_AddGraph.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_AddGraph.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_AddGraph.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_AddGraph.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_AddGraph.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_TableCustomFormatting.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_TableCustomFormatting.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_TableCustomFormatting.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_TableCustomFormatting.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_TableCustomFormatting.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Read_AIs_.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Read_AIs_.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Read_AIs_.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Read_AIs_.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Read_AIs_.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/SaveNotepad.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/SaveNotepad.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/SaveNotepad.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/SaveNotepad.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/SaveNotepad.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvButtons.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvButtons.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvButtons.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvButtons.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvButtons.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/DisplayResults.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/DisplayResults.vi b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/DisplayResults.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/DisplayResults.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/DisplayResults.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_BasicData.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_BasicData.vi b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_BasicData.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_BasicData.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_BasicData.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi (revision 69) Index: CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass b/CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass --- a/CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass (revision 68) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass (revision 69) @@ -1210,7 +1210,7 @@ - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!*P!!!!$Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"R!)2>5:8.U5G6T>7RU=URP972F:#^797RV:1!%!#%!(%"Q!!A!!1!'!!A!!!V4>'&S>&.U<X!A5G6G!#"!1!!"`````Q!(%V.X;82D;#"#>82U<WZT)&*F:H-!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!"*!=!!)!!!!#!!!"&&V;81!!"J!1!!"`````Q!+$%*V>(2P<H-A5G6G=Q!"&Q$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T%76#>82U<WZT5X2B>'5O9X2M!/&!&A!2"6*F=W6U"6.U98*U%%*B=WFD2'&U95VJ=X.J<G=06'6T>%2B>'&.;8.T;7ZH#V2F=X2"<'RP>W6E%ENF?6.X;82D;%&V>'^N982J9R",:8F4>WFU9WB4:82U;7ZH#F2F=X2-<W&E:71,6'6T>&*V<GZJ<G=*6'6T>%6O:'6E"56S=G^S#F2F=X2'97FM:71'23V4>'^Q$E5N5X2P=&*F<'6B=W6E"EVP>GFO:QZ3:8"P=H2$=G6B>'FO:QN3:8"P=H23:7&E?1!!$76#>82U<WZT5X2B>'5!(5!7!!)%37ZJ>!68=GFU:1!!#5^Q:8*B>'FP<A"5!0!!$!!$!!1!"!!%!!1!"!!&!!A!#1!,!!Q!$1-!!(A!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!A!!!))!!!!#A!!!AA!!!!)!!!!#!!!!!!"!!Y!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!*Z!!!!$Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"R!)2>5:8.U5G6T>7RU=URP972F:#^797RV:1!%!#%!(%"Q!!A!!1!'!!A!!!V4>'&S>&.U<X!A5G6G!#"!1!!"`````Q!(%V.X;82D;#"#>82U<WZT)&*F:H-!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!"*!=!!)!!!!#!!!"&&V;81!!"J!1!!"`````Q!+$%*V>(2P<H-A5G6G=Q!")1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T%76#>82U<WZT5X2B>'5O9X2M!/N!&A!3"6*F=W6U"6.U98*U%%*B=WFD2'&U95VJ=X.J<G=06'6T>%2B>'&.;8.T;7ZH#V2F=X2"<'RP>W6E%ENF?6.X;82D;%&V>'^N982J9R",:8F4>WFU9WB4:82U;7ZH#F2F=X2-<W&E:71,6'6T>&*V<GZJ<G=*6'6T>%6O:'6E"56S=G^S#F2F=X2'97FM:71'23V4>'^Q$E5N5X2P=&*F<'6B=W6E"EVP>GFO:QZ3:8"P=H2$=G6B>'FO:QN3:8"P=H23:7&E?1F.<X:F5G6B:(E!!!VF1H6U>'^O=V.U982F!"V!&A!#"%FO;81&6X*J>'5!!!F0='6S982J<WY!6!$Q!!Q!!Q!%!!1!"!!%!!1!"1!)!!E!#Q!-!!U$!!"Y!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!##!!!!!I!!!))!!!!#!!!!!A!!!!!!1!/!!!!!! -1 0 true @@ -2217,13 +2217,13 @@ 1342710288 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3I!!!!-1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!5!#A!!$!"!!!(`````!!5!"U!+!!&9!!Q!1!!"`````Q!(!!I!5!!#!!9!#!!31%!!!@````]!#16(=G&Q;!!+1#%%37ZJ>!!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!-1#%'2W6S<7&O!!!11$$`````"F2F=X2*2!!!%E!Q`````QF4>7*G<WRE:8)!$E!Q`````Q26=W6S!!!/1$$`````"%ZB<75!!""!-0````](1W^N<76O>!!51$$`````#E.P<7VF<H2@25Y!!""!-0````]'5X2S;7ZH!!!A1%!!!@````]!&"*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!5&62F<8"F=G&U>8*F5W6O=W^S=V^&4A!-1#%'5G6Q<X*U!!!/1#%*5G6Q<X*U8U6/!'-!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R*D6'6T>%*B=WFD2'&U93ZD>'Q!,%"1!!I!$A!0!"!!%1!3!"-!&1!7!"=!'!V5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!"M/47&Y6'6N='6S982V=G5!!"6!#A!0476B=X6S:7VF<H25;7VF!"6!#A!/4G^N;7ZB<%.V=H*F<H1!!"R!1!!"`````Q!<$E2V=G&U;7^O6G&M>76T!!!;1%!!!@````]!'QV$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!"M/5(*F=X.V=G6797RV:8-!!'E!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R:D1X6S=G6O>&2F=X2$<WZG;7=O9X2M!#Z!5!!*!"I!(!!>!"Y!(Q!A!#%!)A!D%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!'QN5:8.U5G6T>7RU=Q!+!&!!!A!&!!5!&%"!!!(`````!#9'4'FN;82T!!">!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59V"S<X2P9W^M5G6T>7RU=SZD>'Q!*%"1!!1!'1!E!#5!*R"D5(*P>'^D<WR3:8.V<(2T!!!51%!!!@````]!+!>3:8.V<(2T!":!1!!"`````Q!5#6"M<X2/97VF=Q!61!-!$E.V=H:F5W6M:7.U;7^O!!!91&!!"!!J!#I!+Q!2#%FO;82%982B!!!+!&!!!A!)!!A!$!"!!!(`````!#U!&E"Q!!A!!1!O!&-!!!:$>8*W:8-!!&1!]!!-!!-!"!!+!!1!"!!%!!1!#Q!-!!U!,!!P!Q!!?!!!$1A!!!!!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!!3!!!!#!!!!"!!!!!3!!!!!!%!-!!!!!! - -1 - 0 - true - 1 - 1 - 1350574608 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3Y!!!!-A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!%%!Q`````Q:4>(*J<G=!!":!1!!"`````Q!%#6"M<X2/97VF=Q!&!!I!!!Z!1!!"`````Q!'!6A!"U!+!!&9!!Z!1!!"`````Q!)!6E!#A"1!!)!"Q!*!"*!1!!"`````Q!+"5>S98"I!!1!!!!+1#%%37ZJ>!!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!-1#%'2W6S<7&O!!!11$$`````"F2F=X2*2!!!%E!Q`````QF4>7*G<WRE:8)!$E!Q`````Q26=W6S!!!/1$$`````"%ZB<75!!""!-0````](1W^N<76O>!!51$$`````#E.P<7VF<H2@25Y!!#"!1!!"`````Q!%%F2F<8"F=G&U>8*F5W6O=W^S=Q!!)E"!!!(`````!!166'6N='6S982V=G64:7ZT<X*T8U6/!!R!)1:3:8"P=H1!!!Z!)1F3:8"P=H2@25Y!9Q$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T%G.5:8.U1G&T;7.%982B,G.U<!!M1&!!#A!1!"%!%A!4!"1!&1!7!"=!'!!:$62F=X2#98.J9U2B>'%!%U!+!!V8<X*L;7ZH5X2S<WNF!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!(!Z.98B5:7VQ:8*B>(6S:1!!&5!+!!^.:7&T>8*F<76O>&2J<75!&5!+!!Z/<WVJ<G&M1X6S=G6O>!!!(%"!!!(`````!"Q/2(6S982J<WZ797RV:8-!!"J!1!!"`````Q!=$5.V=H*F<H2797RV:8-!%E!B$&2B9GRF1W^O>(*P<!!!&U!'!""";8*$<W^M;7ZH4X"U;7^O!!!=1%!!!@````]!(!Z1=G6T=X6S:6:B<(6F=Q!!;1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&G.$>8*S:7ZU6'6T>%.P<G:J:SZD>'Q!,E"1!!E!'Q!>!"Y!(Q!A!#%!)A!D!#121X6S=G6O>&2F=X2$<WZG;7=!(%"!!!,``````````Q!=#V2F=X23:8.V<(2T!!I!5!!#!!9!"A!51%!!!@````]!*Q:-;7VJ>(-!!&U!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R2D5(*P>'^D<WR3:8.V<(2T,G.U<!!E1&!!"!!;!#5!*A!I%'.1=G^U<W.P<&*F=X6M>(-!!"2!1!!"`````Q!J"V*F=X6M>(-!&5!$!!Z$>8*W:6.F<'6D>'FP<A!!'%"1!!1!+A!&!#M!%QB*<GFU2'&U91!!$!"!!!(`````!!A!#A"1!!)!,1!N!!Q!1!!"`````Q!O!":!=!!)!!%!,Q"4!!!'1X6S>G6T!!"5!0!!$!!$!!5!#Q!-!!Q!$!!-!!U!$A!0!#Q!-!-!!(A!!!U)!!!*!!!!#1!!!!!!!!!!!!!!!!!!!!!!!!!1!!!!%A!!!!A!!!!1!!!!#A!!!!!"!$%!!!!! + -1 + 0 + true + 1 + 1 + 1342710289 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!"5+!!!!IA!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!$"!=!!?!!!>'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=Q!*1WRB=X-A4X6U!$"!=!!?!!!>'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=Q!)1WRB=X-A37Y!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!:Q$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T$W.5:8.U:8*5?8"F,G.U<!!T1"=!"!2446!T"5B446!R"5B446!S#E6W97RV982J<WY!#F2F=X2F=F2Z='5!!"2!-0````]+6'6T>'6S4G&N:1!!%5!+!!J.98B$>8*S:7ZU!!!61!I!$EVB?&2F<8"F=G&U>8*F!!!<1!I!&5VB?%&N9GFF<H25:7VQ:8*B>(6S:1!:1!I!%V2F<8"F=G&U>8*F6W&S<GFO:SU!"!!B!"J!1!!"`````Q!/$6.F<H.P=H.&<G&C<'5!%%!Q`````Q:4>(*J<G=!!#"!1!!"`````Q!1%F.F<H.P=H.%:8.D=GFQ>'FP<A!!*%"!!!,``````````Q!1%F:P<(2B:W6%:8.D=GFQ>'FP<A!!(%!Q`````R.$97RJ9H*B>'FP<F"B=X.X<X*E!&9!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=QND6'6T>'6S,G.U<!!G1&!!#A!)!!E!#A!,!!Q!$1!0!"%!%A!4"F2F=X2F=A!!&%!B$V.J<86M982F2'6W;7.F=Q!31$$`````#52*8U5N5X2P=!!31$$`````#%2*8V.F>(6Q!!!?1$$`````&&"P>W6S5X6Q='RZ8V:*5U&/97VF!!!:1!)!%V"P>W6S5X6Q='RZ8U&E:(*F=X-!'U!(!"21<X>F=F.V=("M?6^#986E=G&U:1!!(U!+!"F1<X>F=F.V=("M?6^0>82Q>827<WRU97>F!#>!#A!B5'^X:8*4>8"Q<(F@4X:F=F:P<(2B:W61=G^U:7.U;7^O!"V!#A!75'^X:8*4>8"Q<(F@47FO1X6S=G6O>!!!&E!B%6"P>W6S5X6Q='RZ8U.I:7.L!"^!#A!95'^X:8*4>8"Q<(F@6W&S<GFO:V"P>W6S!!!>1!I!&F"P>W6S5X6Q='RZ8U&C<X*U5'^X:8)!!"2!)1^1<X>F=F.V=("M?6^1351!'U!+!"21<X>F=F.V=("M?6^1352@6'FN:1!!*U!+!#"1<X>F=F.V=("M?6^1352@5(*P='^S>'FP<G&M2W&J<A!!)U!+!"R1<X>F=F.V=("M?6^1352@37ZU:7>S97R5;7VF!!!F1!I!(F"P>W6S5X6Q='RZ8V"*2&^%:8*J>G&U;8:F6'FN:1!!(5!+!":"9G^S>%.V=H*F<H2%;7:G:8*F<G.F!!!)!$$`````!#*!1!!"`````Q!H&%VF98.V=G6N:7ZU8U.I97ZO:7RT!!!.1!I!"UZV<76S;7-!)%"!!!(`````!#E3476B=X6S:7VF<H2@5W&N='RF!!!61!I!$V.I>7ZU5G6T;8.U97ZD:1!71#%2476B=X6S:7VF<H2@1WBF9WM!&U!+!"&.:7&T>8*F<76O>&^%:7RB?1!71$$`````$%2.46^736."4G&N:1!!(E"!!!(`````!#E22%V.8U.P<H2B9X2-;7VJ>(-!(%"!!!(`````!#E06'6N='6S982V=G6(97FO!"Z!1!!"`````Q!J%62F<8"F=G&U>8*F4W:G=W6U!"B!1!!"`````Q!J#V:P<(2B:W6(97FO!"J!1!!"`````Q!J$6:P<(2B:W60:G:T:81!'5!$!"."<'RP>W6E1W^O>'&D>%:B;7RT!))!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=QVD3'&S:(>B=G5O9X2M!&"!5!!?!"5!&A!8!"A!'1!;!"M!(!!>!"Y!(Q!A!#%!)A!D!#1!*1!G!#A!+A!L!#Q!,1!O!#]!-!!R!$)!-Q!U#%BB=G2X98*F!!$/!0%!!!!!!!!!!2*O;52.43"'>7ZD>'FP<CZD>'Q!MU!7!!U)2%-A6G^M>(-)15-A6G^M>(-+2%-A1X6S=G6O>!J"1S"$>8*S:7ZU%4)N>WFS:3"3:8.J=X2B<G.F%41N>WFS:3"3:8.J=X2B<G.F"52J<W2F#5:S:8&V:7ZD?1:1:8*J<W1415-A6G^M>(-A2%-A1W^V='RF:!N$98"B9WFU97ZD:1J*<G2V9X2B<G.F#V2F<8"F=G&U>8*F!!R%45V@2H6O9X2J<WY!!"*!)1V%45V@186U<V*B<G>F!!^!#A!*2%V.8V*B<G>F!"6!#A!/2%V.8V*F=W^M>82J<WY!!!V!#A!(47&Y;7VV<1!.1!I!"UVJ<GFN>7U!*%!Q`````RJ*<H"V>&2F=GVJ<G&M1W^O:GFH>8*B>'FP<A!!$!"1!!-!/A!\!$Q!*E"!!!(`````!$U91W^O:GFH>8*B>'FP<F^"36^7<WRU97>F!!!/1$$`````"&2Z='5!!"2!-0````]+1UJ$8V.P>8*D:1!!$U!+!!F$3E.@6G&M>75!%!"1!!5!/A!\!$]!1!""!#J!1!!"`````Q"#(5.P<G:J:X6S982J<WZ@15F@6'BF=GVP9W^V='RF!":!-0````].1W^O:GFH>8*B>'FP<A!A1$$`````&U.V=H*F<H2&?'.J>'&U;7^O5W^V=G.F!"V!#A!71X6S=G6O>%6Y9WFU982J<WZ797RV:1!!%E!Q`````QB36%2@6(FQ:1!!#5!+!!*3-!!!%%"!!!(`````!#E$15*$!#2!5!!)!$I!/Q"%!%5!2A"(!%A!31V"36^3:8.J=X2B<G.F!$"!1!!"`````Q"+)E.P<G:J:X6S982J<WZ@15F@4EEZ-D%Z8V*F=WFT>'&O9W5!!)1!]1!!!!!!!!!#%'RJ9F^%16&N?#ZM>GRJ9H!,:5&*6(FQ:3ZD>'Q!8Q!7!!=(6G^M>'&H:1R5;'6S<7^D<X6Q<'5+5G6T;8.U97ZD:1Z3:8.J=X2B<G.F8V*52"63:8.J=X2B<G.F8V2I:8*N;8.U<X)$5F2%#F2I:8*N;8.U<X)!!#J!1!!"`````Q"-(%.P<G:J:X6S982J<WZ@15F@4EEZ-D%Z8V2Z='5!!%5!]1!!!!!!!!!#%G.M98.T8V..5$-O<(:D<'&T=QFD5UV1-SZD>'Q!)%"1!!A!.A!X!$A!/1!_!%-!3Q"."&..5$-!!".!"Q!-2%V.8U*B>72S982F!!!M1%!!!@````]!$BZ.:7&T>8*F<76O>&^$;'&O<G6M=V^">82P5G&O:W5!!!5!#A!!+%"!!!(`````!&%;476B=X6S:7VF<H2@1WBB<GZF<(.@5G&O:W5!!"=!&A!%!T-O.1-U,D5$.3YV!T9O.1!!,%"!!!(`````!&-@476B=X6S:7VF<H2@1WBB<GZF<(.@5G6T<WRV>'FP<A$4!0%!!!!!!!!!!BVD<'&T=V^,:7FU;'RF?4)X.4"%45UO<(:D<'&T=RFF3W6J>'BM:8ES.T5Q2H6O9X2J<WYO9X2M!*.!&A!+#E2$)&:P<(2B:W5+15-A6G^M>'&H:1J%1S"$>8*S:7ZU#E&$)%.V=H*F<H1+5G6T;8.U97ZD:22'<X6S,6>J=G5A5G6T;8.U97ZD:1N5:7VQ:8*B>(6S:1F'=G6R>76O9XE'5'6S;7^E#E.P<H2J<H6J>(E!%V*F=WFT>'&O9W6@2H6O9X2J<WY!)E!B(6*F=WFT>'&O9W6@4W:G=W6U1W^N='6O=W&U;7^O!$J!.`````]!$C%!A!!!!!!"!!1!!!!"!!!!!!!!'F2B9GRF1W^O>(*P<&^0>82@4'FG>&2B9GRF!!!Y1$@`````!!YB!)!!!!!!!1!%!!!!!1!!!!!!!"B/36^65U)W-D5S8U^V>&^-;7:U6'&C<'5!!#J!1!!"`````Q"9(&2B9GRF1W^O>(*P<&^0>82@5W6U>'FO:UVP:'5!!%=!]1!!!!!!!!!#%W.M98.T8UB446!R,GRW9WRB=X-+9UB446!R,G.U<!!A1&!!#!"0!&!!5A"5!&5!6A"8!&E&3&..5$%!)E"1!!5!/A!\!%1!21"'%52.46^$<WZG;7>V=G&U;7^O!"&!#A!+2%V.8V.B<8"M:1!!$%!Q`````Q**5!!!#U!'!!21<X*U!!":!0%!!!!!!!!!!B.D<'&T=V^)5UV1-CZM>G.M98.T)G.1<X.J>'FP<GFO:V6O;82@1W^O:GFH>8*B>'FP<CZD>'Q!'E"1!!)!81"?#F"05V^$<WZG;7=!!"J!1!!"`````Q!H$6"05V^"?'6T4G&N:8-!)%"!!!(`````!&%35%^48V*F:G6S:7ZD:6^"?'6T!!!?1%!!!@````]!52"14V.@4'FN;82T8U&Y;8-R!!!?1%!!!@````]!52"14V.@4'FN;82T8U&Y;8-S!!!?1%!!!@````]!52"14V.@4'FN;82T8U&Y;8-T!!!=1%!!!@````]!$A^14V.@18BF=U:M;8"Q:71!&5!+!!^1<X.@47&Y6G6M<W.J>(E!'5!+!".1<X.@47&Y17.D:7RF=G&U;7^O!"&!#A!,5'^T8UVB?%JF=GM!'5!$!".1<X.@2%^@23V4>'^Q8UFO:'6Y!"F!!Q!35'^T8U208V.F>(6Q8UFO:'6Y!!!?1%!!!@````]!52"'<X*D:5RJ<7FU8U&Y;8-T!!!C1%!!!@````]!*R6'<X*D:5RJ<7FU8U&Y;8-T8V2F?(1!+%"!!!(`````!&%;2G^S9W6-;7VJ>&^"?'FT-V^"4V^-;7VJ>(-!!"F!!Q!42G^S9W6-;7VJ>&^"36^*<G2F?!!:1!-!%U&J=E.P<WRJ<G>@15F@37ZE:8A!'5!$!".";8*$<W^M;7ZH8U&08UFO:'6Y!'=!]1!!!!!!!!!#%W.M98.T8UB446!S,GRW9WRB=X-+9UB446!S,G.U<!"!1&!!'!"<!&Q!0A"$!%M!41"@!'!!91"C!'-!:!"F!'9!:Q"I!'E!;A"L!'Q!<1"O!']!=!6)5UV1-A!41!I!$6>P=GNJ<G>4>(*P;W5!(%"!!!(`````!#E/47&Y6'6N='6S982V=G5!!"6!#A!0476B=X6S:7VF<H25;7VF!"6!#A!/4G^N;7ZB<%.V=H*F<H1!!"*!)1R597*M:5.P<H2S<WQ!!!5!"Q!!'E"!!!(`````!(=-5W6O=W^S=U.P<'^S!!!71%!!!@````]!$AB4:7ZT<X*T+Q!!(%"!!!(`````!"!05W6O=W^S=U:V<G.U;7^O!".!"A!-2G^S9W6-;7VJ>&^;!!!01!I!#&:F<'^D;82Z!!!41!I!$%&D9W6M:8*B>'FP<A!!#U!+!!2+:8*L!!":!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59UVP>GFO:V"B=G&N:82F=CZD>'Q!)%"1!!-!@!"^!(Y047^W;7ZH5'&S97VF>'6S!!N!#A!&18BJ=T%!#U!+!!6"?'FT-A!,1!I!"5&Y;8-T!&)!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=QVD5'^T;82J<WYO9X2M!#"!5!!$!)!!A1##$ERF98*O;7ZH8V.U:8"T!!"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-39U2F:G&V<(2797RV:8-O9X2M!#Z!5!!,!()!=Q"U!(5!>A"Y!(E!?A"\!(]!AQV%:7:B>7RU6G&M>76T!!Z!-P````]%68.F=A!!&E!S`````QV3:8"P=H2T2G^M:'6S!"B!-P````]05(*P>'^D<WRT2G^M:'6S!"Z!-P````]61X6S=G6O>&"S<W:J<'6T2G^M:'6S!"2!-P````]+18"Q<'FD97ZU=Q!!$E!S`````Q2/<X2F!!"/!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-,9V"B>'BF=SZD>'Q!(E"1!!9!B1#'!)=!C!#*!)I'5'&U;'6T!!!91$$`````$E:J<'6/97VF2G^S<7&U!!!;1$$`````%&*F='^S>%ZB<76'<X*N981!!"Z!-P````]65G6Q<X*U6'6N='RB>'6@2W6S<7&O!#"!-P````]75G6Q<X*U6'6N='RB>'6@27ZH<'FT;!!!&E"1!!1!D!#.!)Y!DQ:3:8"P=H1!!"R!-0````]35(*P>'^D<WR/97VF2G^S<7&U!!!A1$,`````&V"S<X2P9W^M6'6N='RB>'6@2W6S<7&O!#*!-P````]95(*P>'^D<WR5:7VQ<'&U:6^&<G>M;8.I!!!A1$$`````&F"S<X2P9W^M1W^N<76O>&^(:8*N97Y!!#"!-0````]85(*P>'^D<WR$<WVN:7ZU8U6O:WRJ=WA!)%!Q`````R:1=G^U<W.P<%2B>'&'<WRE:8*/97VF!!!?1$$`````&&"S<X2P9W^M2G^M:'6S2G^S<7&U!!!?1&!!"Q#2!*)!EQ#5!*5!FA#8#&"S<X2P9W^M!!!31%!!!@````]!%!2*<G:P!!!51%!!!@````]!%!:3:8.V<(1!!"B!5!!#!*E!GAV4>'&U:5VF=X.B:W6T!":!1!!"`````Q!1#%VF=X.B:W6T!!!91&!!!1#=$E2J97RP:UVF=X.B:W6T!!!31%!!!@````]!%!25:8BU!!!/1&!!!1#?"&2J=(-!!&I!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=QND5XFT>'6N,G.U<!!K1&!!$!!5!$5!4A";!(%!B!#,!*!!G!#<!*U!HQ>D5XFT>'6N!&1!]!!-!!-!"!!%!!1!"!!&!!1!"A!(!!1!"!#A!Q!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!!*!!!!!!!!!!A!!!!)!!!!!!!!!!!!!!!1!!!!!!%!I1!!!!! =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PerformMeasurements_Configuration.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PerformMeasurements_Configuration.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PerformMeasurements_Configuration.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PerformMeasurements_Configuration.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PerformMeasurements_Configuration.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi (revision 68) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi (revision 69) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: builds/CurrentTester.exe =================================================================== diff --git a/builds/CurrentTester.exe b/builds/CurrentTester.exe --- a/builds/CurrentTester.exe (revision 68) +++ b/builds/CurrentTester.exe (revision 69) Index: builds/data/Initialization_HSMP1.ini =================================================================== diff --git a/builds/data/Initialization_HSMP1.ini b/builds/data/Initialization_HSMP1.ini --- a/builds/data/Initialization_HSMP1.ini (revision 68) +++ b/builds/data/Initialization_HSMP1.ini (revision 69) @@ -90,7 +90,7 @@ Measurement_Sample = " 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000 0,000000" ShuntResistance = 0,00006 Measurement_Check = False -Measurement_Delay = "1" +Measurement_Delay = "3" DMM_VISAName = "COM1" DMM_ContactLimits = " 0,000000 10,000000" TemperatureGain = " 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" =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: builds/data/lib_System.lvlibp =================================================================== diff --git a/builds/data/lib_System.lvlibp b/builds/data/lib_System.lvlibp --- a/builds/data/lib_System.lvlibp (revision 68) +++ b/builds/data/lib_System.lvlibp (revision 69) Index: support/User.txt =================================================================== diff --git a/support/User.txt b/support/User.txt --- a/support/User.txt (revision 68) +++ b/support/User.txt (revision 69) @@ -1,4 +1,5 @@ #Define the users for the Test Setup here Placido Bivona; Zoran Arvaj; +Marivaldo Figueiredo; Olga Makukha;ff671860c4a92b175578b61d6f56df451c78334faa2fe903ec81306cc06321ca0e094a1ccb98a2bce01f994a4e6f4366789733b0524c1e280edaa4da4d834478 \ No newline at end of file