=================================================================== 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 16) +++ b/CurrentTester [LabVIEW]/CurrentTester.vi (revision 17) Index: CurrentTester [LabVIEW]/Initialization.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization.ini b/CurrentTester [LabVIEW]/Initialization.ini --- a/CurrentTester [LabVIEW]/Initialization.ini (revision 16) +++ b/CurrentTester [LabVIEW]/Initialization.ini (revision 17) @@ -45,13 +45,13 @@ PowerSupply_WarningPower = "4700,000000" PowerSupply_AbortPower = "4750,000000" PowerSupply_PID = "TRUE" -PowerSupply_PID_Time = "0,500000" -PowerSupply_PID_ProportionalGain = "1,000000" -PowerSupply_PID_IntegralTime = "0,010000" +PowerSupply_PID_Time = "0,200000" +PowerSupply_PID_ProportionalGain = "0,100000" +PowerSupply_PID_IntegralTime = "0,180000" PowerSupply_PID_DerivativeTime = "0,000000" -AbortCurrentDifference = "10,000000" +AbortCurrentDifference = "20,000000" Measurement_Channels. = "13" -Measurement_Channels 0 = "102" +Measurement_Channels 0 = "112" Measurement_Channels 1 = "102" Measurement_Channels 2 = "104" Measurement_Channels 3 = "106" @@ -67,14 +67,12 @@ ShuntResistance = 0,00006 Measurement_Check = False DMM_VISAName = "COM1" -DMM_ContactLimits = " 0,000000 0,050000" +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" TemperatureOffset = " 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" VoltageOffset = " 0,000000 0,000000 0,000000 0,000000" AllowedContactFails = "2" -PowerSupply_PID_DerivativeTime_min = "0,000000" -PowerSupply_PID_IntegralTime_min = "0,010000" [SMP3] PowerSupply_VISAName = "COM4" @@ -189,7 +187,7 @@ PowerSupply_OverVoltageProtection = "9,000000" DMM_Baudrate = "9600" Measurement_Channels_AutoRange. = "13" -Measurement_Channels_AutoRange 0 = "TRUE" +Measurement_Channels_AutoRange 0 = "FALSE" Measurement_Channels_AutoRange 1 = "TRUE" Measurement_Channels_AutoRange 2 = "TRUE" Measurement_Channels_AutoRange 3 = "TRUE" @@ -202,7 +200,7 @@ Measurement_Channels_AutoRange 10 = "TRUE" Measurement_Channels_AutoRange 11 = "TRUE" Measurement_Channels_AutoRange 12 = "TRUE" -Measurement_Channels_Range = " 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" +Measurement_Channels_Range = " 30,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" Measurement_Channels_Resolution. = "13" Measurement_Channels_Resolution 0 = "6.5" Measurement_Channels_Resolution 1 = "6.5" @@ -217,7 +215,7 @@ Measurement_Channels_Resolution 10 = "6.5" Measurement_Channels_Resolution 11 = "6.5" Measurement_Channels_Resolution 12 = "6.5" -Resistance_Function = "Four-Wire Resistance" +Resistance_Function = "Resistance" Resistance_OffsetCompensation = "TRUE" TableControl_Out_LiftTable = "Dev1/port0/line5" TableControl_Out_SettingMode. = "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 16) +++ b/CurrentTester [LabVIEW]/Initialization_HSMP1.ini (revision 17) @@ -44,14 +44,14 @@ PowerSupply_Check = False PowerSupply_WarningPower = "4700,000000" PowerSupply_AbortPower = "4750,000000" -PowerSupply_PID = False -PowerSupply_PID_Time = 0,2 -PowerSupply_PID_ProportionalGain = 1 -PowerSupply_PID_IntegralTime = "0,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" +AbortCurrentDifference = "20" Measurement_Channels. = "13" -Measurement_Channels 0 = "102" +Measurement_Channels 0 = "112" Measurement_Channels 1 = "102" Measurement_Channels 2 = "104" Measurement_Channels 3 = "106" @@ -67,7 +67,7 @@ ShuntResistance = 0,00006 Measurement_Check = False DMM_VISAName = "COM1" -DMM_ContactLimits = " 0,0 0,05" +DMM_ContactLimits = " 0,0 10,0" TemperatureGain = " 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000" TemperatureOffset = " 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" @@ -187,7 +187,7 @@ PowerSupply_OverVoltageProtection = "9,000000" DMM_Baudrate = "9600" Measurement_Channels_AutoRange. = "13" -Measurement_Channels_AutoRange 0 = "TRUE" +Measurement_Channels_AutoRange 0 = "FALSE" Measurement_Channels_AutoRange 1 = "TRUE" Measurement_Channels_AutoRange 2 = "TRUE" Measurement_Channels_AutoRange 3 = "TRUE" @@ -200,7 +200,7 @@ Measurement_Channels_AutoRange 10 = "TRUE" Measurement_Channels_AutoRange 11 = "TRUE" Measurement_Channels_AutoRange 12 = "TRUE" -Measurement_Channels_Range = " 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" +Measurement_Channels_Range = " 30,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" Measurement_Channels_Resolution. = "13" Measurement_Channels_Resolution 0 = "6.5" Measurement_Channels_Resolution 1 = "6.5" 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 16) +++ b/CurrentTester [LabVIEW]/Initialization_SMP3.ini (revision 17) @@ -44,12 +44,12 @@ PowerSupply_Check = False PowerSupply_WarningPower = "780,000000" PowerSupply_AbortPower = "790,000000" -PowerSupply_PID = False -PowerSupply_PID_Time = 0,2 -PowerSupply_PID_ProportionalGain = 1 -PowerSupply_PID_IntegralTime = "0,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" +AbortCurrentDifference = "20" Measurement_Channels. = "12" Measurement_Channels 0 = "PXI1Slot5/ai4" Measurement_Channels 1 = "PXI1Slot5/ai5" @@ -186,7 +186,7 @@ PowerSupply_OverVoltageProtection = "9,000000" DMM_Baudrate = "9600" Measurement_Channels_AutoRange. = "13" -Measurement_Channels_AutoRange 0 = "TRUE" +Measurement_Channels_AutoRange 0 = "FALSE" Measurement_Channels_AutoRange 1 = "TRUE" Measurement_Channels_AutoRange 2 = "TRUE" Measurement_Channels_AutoRange 3 = "TRUE" @@ -199,7 +199,7 @@ Measurement_Channels_AutoRange 10 = "TRUE" Measurement_Channels_AutoRange 11 = "TRUE" Measurement_Channels_AutoRange 12 = "TRUE" -Measurement_Channels_Range = " 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" +Measurement_Channels_Range = " 30,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" Measurement_Channels_Resolution. = "13" Measurement_Channels_Resolution 0 = "6.5" Measurement_Channels_Resolution 1 = "6.5" =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckPIDTime.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckPIDTime.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckPIDTime.vi new file mode 10644 --- /dev/null (revision 0) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckPIDTime.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckTemperatureLimits.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckTemperatureLimits.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckTemperatureLimits.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckTemperatureLimits.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckTemperatureLimits.vi (revision 17) =================================================================== 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 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Delay_GetPower.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogCurrentChart.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogCurrentChart.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogCurrentChart.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogCurrentChart.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/DialogCurrentChart.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ExecuteDialogCurrentChart.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ExecuteDialogCurrentChart.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ExecuteDialogCurrentChart.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ExecuteDialogCurrentChart.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ExecuteDialogCurrentChart.vi (revision 17) =================================================================== 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 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Finish.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Finish.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Finish.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Finish.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/ICT_Finish.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Setup_GetCurrent.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Setup_GetCurrent.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Setup_GetCurrent.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Setup_GetCurrent.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/Setup_GetCurrent.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvCurrent.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvCurrent.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvCurrent.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvCurrent.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvCurrent.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStopSubPanel.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStopSubPanel.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStopSubPanel.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStopSubPanel.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvStopSubPanel.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvSystem.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvSystem.vi b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvSystem.vi --- a/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvSystem.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/fgvSystem.vi (revision 17) =================================================================== 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 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/Setup_Machine.vi (revision 17) 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 16) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/class_CurrentTester.lvclass (revision 17) @@ -831,7 +831,7 @@ 1107821058 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%]!!!!$A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!%5!$!!N5;7VF<X6U)%^V>!!.1!I!"U.V=H*F<H1!$E!B#&.U<X!A4X6U!!!%!!!!$%!B"V.U<X!A37Y!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!"&!!Q!+6'FN:7^V>#"*<A!!%5!+!!J$>8*S:7ZU)%FO!!!P1"9!"!2*<GFU"&*F971*6X*J>'6%982B#6>S;82F5X2P=!!*4X"F=G&U;7^O!&1!]!!-!!-!"!!&!!9!"Q!(!!=!#!!*!!I!#Q!-!A!!?!!!$1A!!!E!!!!*!!!!#1!!!!!!!!!!!!!!!!!!!!A!!!!)!!!!#!!!!!A!!!!)!!!!!!%!$1!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!&+!!!!$A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!%5!$!!N5;7VF<X6U)%^V>!!.1!I!"U.V=H*F<H1!$E!B#&.U<X!A4X6U!!!%!!!!$%!B"V.U<X!A37Y!&E"1!!-!!!!"!!)):8*S<X)A;7Y!!"&!!Q!+6'FN:7^V>#"*<A!!%5!+!!J$>8*S:7ZU)%FO!!!^1"9!"12*<GFU"&*F971*6X*J>'6%982B#6>S;82F5X2P=!R8=GFU:62J<76P>81!!!F0='6S982J<WY!6!$Q!!Q!!Q!%!!5!"A!(!!=!"Q!)!!E!#A!,!!Q#!!"Y!!!.#!!!#1!!!!E!!!!*!!!!!!!!!!!!!!!!!!!!#!!!!!A!!!!)!!!!#!!!!!A!!!!!!1!.!!!!!! -1 0 true @@ -1096,6 +1096,15 @@ 1 1082143248 + + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$R!!!!#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!#E!B"':B;7Q!!!A!-0````]!%!"!!!,``````````Q!(!"*!=!!)!!%!#!!.!!!$5G6G!&1!]!!-!!-!"!!%!!1!"!!%!!1!"!!&!!9!"!!*!Q!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!%!!!!!!!!!!1!!!!!!%!#A!!!!! + -1 + 0 + true + 1 + 1 + 1342710288 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!'D!!!!$Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!"*!)1R1<X>F=F>B=GZJ<G=!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!'5!$!".$>8*S:7ZU5(*P:GFM:5FO:'6Y!">!!Q!11X6S=G6O>%2B>'&*<G2F?!!!$U!+!!B%>8*B>'FP<A!!$5!+!!>/>7VF=GFD!"J!1!!"`````Q!+$%VF98.V=G6N:7ZU=Q!!81$R!!!!!!!!!!)<9WRB=X.@1X6S=G6O>&2F=X2F=CZM>G.M98.T&'.$>8*S:7ZU6'6T>%2B>'%O9X2M!#2!5!!%!!=!#!!*!!M19U.V=H*F<H25:8.U2'&U91!!%5!+!!J1<X>F=ERJ<7FU!!"5!0!!$!!$!!1!"!!&!!1!"!!%!!1!"A!-!!1!$1)!!(A!!!U)!!!!!!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!"!!!!!!!!!!%!!!!!!"!!Y!!!!! -1 @@ -1106,13 +1115,13 @@ 1342972416 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%%!!!!$!!-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!+!!!91%!!!@````]!"AN5:7VQ:8*B>(6S:1!)!$$`````!"!!1!!#``````````]!#!!31(!!#!!"!!E!$1!!!V*F:A"5!0!!$!!$!!1!"!!%!!1!"!!%!!1!"1!(!!1!#A-!!(A!!!U)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%A!!!B!!!!!!!!!!%!!!!!!"!!M!!!!! - -1 - 0 - true - 1 - 1 - 1107821073 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%:!!!!$1!-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!+!!!91%!!!@````]!"AN5:7VQ:8*B>(6S:1!61!I!$EVB?&2F<8"F=G&U>8*F!!!)!$$`````!"!!1!!#``````````]!#1!31(!!#!!"!!I!$1!!!V*F:A"5!0!!$!!$!!1!"!!%!!1!"!!%!!1!"1!(!!A!#Q-!!(A!!!U)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%A!!!B!!!!!1!!!!%!!!!!!"!!Q!!!!! + -1 + 0 + true + 1 + 1 + 1342710290 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%H!!!!"A!%!!!!%U!+!!R%>8*B>'FP<C"P>81!!*5!]1!!!!!!!!!#'W.M98.T8U.V=H*F<H25:8.U:8)O<(:D<'&T=R^F2(6S982J<WZ$<WZW:8*T;7^O2H6O9X2J<WYO9X2M!&&!&A!$%%.P<H:F=H25<UVJ<H6U:8-11W^O>G6S>&2P5W6D<WZE=Q>$<WZW:8*U!"NF2(6S982J<WZ$<WZW:8*T;7^O2H6O9X2J<WY!%5!+!!N%>8*B>'FP<C"J<A!/1#%)47FO>82F=T]!!&1!]!!-!!!!!!!"!!!!!!!!!!!!!A!!!!!!!Q!%!A!!?!!!!!!!!!!!!!!.#A!!!!!!!!!!!!!!!!!!!!!!!"!!!!!!!!!!!!!!!")!!!!1!!!!!!%!"1!!!!! @@ -1611,13 +1620,13 @@ 1342710290 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!(C!!!!&1!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!V!!Q!(6'FN:7^V>!!41!I!$5^V>("V>%.V=H*F<H1!-%"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#%$5%F%!"&!#A!+5W6U1X6S=G6O>!!!$U!+!!B1352@6'FN:1!!#5!+!!*,9Q!!$5!+!!:5;6^N;7Y!!!V!#A!'6'2@<7FO!!!91&!!!Q!.!!Y!$QJ198*B<76U:8*T!!!31&!!"!!+!!M!$!!1!V"*2!!61!-!$E2F:G&V<(25;7VF<X6U!!!/1#%)5WFN>7RB>'5!!'%!]!!-!!-!"!!&!!9!"!!(!!1!#!!*!"%!%A!4!Q!!?!!!$1A!!!!!!!!.#A!!#1!!!!!!!!!."Q!!!!!!!")!!!!+!!!!%!!!!")!!!!1!!!.!!!!!!!)!!!!!!!!!!!"!"1!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!(.!!!!&Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!#E!B"%:B;7Q!!!V!!Q!(6'FN:7^V>!!41!I!$5^V>("V>%.V=H*F<H1!%%!B#F*F;7ZJ>#"0>81!!!1!!!!/1#%*5G6J<GFU)%FO!$"!=!!?!!!>'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!#%!B!V"*2!!21!I!#F.F>%.V=H*F<H1!!!^!#A!)5%F%8V2J<75!!!F!#A!#3W-!!!V!#A!'6'F@<7FO!!!.1!I!"F2E8WVJ<A!!'%"1!!-!$Q!1!"%+5'&S97VF>'6S=Q!!%E"1!!1!$!!.!!Y!%A.1351!&5!$!!Z%:7:B>7RU6'FN:7^V>!!!$E!B#&.J<86M982F!!"5!0!!$!!$!!1!"1!'!!=!#!!*!!I!#Q!4!"1!&1-!!(A!!!U)!!!*!!!!$1I!!!E!!!!."A!!!!!!!")!!!!3!!!!#A!!!"!!!!!3!!!!%!!!!!!"!"9!!!!! -1 128 true 1 1 - 1107821072 + 1342710291 )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-A37Y!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!&E!B%6.L;8"$<'&T=U6Y9WBB<G>F!&1!]!!-!!-!"!!%!!1!"!!%!!1!"1!'!!1!"Q!%!Q!!?!!!#1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!!+!!!!!!!!!!I!!!!!!!!!!!%!#!!!!!! =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_PowerSupply.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_PowerSupply.vi b/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_PowerSupply.vi --- a/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_PowerSupply.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_PowerSupply.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_Resistance.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_Resistance.vi b/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_Resistance.vi --- a/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_Resistance.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_HSMP1/OverrideVIs/Setup_Config_Resistance.vi (revision 17) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_SMP3/OverrideVIs/Setup_Config_PowerSupply.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_SMP3/OverrideVIs/Setup_Config_PowerSupply.vi b/CurrentTester [LabVIEW]/class_SMP3/OverrideVIs/Setup_Config_PowerSupply.vi --- a/CurrentTester [LabVIEW]/class_SMP3/OverrideVIs/Setup_Config_PowerSupply.vi (revision 16) +++ b/CurrentTester [LabVIEW]/class_SMP3/OverrideVIs/Setup_Config_PowerSupply.vi (revision 17) =================================================================== 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 16) +++ b/builds/CurrentTester.exe (revision 17) Index: builds/data/Initialization.ini =================================================================== diff --git a/builds/data/Initialization.ini b/builds/data/Initialization.ini --- a/builds/data/Initialization.ini (revision 16) +++ b/builds/data/Initialization.ini (revision 17) @@ -49,9 +49,9 @@ PowerSupply_PID_ProportionalGain = 1 PowerSupply_PID_IntegralTime = "0,000000" PowerSupply_PID_DerivativeTime = "0,000000" -AbortCurrentDifference = "0" +AbortCurrentDifference = "20" Measurement_Channels. = "13" -Measurement_Channels 0 = "102" +Measurement_Channels 0 = "112" Measurement_Channels 1 = "102" Measurement_Channels 2 = "104" Measurement_Channels 3 = "106" @@ -67,7 +67,7 @@ ShuntResistance = 0,00006 Measurement_Check = False DMM_VISAName = "COM1" -DMM_ContactLimits = " 0,0 0,05" +DMM_ContactLimits = " 0,0 10,0" TemperatureGain = " 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000" TemperatureOffset = " 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" @@ -187,7 +187,7 @@ PowerSupply_OverVoltageProtection = "9,000000" DMM_Baudrate = "9600" Measurement_Channels_AutoRange. = "13" -Measurement_Channels_AutoRange 0 = "TRUE" +Measurement_Channels_AutoRange 0 = "FALSE" Measurement_Channels_AutoRange 1 = "TRUE" Measurement_Channels_AutoRange 2 = "TRUE" Measurement_Channels_AutoRange 3 = "TRUE" @@ -200,7 +200,7 @@ Measurement_Channels_AutoRange 10 = "TRUE" Measurement_Channels_AutoRange 11 = "TRUE" Measurement_Channels_AutoRange 12 = "TRUE" -Measurement_Channels_Range = " 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" +Measurement_Channels_Range = " 30,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" Measurement_Channels_Resolution. = "13" Measurement_Channels_Resolution 0 = "6.5" Measurement_Channels_Resolution 1 = "6.5" 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 16) +++ b/builds/data/Initialization_HSMP1.ini (revision 17) @@ -49,9 +49,9 @@ PowerSupply_PID_ProportionalGain = 1 PowerSupply_PID_IntegralTime = "0,000000" PowerSupply_PID_DerivativeTime = "0,000000" -AbortCurrentDifference = "0" +AbortCurrentDifference = "20" Measurement_Channels. = "13" -Measurement_Channels 0 = "102" +Measurement_Channels 0 = "112" Measurement_Channels 1 = "102" Measurement_Channels 2 = "104" Measurement_Channels 3 = "106" @@ -67,7 +67,7 @@ ShuntResistance = 0,00006 Measurement_Check = False DMM_VISAName = "COM1" -DMM_ContactLimits = " 0,0 0,05" +DMM_ContactLimits = " 0,0 10,0" TemperatureGain = " 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000 1,000000" TemperatureOffset = " 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" @@ -187,7 +187,7 @@ PowerSupply_OverVoltageProtection = "9,000000" DMM_Baudrate = "9600" Measurement_Channels_AutoRange. = "13" -Measurement_Channels_AutoRange 0 = "TRUE" +Measurement_Channels_AutoRange 0 = "FALSE" Measurement_Channels_AutoRange 1 = "TRUE" Measurement_Channels_AutoRange 2 = "TRUE" Measurement_Channels_AutoRange 3 = "TRUE" @@ -200,7 +200,7 @@ Measurement_Channels_AutoRange 10 = "TRUE" Measurement_Channels_AutoRange 11 = "TRUE" Measurement_Channels_AutoRange 12 = "TRUE" -Measurement_Channels_Range = " 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" +Measurement_Channels_Range = " 30,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" Measurement_Channels_Resolution. = "13" Measurement_Channels_Resolution 0 = "6.5" Measurement_Channels_Resolution 1 = "6.5" 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 16) +++ b/builds/data/Initialization_SMP3.ini (revision 17) @@ -45,11 +45,11 @@ PowerSupply_WarningPower = "780,000000" PowerSupply_AbortPower = "790,000000" PowerSupply_PID = False -PowerSupply_PID_Time = 0,2 -PowerSupply_PID_ProportionalGain = 1 -PowerSupply_PID_IntegralTime = "0,000000" +PowerSupply_PID_Time = 0,1 +PowerSupply_PID_ProportionalGain = 0,1 +PowerSupply_PID_IntegralTime = "0,180000" PowerSupply_PID_DerivativeTime = "0,000000" -AbortCurrentDifference = "0" +AbortCurrentDifference = "20" Measurement_Channels. = "12" Measurement_Channels 0 = "PXI1Slot5/ai4" Measurement_Channels 1 = "PXI1Slot5/ai5" @@ -186,7 +186,7 @@ PowerSupply_OverVoltageProtection = "9,000000" DMM_Baudrate = "9600" Measurement_Channels_AutoRange. = "13" -Measurement_Channels_AutoRange 0 = "TRUE" +Measurement_Channels_AutoRange 0 = "FALSE" Measurement_Channels_AutoRange 1 = "TRUE" Measurement_Channels_AutoRange 2 = "TRUE" Measurement_Channels_AutoRange 3 = "TRUE" @@ -199,7 +199,7 @@ Measurement_Channels_AutoRange 10 = "TRUE" Measurement_Channels_AutoRange 11 = "TRUE" Measurement_Channels_AutoRange 12 = "TRUE" -Measurement_Channels_Range = " 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" +Measurement_Channels_Range = " 30,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" Measurement_Channels_Resolution. = "13" Measurement_Channels_Resolution 0 = "6.5" Measurement_Channels_Resolution 1 = "6.5"