=================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/CurrentTester.vi (revision 65) Index: CurrentTester [LabVIEW]/Initialization.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization.ini b/CurrentTester [LabVIEW]/Initialization.ini --- a/CurrentTester [LabVIEW]/Initialization.ini (revision 64) +++ b/CurrentTester [LabVIEW]/Initialization.ini (revision 65) @@ -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 = " 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" 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" @@ -261,12 +351,12 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +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" @@ -281,12 +371,20 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +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" @@ -311,19 +409,30 @@ Result 21 = "Bereit" Result 22 = "Bereit" 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. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" Index: CurrentTester [LabVIEW]/Initialization_Evaluation.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization_Evaluation.ini b/CurrentTester [LabVIEW]/Initialization_Evaluation.ini --- a/CurrentTester [LabVIEW]/Initialization_Evaluation.ini (revision 64) +++ b/CurrentTester [LabVIEW]/Initialization_Evaluation.ini (revision 65) @@ -47,7 +47,7 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +Info. = "26" 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" @@ -67,12 +67,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -97,19 +99,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" 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 64) +++ b/CurrentTester [LabVIEW]/Initialization_HSMP1.ini (revision 65) @@ -207,7 +207,7 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +Info. = "26" 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" @@ -227,12 +227,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -257,19 +259,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" Index: CurrentTester [LabVIEW]/Initialization_HSMP2.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization_HSMP2.ini b/CurrentTester [LabVIEW]/Initialization_HSMP2.ini --- a/CurrentTester [LabVIEW]/Initialization_HSMP2.ini (revision 64) +++ b/CurrentTester [LabVIEW]/Initialization_HSMP2.ini (revision 65) @@ -351,12 +351,12 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "30" +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 "Automatik" gebracht werden und die automatische Achsensteuerung soll aktiviert werden 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" @@ -371,18 +371,20 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Info 24 = "Achsen werden initialisiert..." -Info 25 = "Referenzfahrt läuft..." -Info 26 = "X-Achse wird referenziert..." -Info 27 = "Y-Achse wird referenziert..." -Info 28 = "Z-Achse wird referenziert..." -Info 29 = "Position wird angefahren..." -Result. = "30" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +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" @@ -407,25 +409,30 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" -Result 24 = "" -Result 25 = "Einrichtbetrieb" -Result 26 = "Einrichtbetrieb" +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. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" Index: CurrentTester [LabVIEW]/Initialization_SMP3.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization_SMP3.ini b/CurrentTester [LabVIEW]/Initialization_SMP3.ini --- a/CurrentTester [LabVIEW]/Initialization_SMP3.ini (revision 64) +++ b/CurrentTester [LabVIEW]/Initialization_SMP3.ini (revision 65) @@ -261,7 +261,7 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +Info. = "26" 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" @@ -281,12 +281,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -311,19 +313,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eState.ctl =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eState.ctl b/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eState.ctl --- a/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eState.ctl (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/CTLs/eState.ctl (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/OverrideVIs/PositioningUnit_Close.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/OverrideVIs/PositioningUnit_Close.vi b/CurrentTester [LabVIEW]/class_CurrentTester/OverrideVIs/PositioningUnit_Close.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/OverrideVIs/PositioningUnit_Close.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/OverrideVIs/PositioningUnit_Close.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ChangeTestData.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckNetworkExist.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckNetworkExist.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckNetworkExist.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckNetworkExist.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckNetworkExist.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogPrepareNetworkFolder.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogPrepareNetworkFolder.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogPrepareNetworkFolder.vi new file mode 10644 --- /dev/null (revision 0) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogPrepareNetworkFolder.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocol.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocol.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocol.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocol.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocol.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocolSelection.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocolSelection.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocolSelection.vi new file mode 10644 --- /dev/null (revision 0) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogProtocolSelection.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/GetMethodReference.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/GetMethodReference.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/GetMethodReference.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/GetMethodReference.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/GetMethodReference.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Start.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Start.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Start.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Start.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Start.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/InitGraphCurves_Protocol.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/LoadVIInSubPanel.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/LoadVIInSubPanel.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/LoadVIInSubPanel.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/LoadVIInSubPanel.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/LoadVIInSubPanel.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/PrepareNetworkFolder.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/PrepareNetworkFolder.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/PrepareNetworkFolder.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/PrepareNetworkFolder.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/PrepareNetworkFolder.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_ButtonsControl.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_ButtonsControl.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_ButtonsControl.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_ButtonsControl.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_ButtonsControl.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckData.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckData.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckData.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckData.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckData.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckProfile.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckProfile.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckProfile.vi new file mode 10644 --- /dev/null (revision 0) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CheckProfile.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol_GetProfiles.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol_GetProfiles.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol_GetProfiles.vi new file mode 10644 --- /dev/null (revision 0) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_CreateProtocol_GetProfiles.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Delete.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Delete.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Delete.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Delete.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Delete.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_DisplayLoadedTests.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_DisplayLoadedTests.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_DisplayLoadedTests.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_DisplayLoadedTests.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_DisplayLoadedTests.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_GetMeasurementsPathes.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_GetMeasurementsPathes.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_GetMeasurementsPathes.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_GetMeasurementsPathes.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_GetMeasurementsPathes.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_InitCommonGraph.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_InitCommonGraph.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_InitCommonGraph.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_InitCommonGraph.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_InitCommonGraph.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests_Statistic_Limits.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests_Statistic_Limits.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests_Statistic_Limits.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests_Statistic_Limits.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_LoadTests_Statistic_Limits.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Move.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Move.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Move.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Move.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Move.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Selection.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Selection.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Selection.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Selection.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_Selection.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults.vi (revision 65) =================================================================== 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 new file mode 10644 --- /dev/null (revision 0) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_AddGraph.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Protocol_WriteResults_TableCustomFormatting.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_HideCurrentValuesCalculationRows.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_HideCurrentValuesCalculationRows.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_HideCurrentValuesCalculationRows.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_HideCurrentValuesCalculationRows.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_HideCurrentValuesCalculationRows.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_Rename_Delete.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_Rename_Delete.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_Rename_Delete.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_Rename_Delete.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/WriteToExcel_Intervals_Rename_Delete.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvInfo.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvInfo.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvInfo.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvInfo.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvInfo.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStop.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStop.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStop.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStop.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStop.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/DisplayResults.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_BasicData.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Config.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Config.vi b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Config.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Config.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Config.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi (revision 65) 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 64) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass (revision 65) @@ -754,13 +754,13 @@ 1342710272 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%>!!!!#1!-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!6!$Q!!Q!!Q!%!!1!"!!%!!5!"!!'!!=!"!!%!!1#!!"Y!!!.#!!!!!!!!!!!!!!!!!!!!!!!!)U(!!!!!!!!E!!!!!A!!!!!!!!!!!!!!!!!!!!!!1!)!!!!!! - -1 - 0 - false - 1 - 1 - 1082929664 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%T!!!!#A!-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!&E!B%&*F<'6B=W64:7VB='BP=G5!!&1!]!!-!!-!"!!%!!1!"!!&!!1!"A!(!!1!#!!%!A!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!#."Q!!!!!!!*!!!!!)!!!!!!!!!!A!!!!!!!!!!!%!#1!!!!! + -1 + 0 + false + 1 + 1 + 1342710272 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!5<!!!!/A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!$E!B#6J@2GRJ=("F:!!01!9!#%&Y:8..<W2F!!!%!!!!-%"Q!"Y!!"U<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T!!F$<'&T=S"0>81!-%"Q!"Y!!"U<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!(1!I!!6A!$!"!!!(`````!!I!"U!+!!&:!!Q!1!!"`````Q!-!!I!5!!#!!M!$1!-!%!!!@````]!$A!31(!!#!!"!!]!5Q!!!FB:!!!&!!I!!"!!5!!&!"%!%1!2!"%!%1!11(!!#!!"!")!&1!!!6I!'%"Q!!A!!!!<!!!+4G&N:6^"?'FT-1!!'%"Q!!A!!!!<!!!+4G&N:6^"?'FT-A!!'%"Q!!A!!!!<!!!+4G&N:6^"?'FT-Q!!"!!B!"B!=!!)!!%!&Q!)!!!)18BJ=T&@68!!!"J!=!!)!!%!&Q!)!!!+18BJ=T&@2'^X<A!!'E"Q!!A!!1!8!!A!!!N"?'FT-F^3;7>I>!!;1(!!#!!"!"=!#!!!#E&Y;8-S8URF:H1!!"B!=!!)!!%!&Q!)!!!)18BJ=T.@68!!!"J!=!!)!!%!&Q!)!!!+18BJ=T.@2'^X<A!!#!!Q`````Q!1!%!!!P``````````!"Y!)E"Q!!A!!1!@!!U!!".*<H.F>&2B9GRF8URF98*O;7ZH!!5!"A!!'E"Q!!A!!1!B!#)!!!J'<X*D:5RJ<7FU!!!71(!!#!!"!"%!%A!!"V:P<(2B:W5!$U!+!!B7:7RP9WFU?1!!%U!+!!R"9W.F<'6S982J<WY!!!N!#A!%3G6S;Q!!$!"1!!-!*!!F!#9!+%"Q!!A!!1!H!"Y!!"B.<X:J<G>198*B<76U:8*@4'6B=GZJ<G=!!"J!=!!)!!%!&Q!)!!!+5G6G:8*F<G.F7!!!'E"Q!!A!!1!8!!A!!!J3:7:F=G6O9W6:!!!;1(!!#!!"!"=!#!!!#F*F:G6S:7ZD:6I!!"R!=!!)!!%!&Q!)!!!-5G6G:8*F<G.F7&F;!!!,1!I!"5&Y;8-R!!N!#A!&18BJ=T)!#U!+!!6"?'FT-Q!-!&!!!Q!N!#Y!,Q!C1(!!#!!"!$!!(A!!%V*F<'&U;8:F47^W;7ZH5X2F=(-!(E"Q!!A!!1!Q!"Y!!!Z"9H.P<(6U:5VP>GFO:Q!!&%"Q!!A!!1!8!!A!!!6.<X:F7!!51(!!#!!"!"=!#!!!"5VP>G6:!"2!=!!)!!%!&Q!)!!!&47^W:6I!&E"Q!!A!!1!8!!A!!!>.<X:F7&F;!"2!=!!)!!%!&Q!)!!!%5X2P=!!!@1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T$G.3:7:T8U&Y:8-O9X2M!%J!5!!;!"!!%Q!5!"5!&A!9!"E!'A!<!"Q!(1!A!#)!)Q!I!#E!+A!L!#Q!-1!S!$-!.!!V!$9!.QJD5G6G=V^"?'6T!!"5!0!!$!!$!!1!"1!'!!9!"Q!'!!A!#1!'!!9!/!)!!(A!!!U)!!!*!!!!#1!!!!!!!!!!!!!!D1=!!!!!!!#1!!!!#!!!!!!!!!!!!!!!%!!!!!!"!$E!!!!! @@ -1120,7 +1120,7 @@ false 1 1 - 1107821074 + 1644691987 @@ -1162,6 +1162,15 @@ 1 1342710289 + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$<!!!!#1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!""!)1J$<WZG;8*N:71`!!!71&!!!Q!!!!%!!ABF=H*P=C"J<A!!'%!S`````QZ1=G^U<W.P<%:P<'2F=A!!6!$Q!!Q!!Q!%!!5!"!!%!!1!"!!%!!9!"!!%!!=$!!"Y!!!*!!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!!!!!!!!!!!"!!!!!!!1!)!!!!!! + -1 + 33088 + true + 1 + 1 + 1342972432 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!AQ!!!!4!!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!%E!Q`````QB"=X.F<7*M?1!!'E!Q`````R&3:8"P=H2';7RF4G&N:3"*<A!51$$`````#E.P<7VF<H1A37Y!!""!-0````]'5X2S;7ZH!!!51%!!!@````]!"Q>4:7ZT<X*T!"R!1!!"`````Q!($V.F<H.P=H.0=GFH;7ZB<!!31$$`````#6*F=86F=X2F=A!11$$`````"F2F=X2F=A!!#U!(!!60=G2F=A!/1$,`````"&"B>'A!!":!1!!"`````Q!.#&"J9X2V=G6T!!!91$,`````$U2F=X2J<G&U;7^O5'&U;!!/1#%)1W^Q?52B>'%!!"2!)1Z5<X2B<&.U982J=X2J9Q!!$%!B"E>F=GVB<A!!@1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T'G.1=G^U<W.P<%.P<G:J:X6S982J<WYO9X2M!$Z!5!!/!!1!"1!'!!A!#1!+!!M!$!!/!!U!$Q!1!"%!%B:D5(*P>'^D<WR$<WZG;7>V=G&U;7^O!!!31$,`````#&2F<8"M982F!!!)!$$`````!#"!1!!"`````Q!6%F2F<8"F=G&U>8*F5W6O=W^S=Q!!+%"!!!(`````!"5<6'6N='6S982V=G64:7ZT<X*T8V.F<'6D>'6E!"*!1!!"`````Q!6"5FU:7VT!"J!1!!#``````````]!&1F*>'6N=U2B>'%!&E"!!!(`````!"5)382F<8.597=!!"N!!Q!54G6X)%FU:7UA37ZE:7ZU982J<WY!!"J!1!!"`````Q!<$%FU:7VT37ZE:7ZU=Q!!%%!Q`````Q:5:8.U351!!"*!-0````]*5X6C:G^M:'6S!!Z!-0````]%68.F=A!!$E!Q`````Q2/97VF!!!11$$`````"U.P<7VF<H1!&%!Q`````QJ$<WVN:7ZU8U6/!!!A1%!!!@````]!"R*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!(&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!(1!?!"]!)!!B!#)!)Q!E!#5!*AV5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!#E/47&Y6'6N='6S982V=G5!!"6!#A!0476B=X6S:7VF<H25;7VF!"6!#A!/4G^N;7ZB<%.V=H*F<H1!!"R!1!!"`````Q!J$E2V=G&U;7^O6G&M>76T!!!;1%!!!@````]!+1V$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!#E/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!!*!#A!+A!L!#Q!,1!O!#]!-!!R%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!+1N5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!$1!.!!51%!!!@````]!.1:-;7VJ>(-!!&M!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R2D5(*P>'^D<WR3:8.V<(2T,G.U<!!C1&!!"!!H!$)!-Q!W$G^V>("V>#"D<(6T>'6S!!!51%!!!@````]!.Q>3:8.V<(2T!#*!1!!"`````Q!6&62F<8"F=G&U>8*F5W6O=W^S=V^&4A"P!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!U1&!!#1!7!"=!'!!:!"I!(!!Y!$E!(B:D5(*P>'^D<WR5:8.U=U2B>'%A4X6U!!!11#%+1W^O:GFS<76E0Q!!"!!!!!5!"Q!!'E"!!!(`````!$U.5W6O=W^S=U.P<'^S=Q!71&!!!Q!!!!%!!ABF=H*P=C"J<A!!$E!Q`````Q25:8BU!!!71$$`````$5:16WFO:'^X6'FU<'5!$5!(!!>'5%.P<'^S!!^!"Q!*6'6Y>%.P<'^S!!^!"Q!)6'6Y>&.J?G5!!"2!-0````]+1H6U>'^O6'6Y>!!!%5!(!!N#>82U<WZ$<WRP=A!61!=!$U*V>(2P<F2F?(2$<WRP=A!61!=!$E*V>(2P<F2F?(24;8JF!!!M1&!!#!""!%)!1Q"%!%5!2A"(!%A59U2J97RP:U.P<G:J:X6S982J<WY!!'U!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R:D5(*P>'^D<WR5:8.U=U2B>'%O9X2M!$*!5!!*!"9!&Q!9!"E!'A!=!$A!/1!?&7.1=G^U<W.P<&2F=X2T2'&U93"*<A"5!0!!$!!$!"-!&!![!$M!$1!]!$Y!0Q"!!%E!3A-!!(A!!!E!!!!*!!!!#1!!!!U,!!!*!!!!%A!!!!!!!!))!!!!#A!!!"!!!!!)!!!!%A!!!!!"!%M!!!!! -1 @@ -1170,6 +1179,15 @@ 1 1 1342710291 + + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!&F!!!!%1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!R!)1:$97ZD:7Q!!!A!-0````]!(%"!!!(`````!!902G^M:'6S4G&N:8-A4X6U!!Q!1!!"`````Q!'!!A!5!!"!!A!&E"!!!(`````!!E*382F<5ZB<76T!"R!1!!"`````Q!'$E:P<'2F=EZB<76T)%FO!!!71&!!!Q!!!!%!!ABF=H*P=C"J<A!!'%"!!!(`````!!9,382F<8.6<GFR>75!%E"!!!(`````!!9&382F<8-!%E"!!!(`````!!9&4G&N:8-!6!$Q!!Q!!Q!%!!5!"Q!%!!1!#A!,!!Q!$1!/!!]$!!"Y!!!*!!!!!!!!!!E!!!!*!!!!!!!!!!!!!!)1!!!#%!!!!!I!!!))!!!#%!!!!B!!!!!!!1!1!!!!!! + -1 + 1073774912 + true + 1 + 1 + 1644691987 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$@!!!!#1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"J!)22"9WNO<X>M:72H:6"X1W^S=G6D>!!!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!"*!-0````])5'&T=X>P=G1!!&1!]!!-!!-!"!!&!!1!"!!%!!1!"!!'!!1!"Q!%!Q!!?!!!#1!!!!!!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!+!!!!!!!!!1I!!!!!!!!!!!%!#!!!!!! @@ -1237,7 +1255,7 @@ 1342710272 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!,5!!!!$1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!":!5!!$!!!!!1!##'6S=G^S)'FO!!!31(!!#!!!!"M!!!2*<G:P!!!%!#%!&E"Q!!A!!1!(!!A!!!:3:8.V<(1!!""!5!!#!!9!#!23:7:T!!()!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-+:6.U982F,G.U<!':1"9!(Q:&,6.U<X!%372M:1F#98.J9U2B>'%)6'6T>%2B>'%,5W6U>'FO:UVP:'5+6'6T>%RP972F:!N5:8.U5H6O<GFO:QF5:8.U27ZE:71&28*S<X)16'6T>%:B;7RF:&^"9G^S>":5:8.U2G&J<'6E8V2F<8"F=G&U>8*F%F2F=X2'97FM:72@1W^O>'&D>".5:8.U2G&J<'6E8UVF98.3982F&62F=X2'97FM:72@2W6O:8*B>'FP<B"5:8.U2G&J<'6E8V"P>W6S%F2F=X2'97FM:72@1X6S=G6O>!Z3:8"P=H2$=G6B>'FO:QV3:8"P=H2$=G6B>'6E#%RB=X2%982B#&"S<X2P9W^M%&"S<X2P9W^M1X*F982J<G=05(*P>'^D<WR$=G6B>'6E#62F=X2498:F:!:$;'&O:W5(37ZJ>&B:7AR3:7:F=G6O9W6976I+5G6G:8*F<G.F7!J3:7:F=G6O9W6:#F*F:G6S:7ZD:6I%47^W:1Z&,6.U<X"3:7RF98.F:!!':6.U982F!!!>1"9!!A2*<GFU"6>S;82F!!!*4X"F=G&U;7^O!&1!]!!-!!-!"!!%!!1!"!!%!!1!"!!&!!E!#A!,!Q!!?!!!#1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!+!!!!#!!!!!A!!!!)!!!!!!%!$!!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!,U!!!!$1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!":!5!!$!!!!!1!##'6S=G^S)'FO!!!31(!!#!!!!"M!!!2*<G:P!!!%!#%!&E"Q!!A!!1!(!!A!!!:3:8.V<(1!!""!5!!#!!9!#!23:7:T!!(I!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-+:6.U982F,G.U<!'Z1"9!)1:&,6.U<X!%372M:1F#98.J9U2B>'%)6'6T>%2B>'%,5W6U>'FO:UVP:'5+6'6T>%RP972F:!N5:8.U5H6O<GFO:QF5:8.U27ZE:71&28*S<X)16'6T>%:B;7RF:&^"9G^S>":5:8.U2G&J<'6E8V2F<8"F=G&U>8*F%F2F=X2'97FM:72@1W^O>'&D>".5:8.U2G&J<'6E8UVF98.3982F&62F=X2'97FM:72@2W6O:8*B>'FP<B"5:8.U2G&J<'6E8V"P>W6S%F2F=X2'97FM:72@1X6S=G6O>!Z3:8"P=H2$=G6B>'FO:QV3:8"P=H2$=G6B>'6E#%RB=X2%982B#&"S<X2P9W^M$V"S<X2P9W^M4'^B:'FO:QZ1=G^U<W.P<&.F<'6D>""1=G^U<W.P<%.S:7&U;7ZH$V"S<X2P9W^M1X*F982F:!F5:8.U5W&W:71'1WBB<G>F"UFO;82976I-5G6G:8*F<G.F7&F;#F*F:G6S:7ZD:6A+5G6G:8*F<G.F71J3:7:F=G6O9W6;"%VP>G5/23V4>'^Q5G6M:7&T:71!!!:F5X2B>'5!!"V!&A!#"%FO;81&6X*J>'5!!!F0='6S982J<WY!6!$Q!!Q!!Q!%!!1!"!!%!!1!"!!%!!5!#1!+!!M$!!"Y!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!)!!!!#!!!!!A!!!!!!1!-!!!!!! -1 0 true @@ -1282,13 +1300,13 @@ 1074274816 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!&X!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!Z!)1F3:7&E)%2B>'%!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!""!)1J8=GFU:3"%982B!!#G!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-3:6.U<X"0='6S982J<WYO9X2M!'^!&A!(#V>S;82F23V4>'^Q#V>S;82F8U&C<X*U#F*F972&,6.U<X!+5G6B:&^"9G^S>!23:7&E%6>S;82F23V4>'^Q8V.F>(6Q%&*F972&,6.U<X"@5W6U>8!!$6.U<X"0='6S982J<WY!6!$Q!!Q!!Q!%!!5!"!!%!!1!"!!%!!9!"!!(!!A#!!"Y!!!.#!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!A!!!!!!!!!#!!!!!A!!!!!!1!*!!!!!! - -1 - 0 - true - 1 - 1 - 1342710274 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!'0!!!!#Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!'%!B%E2J=W&C<'6.<X:J<G>4:82V=!!!$E!B#6*F971A2'&U91!%!!!!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!""!)1J8=GFU:3"%982B!!#G!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-3:6.U<X"0='6S982J<WYO9X2M!'^!&A!(#V>S;82F23V4>'^Q#V>S;82F8U&C<X*U#F*F972&,6.U<X!+5G6B:&^"9G^S>!23:7&E%6>S;82F23V4>'^Q8V.F>(6Q%&*F972&,6.U<X"@5W6U>8!!$6.U<X"0='6S982J<WY!6!$Q!!Q!!Q!%!!5!"A!'!!9!"A!'!!=!"!!)!!E#!!"Y!!!.#!!!#1!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!A!!!!)!!!!#!!!!!A!!!!!!1!+!!!!!! + -1 + 0 + true + 1 + 1 + 1342710275 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$S!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!Z!)1F3:7&E)%2B>'%!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!#&!&A!$"%FO;81%5G6B:!68=GFU:1!*4X"F=G&U;7^O!""!)1J8=GFU:3"%982B!!"5!0!!$!!$!!1!"!!&!!1!"!!%!!1!"A!%!!=!#!)!!(A!!!U)!!!!!!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!)!!!!#!!!!!!"!!E!!!!! @@ -1384,6 +1402,15 @@ 1 1350574594 + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3C!!!!+Q!)!$$`````!":!1!!"`````Q!!#5FU:7VT)%^V>!!=1%!!!@````]!!!Z5;7VF=X2B<8"T)%^V>!!!'E"!!!(`````!!!-382F<8.597=A4X6U!!!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%!!!@````]!#B*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!+&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!"!!&!!9!"Q!)!!E!#Q!-!!U!$AV5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!"%/47&Y6'6N='6S982V=G5!!"6!#A!0476B=X6S:7VF<H25;7VF!"6!#A!/4G^N;7ZB<%.V=H*F<H1!!"R!1!!"`````Q!2$E2V=G&U;7^O6G&M>76T!!!;1%!!!@````]!%1V$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!"%/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!!*!"!!%A!4!"1!&1!7!"=!'!!:%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!%1N5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!"Q!(!!51%!!!@````]!(1:-;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&!!"!!0!"I!'Q!?%'.1=G^U<W.P<&*F=X6M>(-!!"B!1!!"`````Q!@#V*F=X6M>(-A4X6U!"N!!Q!54G6X)%FU:7UA37ZE:7ZU982J<WY!!"Z!1!!"`````Q!B%%FU:7VT37ZE:7ZU=S"0>81!!!1!!!!=1%!!!@````]!)1^*>'6N=UFO:'6O>(-A37Y!#E!B"5RP971`!":!1!!"`````Q!!#%FU:7VT)%FO!!!;1%!!!@````]!!!V5;7VF=X2B<8"T)%FO!"B!1!!"`````Q!!#UFU:7VT6'&H)%FO!"B!1!!"`````Q!@#F*F=X6M>(-A37Y!!&1!]!!-!!%!!A!$!#!!)A!D!#1!*1!G!#=!+!!J!A!!?!!!$1A!!!U*!!!.#A!!$1M!!!U'!!!!!!!"%A!!!"!!!!%3!!!"%A!!!2)!!!%3!!!!!!%!+A!!!!! + -1 + 0 + true + 1 + 1 + 1644691971 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!>E!!!!1Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"R!-P````]45(*P>'^D<WRT2G^M:'6S)%^V>!!A1$$`````&F"S<X2P9W^M2'&U95:P<'2F=EZB<75!!""!-0````]'5X2S;7ZH!!!,1!9!"6:B<(6F!!I!5!!#!!=!#!"*!0%!!!!!!!!!!3:-6F.U=GFO:X."<G2797RV:8."=H*B?62Z='6%:7:@64%W,G.U<!!;1%!!!@````]!#1F4:7RF9X2J<WY!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!31$$`````#%&T=W6N9GRZ!!!;1$$`````%6*F='^S>%:J<'6/97VF)%FO!"2!-0````]+1W^N<76O>#"*<A!!&%"!!!(`````!!=(5W6O=W^S=Q!=1%!!!@````]!"Q^4:7ZT<X*T4X*J:WFO97Q!%E!Q`````QF3:8&V:8.U:8)!%%!Q`````Q:5:8.U:8)!!!N!"Q!&4X*E:8)!$E!S`````Q21982I!!!71%!!!@````]!&!B1;7.U>8*F=Q!!'%!S`````Q^%:8.U;7ZB>'FP<F"B>'A!$E!B#%.P=(F%982B!!!51#%/6'^U97R4>'&U;8.U;7-!!!R!)1:(:8*N97Y!!(U!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=RJD5(*P>'^D<WR$<WZG;7>V=G&U;7^O,G.U<!!_1&!!$A!-!!U!$A!0!"!!%1!3!"-!&1!5!"9!&Q!9!"E79V"S<X2P9W^M1W^O:GFH>8*B>'FP<A!!%E!S`````QB5:7VQ<'&U:1!!#!!Q`````Q!A1%!!!@````]!("*5:7VQ:8*B>(6S:6.F<H.P=H-!!#B!1!!"`````Q!='V2F<8"F=G&U>8*F5W6O=W^S=V^4:7RF9X2F:!!31%!!!@````]!(!6*>'6N=Q!;1%!!!P``````````!"Q*382F<8.%982B!":!1!!"`````Q!=#%FU:7VT6'&H!!!<1!-!&%ZF>S"*>'6N)%FO:'6O>'&U;7^O!!!;1%!!!@````]!)AR*>'6N=UFO:'6O>(-!!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!)%"!!!(`````!!=36'6N='6S982V=G64:7ZT<X*T!!!C1%!!!@````]!"R65:7VQ:8*B>(6S:6.F<H.P=H.@25Y!$%!B"F*F='^S>!!!$E!B#6*F='^S>&^&4A"D!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-39V2F=X2#98.J9U2B>'%O9X2M!#R!5!!+!#1!*1!G!#=!+!!J!#I!+Q!M!#U.6'6T>%*B=WFD2'&U91!41!I!$6>P=GNJ<G>4>(*P;W5!$5!+!!>/>7VF=GFD!"R!1!!"`````Q!Q$EVB?&2F<8"F=G&U>8*F!!!61!I!$UVF98.V=G6N:7ZU6'FN:1!61!I!$EZP<7FO97R$>8*S:7ZU!!!=1%!!!@````]!-!Z%>8*B>'FP<F:B<(6F=Q!!'E"!!!(`````!$!.1X6S=G6O>&:B<(6F=Q!31#%-6'&C<'6$<WZU=G^M!!!81!9!%%&J=E.P<WRJ<G>0=(2J<WY!!"R!1!!"`````Q!Q$F"S:8.T>8*F6G&M>76T!!"J!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79U.V=H*F<H25:8.U1W^O:GFH,G.U<!!O1&!!#1!P!$%!-A!T!$1!.1!W!$=!/"&$>8*S:7ZU6'6T>%.P<G:J:Q!=1%!!!P``````````!$!,6'6T>&*F=X6M>(-!"1!+!!!+!&!!!A!\!$M!&%"!!!(`````!$Q'4'FN;82T!!"<!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59V"S<X2P9W^M5G6T>7RU=SZD>'Q!)E"1!!1!,A!Z!$I!01ZP>82Q>81A9WRV=X2F=A!!&%"!!!(`````!$Y(5G6T>7RU=Q!C1%!!!@````]!("65:7VQ:8*B>(6S:6.F<H.P=H.@25Y!:1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&G.1=G^U<W.P<&2F=X2T2'&U93ZD>'Q!+E"1!!E!(1!?!"]!)!!B!#-!0Q"!!#5-6'6T>(.%982B)%FO!!"5!0!!$!!$!!1!"!!&!!1!"A!+!!1!#Q!;!"M!11-!!(A!!!U)!!!!!!!!!!!!!!E!!!!!!!!#%!!!!B!!!!!!!!!!%A!!!"!!!!!1!!!!%!!!!!!"!%)!!!!! -1 @@ -1393,6 +1420,15 @@ 1 1350574611 + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!7/!!!!-Q!.1!I!"UZV<76S;7-!(%"!!!(`````!!!/2(6S982J<WZ797RV:8-!!"J!1!!"`````Q!!$5.V=H*F<H2797RV:8-!%%!Q`````Q:5:8.U351!!"*!-0````]*5X6C:G^M:'6S!!Z!-0````]%68.F=A!!$E!Q`````Q2/97VF!!!11$$`````"U.P<7VF<H1!&%!Q`````QJ$<WVN:7ZU8U6/!!!11$$`````"F.U=GFO:Q!!)%"!!!(`````!!E36'6N='6S982V=G64:7ZT<X*T!!!C1%!!!@````]!#265:7VQ:8*B>(6S:6.F<H.P=H.@25Y!$%!B"F*F='^S>!!!$E!B#6*F='^S>&^&4A"D!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-39V2F=X2#98.J9U2B>'%O9X2M!#R!5!!+!!-!"!!&!!9!"Q!)!!I!#Q!-!!U.6'6T>%*B=WFD2'&U91!41!I!$6>P=GNJ<G>4>(*P;W5!(%"!!!(`````!!!/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!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!!!/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!!*!!]!%!!2!")!!1!#!"-!&!!6%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!!!N5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!"A!'!!51%!!!@````]!'1:-;7VJ>(-!!&M!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R2D5(*P>'^D<WR3:8.V<(2T,G.U<!!C1&!!"!!/!"9!&Q!;$G^V>("V>#"D<(6T>'6S!!!51%!!!@````]!'Q>3:8.V<(2T!":!-0````].=G6T>7RU)(.U=GFO:Q!31%!!!@````]!(16*>'6N=Q!/!&!!"!!"!!)!(!!?!"R!1!!"`````Q!@$U.V=H*F<H21=G^G;7RF=Q!61!I!$EVB?&2F<8"F=G&U>8*F!!!91$$`````$EFU:7V/>7VC:8*5:8BU!!!)!$,`````!"*!1!!"`````Q!D"6"B>'BT!!1!!!!-1#%'2W6S<7&O!!!31$$`````#%&T=W6N9GRZ!!!)!$$`````!#"!1!!"`````Q!I%F2F<8"F=G&U>8*F5W6O=W^S=Q!!+%"!!!(`````!#A<6'6N='6S982V=G64:7ZT<X*T8V.F<'6D>'6E!"*!1!!"`````Q!I"5FU:7VT!"J!1!!#``````````]!+!F*>'6N=U2B>'%!&E"!!!(`````!#A)382F<8.597=!!"N!!Q!54G6X)%FU:7UA37ZE:7ZU982J<WY!!"J!1!!"`````Q!O$%FU:7VT37ZE:7ZU=Q!!)E"!!!(`````!#A66'6N='6S982V=G64:7ZT<X*T8U6/!'5!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R:D5(*P>'^D<WR5:8.U=U2B>'%O9X2M!#J!5!!*!#E!+A!L!#Q!,1!P!"Q!-!!%$&2F=X2T2'&U93"*<A!!6!$Q!!Q!)!!B!!]!!Q!C!#1!*1!F!#5!*A!H!$%#!!"Y!!!*!!!!#1!!!!E!!!!*!!!!#1!!!!E!!!!!!!!!!!!!!!!!!!!1!!!#%!!!!"!!!!!!!1!S!!!!!! + -1 + 0 + true + 1 + 1 + 1342710275 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!7N!!!!-!!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!#!!Q`````Q!A1%!!!@````]!""*5:7VQ:8*B>(6S:6.F<H.P=H-!!#B!1!!"`````Q!%'V2F<8"F=G&U>8*F5W6O=W^S=V^4:7RF9X2F:!!31%!!!@````]!"!6*>'6N=Q!;1%!!!P``````````!!1*382F<8.%982B!":!1!!"`````Q!%#%FU:7VT6'&H!!!<1!-!&%ZF>S"*>'6N)%FO:'6O>'&U;7^O!!!;1%!!!@````]!#AR*>'6N=UFO:'6O>(-!!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!%%!Q`````Q:4>(*J<G=!!#"!1!!"`````Q!3%F2F<8"F=G&U>8*F5W6O=W^S=Q!!)E"!!!(`````!")66'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!-!!U!$A!0!"!!%1!4!"1!&1!7$62F=X2#98.J9U2B>'%!%U!+!!V8<X*L;7ZH5X2S<WNF!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!'1Z.98B5:7VQ:8*B>(6S:1!!&5!+!!^.:7&T>8*F<76O>&2J<75!&5!+!!Z/<WVJ<G&M1X6S=G6O>!!!(%"!!!(`````!"E/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%!!!@````]!'1Z1=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!'!!;!"M!(!!>!"Y!(Q!A!#%21X6S=G6O>&2F=X2$<WZG;7=!(%"!!!,``````````Q!:#V2F=X23:8.V<(2T!!5!#A!!#A"1!!)!*!!E!"2!1!!"`````Q!F"ERJ<7FU=Q!!7Q$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&'.1=G^U<W.P<&*F=X6M>(-O9X2M!#*!5!!%!"=!)A!D!#9/<X6U=(6U)'.M>8.U:8)!!"2!1!!"`````Q!H"V*F=X6M>(-!)E"!!!(`````!!166'6N='6S982V=G64:7ZT<X*T8U6/!'5!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R:D5(*P>'^D<WR5:8.U=U2B>'%O9X2M!#J!5!!*!!5!"A!(!!A!#1!,!#A!+1!.$62F=X2T2'&U93"0>81!"!!!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!:1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&G.1=G^U<W.P<&2F=X2T2'&U93ZD>'Q!+E"1!!E!"1!'!!=!#!!*!!M!+!!J!!U-6'6T>(.%982B)%FO!!!51(!!#!!"!!1!1A!!"&2S:75!!&1!]!!-!!-!+A!L!#M!+Q!L!#M!+Q!M!#U!+Q!O!Q!!?!!!$1A!!!U*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!%A!!!!!!!!!1!!!!!!%!,Q!!!!! -1 @@ -1412,13 +1448,13 @@ 1342710291 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$L!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!A!-0````]!'%"!!!(`````!!5,2G^M:'6S4G&N:8-!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!/1$,`````"&"B>'A!!&1!]!!-!!-!"!!'!!1!"!!%!!1!"!!(!!1!"!!)!Q!!?!!!$1A!!!!!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!+!!!!!!!!!!!!!!!1!!!!!!%!#1!!!!! - -1 - 0 - true - 1 - 1 - 1342710288 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$X!!!!#Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!$%!B"E.B<G.F<!!!#!!Q`````Q!91%!!!@````]!"1N'<WRE:8*/97VF=Q!%!!!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!/1$,`````"&"B>'A!!&1!]!!-!!-!"!!'!!=!"Q!(!!=!"Q!)!!=!"Q!*!Q!!?!!!$1A!!!E!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!+!!!!!!!!!!!!!!!1!!!!!!%!#A!!!!! + -1 + 0 + true + 1 + 1 + 1342710289 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%>!!!!$!!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"*!-0````]*28BU:7ZT;7^O!"B!-0````]/5G6Q<X*U2GFM:5ZB<75!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!)5!8!!)'2W6S<7&O"U6O:WRJ=WA!!!F4:7RF9X2J<WY!"U!$!!&"!!Z!-0````]%4G&N:1!!6!$Q!!Q!!Q!%!!5!"A!%!!1!"!!%!!=!#!!*!!I$!!"Y!!!*!!!!!!!!!!E!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!1!!!!%!!!!"!!!!!!!1!,!!!!!! @@ -1447,14 +1483,23 @@ 1 1350574594 + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!;1!!!!.Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!%%!Q`````Q:4>(*J<G=!!!N!"A!&6G&M>75!#A"1!!)!"!!&!%E!]1!!!!!!!!!"*ER75X2S;7ZH=U&O:&:B<(6F=U&S=G&Z6(FQ:52F:F^6-49O9X2M!"J!1!!"`````Q!'#6.F<'6D>'FP<A!)!$$`````!#"!1!!"`````Q!)%F2F<8"F=G&U>8*F5W6O=W^S=Q!!+%"!!!(`````!!A<6'6N='6S982V=G64:7ZT<X*T8V.F<'6D>'6E!"*!1!!"`````Q!)"5FU:7VT!"J!1!!#``````````]!#!F*>'6N=U2B>'%!&E"!!!(`````!!A)382F<8.597=!!"N!!Q!54G6X)%FU:7UA37ZE:7ZU982J<WY!!"J!1!!"`````Q!/$%FU:7VT37ZE:7ZU=Q!!%%!Q`````Q:5:8.U351!!"*!-0````]*5X6C:G^M:'6S!!Z!-0````]%68.F=A!!$E!Q`````Q2/97VF!!!11$$`````"U.P<7VF<H1!&%!Q`````QJ$<WVN:7ZU8U6/!!!A1%!!!@````]!""*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!%&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!%!!2!")!%Q!5!"5!&A!8!"A!'1V5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!"Q/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%!!!@````]!(!V$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!"Q/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!!*!"M!(1!?!"]!)!!B!#)!)Q!E%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!(!N5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!#=!*Q!51%!!!@````]!+!:-;7VJ>(-!!&M!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R2D5(*P>'^D<WR3:8.V<(2T,G.U<!!C1&!!"!!;!#5!*A!J$G^V>("V>#"D<(6T>'6S!!!51%!!!@````]!+A>3:8.V<(2T!#*!1!!"`````Q!)&62F<8"F=G&U>8*F5W6O=W^S=V^&4A"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!*!!I!#Q!-!!U!$Q!L!#Q!%1V5:8.U=U2B>'%A4X6U!"*!-P````])5'&U;#"0>81!!!1!!!!Q1(!!(A!!(2ND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-!#5.M98.T)%^V>!!Q1(!!(A!!(2ND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!J!)16-<W&E0Q"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!*!!I!#Q!-!!U!$Q!L!#Q!%1R5:8.U=U2B>'%A37Y!!""!-P````](5'&U;#"*<A"B!0!!$!!$!!=!,1!O!#]!-!!P!$%!-A!T!$1!.1-!!(A!!!U)!!!*!!!!#1!!!!U,!!!!!!!!$1=!!!!!!!!3!!!!%A!!!"!!!!!1!!!!%A!!$1!!!!!!#!!!!!!!!!!!!1!W!!!!!! + -1 + 0 + true + 1 + 1 + 1644691987 + - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!0[!!!!)Q!%!!!!%%!Q`````Q:4>(*J<G=!!"Z!1!!#``````````]!!1V*>'6N=U2B>'%A4X6U!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!)%"!!!(`````!!%36'6N='6S982V=G64:7ZT<X*T!!!C1%!!!@````]!!265:7VQ:8*B>(6S:6.F<H.P=H.@25Y!$%!B"F*F='^S>!!!$E!B#6*F='^S>&^&4A"D!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-39V2F=X2#98.J9U2B>'%O9X2M!#R!5!!+!!-!"!!&!!9!"Q!)!!E!#A!,!!Q.6'6T>%*B=WFD2'&U91!41!I!$6>P=GNJ<G>4>(*P;W5!$5!+!!>/>7VF=GFD!"R!1!!"`````Q!0$EVB?&2F<8"F=G&U>8*F!!!61!I!$UVF98.V=G6N:7ZU6'FN:1!61!I!$EZP<7FO97R$>8*S:7ZU!!!=1%!!!@````]!$QZ%>8*B>'FP<F:B<(6F=Q!!'E"!!!(`````!!].1X6S=G6O>&:B<(6F=Q!31#%-6'&C<'6$<WZU=G^M!!!81!9!%%&J=E.P<WRJ<G>0=(2J<WY!!"R!1!!"`````Q!0$F"S:8.T>8*F6G&M>76T!!"J!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79U.V=H*F<H25:8.U1W^O:GFH,G.U<!!O1&!!#1!/!"!!%1!3!"-!&!!6!"9!&R&$>8*S:7ZU6'6T>%.P<G:J:Q!=1%!!!P``````````!!],6'6T>&*F=X6M>(-!"1!+!!!+!&!!!A!;!"I!&%"!!!(`````!"M'4'FN;82T!!">!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59V"S<X2P9W^M5G6T>7RU=SZD>'Q!*%"1!!1!$1!9!"E!(""D5(*P>'^D<WR3:8.V<(2T!!!91%!!!@````]!(1N3:8.V<(2T)%^V>!!<1!-!&%ZF>S"*>'6N)%FO:'6O>'&U;7^O!!!;1%!!!@````]!(QR*>'6N=UFO:'6O>(-!!"B!1!!"`````Q!>#F*F=X6M>(-A37Y!!&1!]!!-!!!!!!!#!"Y!!!!!!!!!!!!!!!!!)!!B!A!!?!!!!!!!!!!!!!!*!!!!#1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!AA!!!)1!!!!!!%!)A!!!!! - -1 - 0 - true - 1 - 1 - 1350574592 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3]!!!!+Q!)!$$`````!":!1!!"`````Q!!#5FU:7VT)%^V>!!=1%!!!@````]!!!Z5;7VF=X2B<8"T)%^V>!!!'E"!!!(`````!!!-382F<8.597=A4X6U!!!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%!!!@````]!#B*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!+&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!"!!&!!9!"Q!)!!E!#Q!-!!U!$AV5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!"%/47&Y6'6N='6S982V=G5!!"6!#A!0476B=X6S:7VF<H25;7VF!"6!#A!/4G^N;7ZB<%.V=H*F<H1!!"R!1!!"`````Q!2$E2V=G&U;7^O6G&M>76T!!!;1%!!!@````]!%1V$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!"%/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!!*!"!!%A!4!"1!&1!7!"=!'!!:%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!%1N5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!"Q!(!!51%!!!@````]!(1:-;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&!!"!!0!"I!'Q!?%'.1=G^U<W.P<&*F=X6M>(-!!"B!1!!"`````Q!@#V*F=X6M>(-A4X6U!"N!!Q!54G6X)%FU:7UA37ZE:7ZU982J<WY!!"Z!1!!"`````Q!B%%FU:7VT37ZE:7ZU=S"0>81!!"Z!1!!#``````````]!#AV*>'6N=U2B>'%A4X6U!"R!1!!"`````Q!B$UFU:7VT37ZE:7ZU=S"*<A!+1#%&4'^B:$]!&E"!!!(`````!!!)382F<8-A37Y!!"J!1!!"`````Q!!$62J<76T>'&N=(-A37Y!'%"!!!(`````!!!,382F<8.597=A37Y!'%"!!!(`````!"]+5G6T>7RU=S"*<A!!6!$Q!!Q!!1!#!!-!)!!C!#-!*!!F!#9!*Q!I!#E#!!"Y!!!.#!!!$1E!!!U+!!!*!!!!$19!!!E!!!%3!!!!%!!!!2)!!!%3!!!"%A!!!2)!!!!!!1!K!!!!!! + -1 + 0 + true + 1 + 1 + 1107821059 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!7V!!!!-1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!A!-0````]!)%"!!!(`````!!536'6N='6S982V=G64:7ZT<X*T!!!I1%!!!@````]!"2N5:7VQ:8*B>(6S:6.F<H.P=H.@5W6M:7.U:71!%E"!!!(`````!!5&382F<8-!'E"!!!,``````````Q!&#5FU:7VT2'&U91!71%!!!@````]!"1B*>'6N=V2B:Q!!'U!$!"2/:8=A382F<3"*<G2F<H2B>'FP<A!!'E"!!!(`````!!M-382F<8.*<G2F<H2T!!!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%!!!@````]!%R*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!4&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!$1!/!!]!%!!2!")!&!!6!"9!&QV5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!"I/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%!!!@````]!'AV$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!"I/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!!*!"E!'Q!=!"U!(A!@!#!!)1!C%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!'AN5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!#5!*1!51%!!!@````]!*A:-;7VJ>(-!!&M!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R2D5(*P>'^D<WR3:8.V<(2T,G.U<!!C1&!!"!!9!#-!*!!H$G^V>("V>#"D<(6T>'6S!!!51%!!!@````]!+!>3:8.V<(2T!#*!1!!"`````Q!&&62F<8"F=G&U>8*F5W6O=W^S=V^&4A"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!'!!=!#!!*!!I!$!!J!#I!$AV5:8.U=U2B>'%A4X6U!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!#%!B!F6Q!!"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!'!!=!#!!*!!I!$!!J!#I!$AR5:8.U=U2B>'%A37Y!!"2!=!!)!!%!"1"#!!!%6(*F:1!!6!$Q!!Q!!Q!%!#M!"!!%!!1!"!!%!#Q!,1!O!#]$!!"Y!!!.#!!!!!!!!!U+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")!!!!1!!!!%A!!!")!!!!!!1!Q!!!!!! @@ -1477,11 +1522,20 @@ )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!5V!!!!-A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#B!=!!?!!!4%5Z*8X*F='^S>#ZM>G.M98.T!!J3:8"P=H1A4X6U!!!-1#%'2W6S<7&O!!!)!$$`````!"*!1!!"`````Q!("5FU:7VT!"2!1!!"`````Q!("V.F<H.P=H-!(%"!!!(`````!!=05W6O=W^S=U^S;7>J<G&M!""!-0````]'5X2S;7ZH!!!,1!9!"6:B<(6F!!I!5!!#!!M!$!"*!0%!!!!!!!!!!3:-6F.U=GFO:X."<G2797RV:8."=H*B?62Z='6%:7:@64%W,G.U<!!;1%!!!@````]!$1F4:7RF9X2J<WY!&%!B$F2P>'&M5X2B>'FT>'FD!!!=1&!!"!!*!!I!$A!0$5.P<G:J:X6S982J<WY!$%!Q`````Q)F=Q!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!21!-!#F2B9GRF37ZE:8A!!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!)%"!!!(`````!!M36'6N='6S982V=G64:7ZT<X*T!!!C1%!!!@````]!#R65:7VQ:8*B>(6S:6.F<H.P=H.@25Y!$%!B"F*F='^S>!!!$E!B#6*F='^S>&^&4A"D!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-39V2F=X2#98.J9U2B>'%O9X2M!#R!5!!+!"1!&1!7!"=!'!!:!"I!'Q!=!"U.6'6T>%*B=WFD2'&U91!41!I!$6>P=GNJ<G>4>(*P;W5!$5!+!!>/>7VF=GFD!"R!1!!"`````Q!A$EVB?&2F<8"F=G&U>8*F!!!61!I!$UVF98.V=G6N:7ZU6'FN:1!61!I!$EZP<7FO97R$>8*S:7ZU!!!=1%!!!@````]!)!Z%>8*B>'FP<F:B<(6F=Q!!'E"!!!(`````!#!.1X6S=G6O>&:B<(6F=Q!31#%-6'&C<'6$<WZU=G^M!!!81!9!%%&J=E.P<WRJ<G>0=(2J<WY!!"R!1!!"`````Q!A$F"S:8.T>8*F6G&M>76T!!"J!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79U.V=H*F<H25:8.U1W^O:GFH,G.U<!!O1&!!#1!@!#%!)A!D!#1!*1!G!#=!+"&$>8*S:7ZU6'6T>%.P<G:J:Q!=1%!!!P``````````!#!,6'6T>&*F=X6M>(-!"1!+!!!+!&!!!A!L!#M!&%"!!!(`````!#Q'4'FN;82T!!"<!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59V"S<X2P9W^M5G6T>7RU=SZD>'Q!)E"1!!1!(A!J!#I!,1ZP>82Q>81A9WRV=X2F=A!!&%"!!!(`````!#Y(5G6T>7RU=Q!G1(!!(A!!%R&/36^S:8"P=H1O<(:D<'&T=Q!*5G6Q<X*U)%FO!&1!]!!-!!-!"!!%!!5!"A!)!"!!%1!3!"-!,Q!Q!Q!!?!!!$1A!!!!!!!!!!!!!$1M!!"!!!!)1!!!!%!!!!"!!!!!3!!!!%A!!!B!!!!!3!!!!!!%!-1!!!!! -1 - 262400 - true - 1 - 1 - 1350574608 + 1074004224 + true + 1 + 1 + 1644691987 + + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3&!!!!+A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#B!=!!?!!!4%5Z*8X*F='^S>#ZM>G.M98.T!!J3:8"P=H1A4X6U!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!R!)1:(:8*N97Y!!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!%%!Q`````Q:4>(*J<G=!!#"!1!!"`````Q!/%F2F<8"F=G&U>8*F5W6O=W^S=Q!!)E"!!!(`````!!Y66'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!)!!E!#A!,!!Q!$1!0!"!!%1!3$62F=X2#98.J9U2B>'%!%U!+!!V8<X*L;7ZH5X2S<WNF!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!&1Z.98B5:7VQ:8*B>(6S:1!!&5!+!!^.:7&T>8*F<76O>&2J<75!&5!+!!Z/<WVJ<G&M1X6S=G6O>!!!(%"!!!(`````!"5/2(6S982J<WZ797RV:8-!!"J!1!!"`````Q!6$5.V=H*F<H2797RV:8-!%E!B$&2B9GRF1W^O>(*P<!!!&U!'!""";8*$<W^M;7ZH4X"U;7^O!!!=1%!!!@````]!&1Z1=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!&!!7!"=!'!!:!"I!'Q!=!"U21X6S=G6O>&2F=X2$<WZG;7=!(%"!!!,``````````Q!6#V2F=X23:8.V<(2T!!5!#A!!#A"1!!)!)!!A!"2!1!!"`````Q!B"ERJ<7FU=Q!!81$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&'.1=G^U<W.P<&*F=X6M>(-O9X2M!#2!5!!%!"-!(A!@!#)19V"S<X2P9W^M5G6T>7RU=Q!!&%"!!!(`````!#-(5G6T>7RU=Q!71%!!!@````]!$AF1<'^U4G&N:8-!&5!$!!Z$>8*W:6.F<'6D>'FP<A!!'%"1!!1!*!!F!#9!#QB*<GFU2'&U91!!*E"Q!"Y!!"-24EF@=G6Q<X*U,GRW9WRB=X-!#6*F='^S>#"*<A"5!0!!$!!$!!1!"!!&!!1!"!!%!!1!"A!(!#=!+!-!!(A!!!U)!!!!!!!!!!!!!!U,!!!!!!!!!!!!!!!!!!!!!!!!%A!!!"!!!!!1!!!!%A!!!!!"!#E!!!!! + -1 + 0 + true + 1 + 1 + 1879581203 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$@!!!!#1!%!!!!#U!$!!6*<G2F?!!.1!-!"ERF<G>U;!!!%E"1!!)!!1!#"U.M>8.U:8)!&%"!!!(`````!!-(37ZE:8BF=Q!.1!I!"UZV<76S;7-!'E"!!!(`````!!5-1X6S=G6O>%&S=G&Z!!!;1%!!!@````]!"1V$>8*S:7ZU6G&M>76T!&1!]!!-!!!!!!!%!!!!!!!!!!!!!!!!!!!!"A!(!A!!?!!!!!!!!!!!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!)1!!!!!!%!#!!!!!! @@ -1847,22 +1901,13 @@ 1107821073 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!;/!!!!.Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!#!!Q`````Q!A1%!!!@````]!""*5:7VQ:8*B>(6S:6.F<H.P=H-!!#B!1!!"`````Q!%'V2F<8"F=G&U>8*F5W6O=W^S=V^4:7RF9X2F:!!31%!!!@````]!"!6*>'6N=Q!;1%!!!P``````````!!1*382F<8.%982B!":!1!!"`````Q!%#%FU:7VT6'&H!!!<1!-!&%ZF>S"*>'6N)%FO:'6O>'&U;7^O!!!;1%!!!@````]!#AR*>'6N=UFO:'6O>(-!!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!%%!Q`````Q:4>(*J<G=!!#"!1!!"`````Q!3%F2F<8"F=G&U>8*F5W6O=W^S=Q!!)E"!!!(`````!")66'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!-!!U!$A!0!"!!%1!4!"1!&1!7$62F=X2#98.J9U2B>'%!%U!+!!V8<X*L;7ZH5X2S<WNF!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!'1Z.98B5:7VQ:8*B>(6S:1!!&5!+!!^.:7&T>8*F<76O>&2J<75!&5!+!!Z/<WVJ<G&M1X6S=G6O>!!!(%"!!!(`````!"E/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%!!!@````]!'1Z1=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!'!!;!"M!(!!>!"Y!(Q!A!#%21X6S=G6O>&2F=X2$<WZG;7=!(%"!!!,``````````Q!:#V2F=X23:8.V<(2T!!5!#A!!#A"1!!)!*!!E!"2!1!!"`````Q!F"ERJ<7FU=Q!!7Q$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&'.1=G^U<W.P<&*F=X6M>(-O9X2M!#*!5!!%!"=!)A!D!#9/<X6U=(6U)'.M>8.U:8)!!"2!1!!"`````Q!H"V*F=X6M>(-!)E"!!!(`````!!166'6N='6S982V=G64:7ZT<X*T8U6/!'5!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R:D5(*P>'^D<WR5:8.U=U2B>'%O9X2M!#J!5!!*!!5!"A!(!!A!#1!,!#A!+1!.$62F=X2T2'&U93"0>81!#U!'!!6797RV:1!+!&!!!A!3!#M!31$R!!!!!!!!!!%G4&:4>(*J<G>T17ZE6G&M>76T18*S98F5?8"F2'6G8V5R.CZD>'Q!'E"!!!(`````!#Q*5W6M:7.U;7^O!!1!!!!Q1(!!(A!!(2ND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-!#5.M98.T)%^V>!!+1#%&4'^B:$]!-%"Q!"Y!!"U<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!&!!9!"Q!)!!E!#Q!I!#E!$1R5:8.U=U2B>'%A37Y!!!Z!-P````]%5'&U;!!!%E"Q!!A!!1!%!%)!!!.3:79!91$Q!!Q!!Q!K!#U!,A!O!#]!-!!R!$)!-Q!U!$5$!!"Y!!!.#!!!#1!!!!E!!!!!!!!!!!!!!!U(!!!)!!!!%A!!!")!!!!)!!!!#!!!!")!!!U!!!!!!!A!!!!!!!!!!!%!.A!!!!! - -1 - 0 - true - 1 - 1 - 1342710290 - - - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!:]!!!!.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=!!!N!"A!&6G&M>75!#A"1!!)!"!!&!%E!]1!!!!!!!!!"*ER75X2S;7ZH=U&O:&:B<(6F=U&S=G&Z6(FQ:52F:F^6-49O9X2M!"J!1!!"`````Q!'#6.F<'6D>'FP<A!)!$$`````!#"!1!!"`````Q!)%F2F<8"F=G&U>8*F5W6O=W^S=Q!!+%"!!!(`````!!A<6'6N='6S982V=G64:7ZT<X*T8V.F<'6D>'6E!"*!1!!"`````Q!)"5FU:7VT!"J!1!!#``````````]!#!F*>'6N=U2B>'%!&E"!!!(`````!!A)382F<8.597=!!"N!!Q!54G6X)%FU:7UA37ZE:7ZU982J<WY!!"J!1!!"`````Q!/$%FU:7VT37ZE:7ZU=Q!!%%!Q`````Q:5:8.U351!!"*!-0````]*5X6C:G^M:'6S!!Z!-0````]%68.F=A!!$E!Q`````Q2/97VF!!!11$$`````"U.P<7VF<H1!&%!Q`````QJ$<WVN:7ZU8U6/!!!A1%!!!@````]!""*5:7VQ:8*B>(6S:6.F<H.P=H-!!#*!1!!"`````Q!%&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!%!!2!")!%Q!5!"5!&A!8!"A!'1V5:8.U1G&T;7.%982B!".!#A!.6W^S;WFO:V.U=G^L:1!.1!I!"UZV<76S;7-!(%"!!!(`````!"Q/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%!!!@````]!(!V$>8*S:7ZU6G&M>76T!"*!)1R597*M:5.P<H2S<WQ!!">!"A!117FS1W^P<'FO:U^Q>'FP<A!!(%"!!!(`````!"Q/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!!*!"M!(1!?!"]!)!!B!#)!)Q!E%5.V=H*F<H25:8.U1W^O:GFH!"R!1!!#``````````]!(!N5:8.U5G6T>7RU=Q!&!!I!!!I!5!!#!#=!*Q!51%!!!@````]!+!:-;7VJ>(-!!&M!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R2D5(*P>'^D<WR3:8.V<(2T,G.U<!!C1&!!"!!;!#5!*A!J$G^V>("V>#"D<(6T>'6S!!!51%!!!@````]!+A>3:8.V<(2T!#*!1!!"`````Q!)&62F<8"F=G&U>8*F5W6O=W^S=V^&4A"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!*!!I!#Q!-!!U!$Q!L!#Q!%1V5:8.U=U2B>'%A4X6U!!1!!!!Q1(!!(A!!(2ND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-!#5.M98.T)%^V>!!Q1(!!(A!!(2ND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!J!)16-<W&E0Q"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!*!!I!#Q!-!!U!$Q!L!#Q!%1R5:8.U=U2B>'%A37Y!!!Z!-P````]%5'&U;!!!91$Q!!Q!!Q!(!#U!,A!O!#]!,A!Q!$%!-A!T!$1$!!"Y!!!.#!!!#1!!!!E!!!!!!!!!!!!!!!U(!!!!!!!!%A!!!")!!!!1!!!!%!!!!"!!!!U!!!!!!!A!!!!!!!!!!!%!.1!!!!! - -1 - 0 - true - 1 - 1 - 1342710291 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!;C!!!!/!!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!#!!Q`````Q!A1%!!!@````]!""*5:7VQ:8*B>(6S:6.F<H.P=H-!!#B!1!!"`````Q!%'V2F<8"F=G&U>8*F5W6O=W^S=V^4:7RF9X2F:!!31%!!!@````]!"!6*>'6N=Q!;1%!!!P``````````!!1*382F<8.%982B!":!1!!"`````Q!%#%FU:7VT6'&H!!!<1!-!&%ZF>S"*>'6N)%FO:'6O>'&U;7^O!!!;1%!!!@````]!#AR*>'6N=UFO:'6O>(-!!""!-0````]'6'6T>%F%!!!31$$`````#6.V9G:P<'2F=A!/1$$`````"&6T:8)!!!Z!-0````]%4G&N:1!!%%!Q`````Q>$<WVN:7ZU!"2!-0````]+1W^N<76O>&^&4A!!%%!Q`````Q:4>(*J<G=!!#"!1!!"`````Q!3%F2F<8"F=G&U>8*F5W6O=W^S=Q!!)E"!!!(`````!")66'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!-!!U!$A!0!"!!%1!4!"1!&1!7$62F=X2#98.J9U2B>'%!%U!+!!V8<X*L;7ZH5X2S<WNF!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!'1Z.98B5:7VQ:8*B>(6S:1!!&5!+!!^.:7&T>8*F<76O>&2J<75!&5!+!!Z/<WVJ<G&M1X6S=G6O>!!!(%"!!!(`````!"E/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%!!!@````]!'1Z1=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!'!!;!"M!(!!>!"Y!(Q!A!#%21X6S=G6O>&2F=X2$<WZG;7=!(%"!!!,``````````Q!:#V2F=X23:8.V<(2T!!5!#A!!#A"1!!)!*!!E!"2!1!!"`````Q!F"ERJ<7FU=Q!!7Q$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&'.1=G^U<W.P<&*F=X6M>(-O9X2M!#*!5!!%!"=!)A!D!#9/<X6U=(6U)'.M>8.U:8)!!"2!1!!"`````Q!H"V*F=X6M>(-!)E"!!!(`````!!166'6N='6S982V=G64:7ZT<X*T8U6/!'5!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R:D5(*P>'^D<WR5:8.U=U2B>'%O9X2M!#J!5!!*!!5!"A!(!!A!#1!,!#A!+1!.$62F=X2T2'&U93"0>81!#U!'!!6797RV:1!+!&!!!A!3!#M!31$R!!!!!!!!!!%G4&:4>(*J<G>T17ZE6G&M>76T18*S98F5?8"F2'6G8V5R.CZD>'Q!'E"!!!(`````!#Q*5W6M:7.U;7^O!"*!-P````])5'&U;#"0>81!!!1!!!!Q1(!!(A!!(2ND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-!#5.M98.T)%^V>!!+1#%&4'^B:$]!-%"Q!"Y!!"U<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1"F!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-79V"S<X2P9W^M6'6T>(.%982B,G.U<!!K1&!!#1!&!!9!"Q!)!!E!#Q!I!#E!$1R5:8.U=U2B>'%A37Y!!""!-P````](5'&U;#"*<A!31(!!#!!"!!1!1A!!!V*F:A"B!0!!$!!$!#I!,1!O!#]!-!!R!$)!-Q!U!$5!.A-!!(A!!!U)!!!*!!!!#1!!!!U+!!!!!!!!$1=!!!A!!!!3!!!!%A!!!!A!!!!+!!!!%A!!$1!!!!!!#!!!!!!!!!!!!1!X!!!!!! + -1 + 0 + true + 1 + 1 + 1107821075 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!)9!!!!%1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!".!!Q!-37ZE:8B@6G&M>76T!!!21!-!#UFO:'6Y8U6S=G^S!!N!#A!%5G&U:1!!-%"Q!"Y!!"U<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!-1&-(6G&S;7&O>!!=1%!!!@````]!#A^"35.P<G:J:X6S982J<WY!D!$R!!!!!!!!!!)1<'FC8U2"57VY,GRW<'FC=!NF15F5?8"F,G.U<!"H1"9!"Q>7<WRU97>F$&2I:8*N<W.P>8"M:1J3:8.J=X2B<G.F$F*F=WFT>'&O9W6@5F2%&6*F=WFT>'&O9W6@6'BF=GVJ=X2P=A.36%1+6'BF=GVJ=X2P=A!(:5&*6(FQ:1!51%!!!@````]!$!>F15F5?8"F!"Y!.`````]!$C%!A!!!!!!"!!1!!!!"!!!!!!!!!":!1!!"`````Q!/#%.I97ZO:7RT!!"5!0!!$!!$!!1!"!!%!!5!"A!(!!A!#1!,!!U!$Q-!!(A!!!U)!!!!!!!!!!!!!!!!!!!1!!!!%!!!!"!!!!!1!!!!#A!!!B)!!!)1!!!#%A!!!!!"!"!!!!!! =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi (revision 65) =================================================================== 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 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/ReadE-Stop.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/ReadE-Stop.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/ReadE-Stop.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/ReadE-Stop.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/ReadE-Stop.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ClosePositioningUnit.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ClosePositioningUnit.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ClosePositioningUnit.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ClosePositioningUnit.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ClosePositioningUnit.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetDigOuts.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetDigOuts.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetDigOuts.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetDigOuts.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetDigOuts.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetPosition.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetPosition.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetPosition.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetPosition.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/GetPosition.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/InitPositioningUnit.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/InitPositioningUnit.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/InitPositioningUnit.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/InitPositioningUnit.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/InitPositioningUnit.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/Move.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/Move.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/Move.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/Move.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/Move.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ReadPressure.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ReadPressure.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ReadPressure.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ReadPressure.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/ReadPressure.vi (revision 65) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/SubVIs/WriteAO.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/WriteAO.vi b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/WriteAO.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/WriteAO.vi (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/SubVIs/WriteAO.vi (revision 65) Index: CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass b/CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass --- a/CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass (revision 64) +++ b/CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass (revision 65) @@ -411,7 +411,7 @@ 1115685392 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%.!!!!#1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#B!=!!?!!!6%W.M98.T8UB446!S,GRW9WRB=X-!#5.M98.T)%^V>!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1"5!0!!$!!$!!1!"!!%!!1!"1!%!!9!"Q!%!!1!"!-!!(A!!!U)!!!!!!!!!!!!!!!!!!!!!!!!D1=!!!!!!!#3!!!!#A!!!!!!!!!!!!!!!!!!!!!"!!A!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%D!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#B!=!!?!!!6%W.M98.T8UB446!S,GRW9WRB=X-!#5.M98.T)%^V>!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!71#%15G6M:7&T:6.F<7&Q;'^S:1!!6!$Q!!Q!!Q!%!!1!"!!%!!5!"!!'!!=!"!!)!!1$!!"Y!!!.#!!!!!!!!!!!!!!!!!!!!!!!!)U(!!!!!!!!EA!!!!I!!!!!!!!!#!!!!!!!!!!!!1!*!!!!!! -1 0 false @@ -657,7 +657,7 @@ true 1 1 - 1074536980 + 1107821072 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%F!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#B!=!!?!!!6%W.M98.T8UB446!S,GRW9WRB=X-!#5.M98.T)%^V>!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1!,1!-!"%&Y;8-!!'%!]!!-!!-!"!!%!!1!"!!&!!1!"A!(!!1!"!!)!Q!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!!."Q!!!!!!!"!!!!!+!!!!!!!!!!!!!!!1!!!.!!!!!!!)!!!!!!!!!!!"!!E!!!!! @@ -693,7 +693,7 @@ true 1 1 - 1074536980 + 1107821072 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3U!!!!.Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!"1!+!!!71%!!!P``````````!!9&37ZT:81!"U!+!!&9!!Q!1!!"`````Q!)!!>!#A!"71!-!%!!!@````]!#A!+!&!!!A!*!!M!$!"!!!(`````!!Q!%E"Q!!A!!1!.!&-!!!*971!!%!"1!!5!"A!'!!9!"A!'!""!=!!)!!%!$Q!6!!!"7A!91(!!#!!!!"M!!!J/97VF8U&Y;8-R!!!91(!!#!!!!"M!!!J/97VF8U&Y;8-S!!!91(!!#!!!!"M!!!J/97VF8U&Y;8-T!!!%!#%!'%"Q!!A!!1!5!!A!!!B"?'FT-6^6=!!!'E"Q!!A!!1!5!!A!!!J"?'FT-6^%<X>O!!!;1(!!#!!"!"1!#!!!#U&Y;8-S8V*J:WBU!"J!=!!)!!%!&!!)!!!+18BJ=T*@4'6G>!!!'%"Q!!A!!1!5!!A!!!B"?'FT-V^6=!!!'E"Q!!A!!1!5!!A!!!J"?'FT-V^%<X>O!!!)!$$`````!"!!1!!#``````````]!'Q!C1(!!#!!"!"Q!$1!!%UFO=W6U6'&C<'6@4'6B=GZJ<G=!"1!'!!!;1(!!#!!"!"Y!)A!!#E:P=G.F4'FN;81!!":!=!!)!!%!"A!3!!!(6G^M>'&H:1!01!I!#&:F<'^D;82Z!!!41!I!$%&D9W6M:8*B>'FP<A!!#U!+!!2+:8*L!!!-!&!!!Q!B!#)!)Q!I1(!!#!!"!#1!(A!!'%VP>GFO:V"B=G&N:82F=F^-:7&S<GFO:Q!!'E"Q!!A!!1!5!!A!!!J3:7:F=G6O9W69!!!;1(!!#!!"!"1!#!!!#F*F:G6S:7ZD:6E!!"J!=!!)!!%!&!!)!!!+5G6G:8*F<G.F7A!!(%"Q!!A!!1!5!!A!!!R3:7:F=G6O9W6976I!!!N!#A!&18BJ=T%!#U!+!!6"?'FT-A!,1!I!"5&Y;8-T!!Q!5!!$!#I!+Q!M!#*!=!!)!!%!,1!?!!!45G6M982J>G6.<X:J<G>4>'6Q=Q!?1(!!#!!"!#U!(A!!$E&C=W^M>82F47^W;7ZH!!!51(!!#!!"!"1!#!!!"5VP>G69!"2!=!!)!!%!&!!)!!!&47^W:6E!&%"Q!!A!!1!5!!A!!!6.<X:F7A!71(!!#!!"!"1!#!!!"UVP>G6976I!&%"Q!!A!!1!5!!A!!!24>'^Q!!"^!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-/9V*F:H.@18BF=SZD>'Q!3E"1!"I!$A!1!"%!%A!4!"5!&A!8!"A!'1!;!"U!(Q!A!#5!*A!H!#A!+1!O!#]!-!!R!$)!-Q!U#G.3:7:T8U&Y:8-!!&1!]!!-!!-!"!!%!!1!"!!%!!1!"!!&!!=!"!!V!Q!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!+!!!#%!!!!!!!!!!1!!!!!!%!.A!!!!! @@ -711,7 +711,7 @@ true 1 1 - 1082130960 + 1107821072 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%M!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"*!)1R*<GFU;7&M;8JF:$]!!#B!=!!?!!!6%W.M98.T8UB446!S,GRW9WRB=X-!#5.M98.T)%^V>!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!B$<'&T=S"*<A!!)%"1!!-!!!!"!!)4:8*S<X)A;7YA+'ZP)'6S=G^S+1"B!0!!$!!$!!1!"1!%!!1!"A!%!!=!#!!%!!1!"!-!!(A!!!U)!!!!!!!!#1!!!!!!!!!!!!!!$1=!!!!!!!!3!!!!#A!!!!!!!!!!!!!!!!!!$1!!!!!!#!!!!!!!!!!!!1!*!!!!!! @@ -720,7 +720,7 @@ true 1 1 - 1342710288 + 1107821072 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!&%!!!!$1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!#!!Q`````Q!E1%!!!P``````````!!1337ZT:82597*M:5RF98*O;7ZH!!!71$$`````$7^V>("V>#"T>(*J<G=!(%"!!!,``````````Q!'#EFO=W6U6'&C<'5!!!1!!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!^!#A!*7C".98BJ<86N!"J!1!!#``````````]!#AF*<H.F>%2B>'%!6!$Q!!Q!!Q!&!!=!#!!)!!A!#!!)!!E!#!!,!!A#!!"Y!!!.#!!!#1!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!!!!!#%!!!!!!!!!!!!1!-!!!!!! @@ -738,7 +738,7 @@ true 1 1 - 1342710288 + 1107821074 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$`!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!^!#A!)5(*F=X.V=G5!!#B!=!!?!!!6%W.M98.T8UB446!S,GRW9WRB=X-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!N!!Q!&37ZE:8A!6!$Q!!Q!!Q!%!!5!"!!%!!1!"!!'!!=!"!!)!!1$!!"Y!!!.#!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!%!!!!!I!!!!!!!!!%!!!!!!!!!!!!1!*!!!!!! @@ -747,7 +747,7 @@ true 1 1 - 1342710288 + 1107821072 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!3Y!!!!.Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!"1!+!!!;1%!!!P``````````!!9*37ZT:82%982B!!>!#A!"7!!-!%!!!@````]!#!!(1!I!!6E!$!"!!!(`````!!I!#A"1!!)!#1!,!!Q!1!!"`````Q!-!"*!=!!)!!%!$1"4!!!#7&E!!"!!5!!&!!9!"A!'!!9!"A!11(!!#!!"!!]!&1!!!6I!'%"Q!!A!!!!<!!!+4G&N:6^"?'FT-1!!'%"Q!!A!!!!<!!!+4G&N:6^"?'FT-A!!'%"Q!!A!!!!<!!!+4G&N:6^"?'FT-Q!!"!!B!"B!=!!)!!%!&!!)!!!)18BJ=T&@68!!!"J!=!!)!!%!&!!)!!!+18BJ=T&@2'^X<A!!'E"Q!!A!!1!5!!A!!!N"?'FT-F^3;7>I>!!;1(!!#!!"!"1!#!!!#E&Y;8-S8URF:H1!!"B!=!!)!!%!&!!)!!!)18BJ=T.@68!!!"J!=!!)!!%!&!!)!!!+18BJ=T.@2'^X<A!!#!!Q`````Q!1!%!!!P``````````!"M!)E"Q!!A!!1!=!!U!!".*<H.F>&2B9GRF8URF98*O;7ZH!!5!"A!!'E"Q!!A!!1!?!#)!!!J'<X*D:5RJ<7FU!!!71(!!#!!"!!9!%A!!"V:P<(2B:W5!$U!+!!B7:7RP9WFU?1!!%U!+!!R"9W.F<'6S982J<WY!!!N!#A!%3G6S;Q!!$!"1!!-!)1!C!#-!+%"Q!!A!!1!E!"Y!!"B.<X:J<G>198*B<76U:8*@4'6B=GZJ<G=!!"J!=!!)!!%!&!!)!!!+5G6G:8*F<G.F7!!!'E"Q!!A!!1!5!!A!!!J3:7:F=G6O9W6:!!!;1(!!#!!"!"1!#!!!#F*F:G6S:7ZD:6I!!"R!=!!)!!%!&!!)!!!-5G6G:8*F<G.F7&F;!!!,1!I!"5&Y;8-R!!N!#A!&18BJ=T)!#U!+!!6"?'FT-Q!-!&!!!Q!K!#M!,!!C1(!!#!!"!#U!(A!!%V*F<'&U;8:F47^W;7ZH5X2F=(-!(E"Q!!A!!1!N!"Y!!!Z"9H.P<(6U:5VP>GFO:Q!!&%"Q!!A!!1!5!!A!!!6.<X:F7!!51(!!#!!"!"1!#!!!"5VP>G6:!"2!=!!)!!%!&!!)!!!&47^W:6I!&E"Q!!A!!1!5!!A!!!>.<X:F7&F;!"2!=!!)!!%!&!!)!!!%5X2P=!!!@1$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T$G.3:7:T8U&Y:8-O9X2M!%J!5!!;!!Y!%!!2!")!%Q!6!"9!&Q!9!"E!'A!>!"]!)!!F!#9!*Q!I!#E!,A!P!$!!-1!S!$-!.!JD5G6G=V^"?'6T!!"5!0!!$!!$!!1!"!!%!!1!"!!%!!1!"1!%!!=!.1-!!(A!!!U)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#A!!!!!!!!)1!!!!%!!!!!!"!$9!!!!! @@ -774,7 +774,7 @@ true 1 1 - 1644691984 + 1107821072 =================================================================== 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 64) +++ b/builds/CurrentTester.exe (revision 65) Index: builds/data/Initialization.ini =================================================================== diff --git a/builds/data/Initialization.ini b/builds/data/Initialization.ini --- a/builds/data/Initialization.ini (revision 64) +++ b/builds/data/Initialization.ini (revision 65) @@ -1,7 +1,7 @@ [Tester] -TesterType = "HSMP2" -TesterName = "Hochstrommessplatz 2" -MaxCurrent = 2000 +TesterType = "SMP3" +TesterName = "Strommessplatz 3" +MaxCurrent = 130 MaxTemperature = 250 MaxAmbientTemperature = 50 TemperatureWarning- = 10 @@ -14,34 +14,34 @@ SensorsEnable 5 = "True" SensorsEnable 6 = "True" SensorsEnable 7 = "True" -SensorsEnable 8 = "True" -SensorsEnable 9 = "True" +SensorsEnable 8 = "False" +SensorsEnable 9 = "False" SensorsEnable 10 = "False" SensorsEnable 11 = "False" SensorsEnable 12 = "False" SensorsEnable 13 = "False" SensorsEnable 14 = "False" SensorsDescription. = "15" -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" +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 = "" VoltageDescription. = "5 2" -VoltageDescription 0 = "NI-9215: Ch0" +VoltageDescription 0 = "NI PXI-6281: Ch3" VoltageDescription 1 = "Prüflingsspannung [V]" -VoltageDescription 2 = "NI-9219_1: Ch2" -VoltageDescription 3 = "Zero Flux- Spannung [V]" +VoltageDescription 2 = "NI PXI-6281: Ch4" +VoltageDescription 3 = "Shunt- Spannung [V]" VoltageDescription 4 = "" VoltageDescription 5 = "Strom [A]" VoltageDescription 6 = "" @@ -51,235 +51,145 @@ CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] -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" +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" PowerSupply_MinCurrent = "0" PowerSupply_Check = False -PowerSupply_WarningPower = "4000,000000" -PowerSupply_AbortPower = "5000,000000" -PowerSupply_PID = "FALSE" -PowerSupply_PID_Time = "1,000000" +PowerSupply_WarningPower = "200,000000" +PowerSupply_AbortPower = "250,000000" +PowerSupply_PID = "False" +PowerSupply_PID_Time = "0,100000" PowerSupply_PID_ProportionalGain = "0,100000" PowerSupply_PID_IntegralTime = "0,180000" PowerSupply_PID_DerivativeTime = "0,000000" -AbortCurrentDifference = "0,000000" +AbortCurrentDifference = "50" Measurement_Channels. = "17" -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_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_Check = False Measurement_Delay = "1" -DMM_VISAName = "NI9219_1/ai3" -DMM_ContactLimits = " 0,000000 10,000000" +DMM_VISAName = "PXI1Slot3" +DMM_ContactLimits = " 0,0 1,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" 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" -[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" +[SMP3] +DMM_Function = "2-wire Resistance" +DMM_AutoRange = False +DMM_Range = "0,020000" +DMM_Resolution = "0,001000" Configuration_AI_Voltage. = "2" -Configuration_AI_Voltage 0.Maximum = "10,000000" -Configuration_AI_Voltage 0.Minimum = "-10,000000" +Configuration_AI_Voltage 0.Maximum = "5,000000" +Configuration_AI_Voltage 0.Minimum = "-5,000000" Configuration_AI_Voltage 0.InputTerminalConfiguration = "Differential" -Configuration_AI_Voltage 1.Maximum = "10,000000" -Configuration_AI_Voltage 1.Minimum = "0,000000" +Configuration_AI_Voltage 1.Maximum = "1,000000" +Configuration_AI_Voltage 1.Minimum = "-1,000000" Configuration_AI_Voltage 1.InputTerminalConfiguration = "Differential" -Configuration_AI_Thermocouple. = "15" +Configuration_AI_Thermocouple. = "8" Configuration_AI_Thermocouple 0.Maximum = "250,000000" -Configuration_AI_Thermocouple 0.Minimum = "0,000000" +Configuration_AI_Thermocouple 0.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 1.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 2.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 3.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 4.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 5.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 6.Minimum = "-200,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 = "0,000000" +Configuration_AI_Thermocouple 7.Minimum = "-200,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_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. = "4" +Configuration_AI_NI9219_Resistance 0.Maximum = "10500,000000" Configuration_AI_NI9219_Resistance 0.Minimum = "0,000000" -Configuration_AI_NI9219_Resistance 0.Configuration = "4-Wire" +Configuration_AI_NI9219_Resistance 0.Configuration = "2-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,224E-3 2,31E-4 3,938074E-9" +Configuration_AI_NI9219_Resistance 0.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" Configuration_AI_NI9219_Resistance 1.Maximum = "250,000000" -Configuration_AI_NI9219_Resistance 1.Minimum = "0,000000" +Configuration_AI_NI9219_Resistance 1.Minimum = "-200,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,224E-3 2,31E-4 3,938074E-9" +Configuration_AI_NI9219_Resistance 1.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" Configuration_AI_NI9219_Resistance 2.Maximum = "250,000000" -Configuration_AI_NI9219_Resistance 2.Minimum = "0,000000" +Configuration_AI_NI9219_Resistance 2.Minimum = "-200,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 = " 3,81E-3 -6,02E-7 -6E-12" +Configuration_AI_NI9219_Resistance 2.ABC = " 1,224312924E-3 2,308955523E-4 3,938074268E-9" Configuration_AI_NI9219_Resistance 3.Maximum = "250,000000" -Configuration_AI_NI9219_Resistance 3.Minimum = "0,000000" +Configuration_AI_NI9219_Resistance 3.Minimum = "-200,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_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. = "4" +Configuration_AI_NI9219_Type 0 = "Thermocouple" +Configuration_AI_NI9219_Type 1 = "Thermocouple" Configuration_AI_NI9219_Type 2 = "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" +Configuration_AI_NI9219_Type 3 = "Thermocouple" [DefaultValues] WorkingStroke = "0" @@ -292,7 +202,7 @@ Sensors+ 0 = "True" Sensors+ 1 = "True" Sensors+ 2 = "True" -Sensors+ 3 = "False" +Sensors+ 3 = "True" Sensors+ 4 = "False" Sensors+ 5 = "False" Sensors+ 6 = "False" @@ -330,7 +240,7 @@ [Pathes] User = "C:\Work\CurrentTester\support\User.txt" -ReportsFolder = "C:\Work\CurrentTester\support\ResultData" +ReportsFolder = "C:\Work\CurrentTester\support\ResultData_SMP3" ProtocolsFolder = "\\orion\G K S - Test1\01_Access\Anlagen" CurrentProfilesFolder = "\\orion\labview\CurrentTester\support\CurrentProfiles" Applicants = "C:\Work\CurrentTester\support\Applicants.txt" @@ -351,12 +261,12 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "30" +Info. = "26" 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 "Automatik" gebracht werden und die automatische Achsensteuerung soll aktiviert werden um den Test starten zu können oder den Strom manuell einzustellen!" +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 5 = "Test geladen" Info 6 = "Laufende Prüfung..." Info 7 = "Prüfung erfolgreich abgeschlossen" @@ -371,18 +281,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Info 24 = "Achsen werden initialisiert..." -Info 25 = "Referenzfahrt läuft..." -Info 26 = "X-Achse wird referenziert..." -Info 27 = "Y-Achse wird referenziert..." -Info 28 = "Z-Achse wird referenziert..." -Info 29 = "Position wird angefahren..." -Result. = "30" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -407,25 +313,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" -Result 24 = "" -Result 25 = "Einrichtbetrieb" -Result 26 = "Einrichtbetrieb" -Result 27 = "Einrichtbetrieb" -Result 28 = "Einrichtbetrieb" -Result 29 = "Einrichtbetrieb" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" Index: builds/data/Initialization_Evaluation.ini =================================================================== diff --git a/builds/data/Initialization_Evaluation.ini b/builds/data/Initialization_Evaluation.ini --- a/builds/data/Initialization_Evaluation.ini (revision 64) +++ b/builds/data/Initialization_Evaluation.ini (revision 65) @@ -47,7 +47,7 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +Info. = "26" 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" @@ -67,12 +67,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -97,19 +99,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" 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 64) +++ b/builds/data/Initialization_HSMP1.ini (revision 65) @@ -207,7 +207,7 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +Info. = "26" 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" @@ -227,12 +227,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -257,19 +259,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" Index: builds/data/Initialization_HSMP2.ini =================================================================== diff --git a/builds/data/Initialization_HSMP2.ini b/builds/data/Initialization_HSMP2.ini --- a/builds/data/Initialization_HSMP2.ini (revision 64) +++ b/builds/data/Initialization_HSMP2.ini (revision 65) @@ -351,12 +351,12 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "30" +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 "Automatik" gebracht werden und die automatische Achsensteuerung soll aktiviert werden 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" @@ -371,18 +371,20 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Info 24 = "Achsen werden initialisiert..." -Info 25 = "Referenzfahrt läuft..." -Info 26 = "X-Achse wird referenziert..." -Info 27 = "Y-Achse wird referenziert..." -Info 28 = "Z-Achse wird referenziert..." -Info 29 = "Position wird angefahren..." -Result. = "30" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +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" @@ -407,25 +409,30 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" -Result 24 = "" -Result 25 = "Einrichtbetrieb" -Result 26 = "Einrichtbetrieb" +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. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" Index: builds/data/Initialization_SMP3.ini =================================================================== diff --git a/builds/data/Initialization_SMP3.ini b/builds/data/Initialization_SMP3.ini --- a/builds/data/Initialization_SMP3.ini (revision 64) +++ b/builds/data/Initialization_SMP3.ini (revision 65) @@ -261,7 +261,7 @@ ProtocolFolderFormat = "%s_%s_Stromtest" [StateMessages] -Info. = "24" +Info. = "26" 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" @@ -281,12 +281,14 @@ Info 16 = "Testprotokoll wird erstellt... Bitte warten" Info 17 = "Testprotokoll erstellt" Info 18 = "Der letzte Test ist geladen..." -Info 19 = "Testdaten zur Testberichterstellung laden und auswählen" -Info 20 = "Testbericht wird erstellt... Bitte warten" -Info 21 = "Testbericht erstellt" -Info 22 = "Test ist gespeichert" -Info 23 = "Testdaten werden geändert... Bitte warten" -Result. = "24" +Info 19 = "Testdaten zur Testberichterstellung laden" +Info 20 = "Testdaten werden geladen... Bitte warten" +Info 21 = "Testdaten zur Testberichterstellung auswählen" +Info 22 = "Testbericht wird erstellt... Bitte warten" +Info 23 = "Testbericht erstellt" +Info 24 = "Test ist gespeichert" +Info 25 = "Testdaten werden geändert... Bitte warten" +Result. = "26" Result 0 = "Not-Halt" Result 1 = "" Result 2 = "Bereit" @@ -311,19 +313,24 @@ Result 21 = "Bereit" Result 22 = "Bereit" Result 23 = "Bereit" +Result 24 = "Bereit" +Result 25 = "Bereit" [DialogMessages] -Messages. = "10" +Messages. = "13" Messages 0 = "Achtung Einrichtbetrieb!\0AMögliche Gefahren:\0A-Klemmgefahr\0A-Heiße Oberflächen\0A-Lichtbogen" Messages 1 = "Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" Messages 2 = "Geben Sie die für die Testberichterstellung erforderlichen Daten ein. Bitte achten Sie darauf, dass alle Eingabefelder in der gewählten Sprache sind" -Messages 3 = "\0A\0A\0ADas Stromprofil für die gewählte Datengruppe ist nicht identisch!\0ABitte die Datenreihe mit dem nicht passenden Stromprofil entfernen" +Messages 3 = "\0A\0A\0AFür den ausgewählten Artikel sind mehrere Stromprofile verfügbar, eine kombinierte Anzeige ist daher nicht möglich!" Messages 4 = "Wählen Sie eine Testkonfigurationsdatei zum Laden aus" Messages 5 = "Wählen Sie einen Ordner aus, der die Testergebnisse zum Laden enthält" Messages 6 = "Wählen Sie einen ID-Ordner aus, der alle Testergebnisse zum Laden enthält" Messages 7 = "Die Merkzetteldaten werden gelöscht!\0ABitte bestätigen Sie die Operation oder schließen Sie das Dialogfeld, um den Vorgang abzubrechen ..." Messages 8 = "Sollen die Testmessdaten zur späteren Testberichtserstellung außerhalb des Stromtesters in das unten stehende Verzeichnis im Netzwerk kopiert werden?" Messages 9 = "Sollen die Testdaten geändert, bestehende Verzeichnisse umbenannt und vorhandene Excel- Testprotokolle überschrieben werden?" +Messages 10 = "Wählen Sie Artikel zum Laden aus" +Messages 11 = "Soll das unten stehende Verzeichnis erstellt werden?" +Messages 12 = "Zur Achsensteuerung mit freigegebenen Türen sollte der Zustimmtaster während der Bewegung gedrückt werden" [Tips] Text. = "2" =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: support/ReportTemplates/ProtocolTemplateEnglish.dotx =================================================================== diff --git a/support/ReportTemplates/ProtocolTemplateEnglish.dotx b/support/ReportTemplates/ProtocolTemplateEnglish.dotx --- a/support/ReportTemplates/ProtocolTemplateEnglish.dotx (revision 64) +++ b/support/ReportTemplates/ProtocolTemplateEnglish.dotx (revision 65)