Index: CurrentTester [LabVIEW]/CurrentTester.lvproj =================================================================== diff --git a/CurrentTester [LabVIEW]/CurrentTester.lvproj b/CurrentTester [LabVIEW]/CurrentTester.lvproj --- a/CurrentTester [LabVIEW]/CurrentTester.lvproj (revision 48) +++ b/CurrentTester [LabVIEW]/CurrentTester.lvproj (revision 49) @@ -1,7 +1,7 @@  - DisablePositioningUnit,True;DisableITECH,True; + DisablePositioningUnit,False;DisableITECH,False; 3 true true =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/CurrentTester.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/CurrentTester.vi b/CurrentTester [LabVIEW]/CurrentTester.vi --- a/CurrentTester [LabVIEW]/CurrentTester.vi (revision 48) +++ b/CurrentTester [LabVIEW]/CurrentTester.vi (revision 49) Index: CurrentTester [LabVIEW]/Initialization.ini =================================================================== diff --git a/CurrentTester [LabVIEW]/Initialization.ini b/CurrentTester [LabVIEW]/Initialization.ini --- a/CurrentTester [LabVIEW]/Initialization.ini (revision 48) +++ b/CurrentTester [LabVIEW]/Initialization.ini (revision 49) @@ -50,7 +50,7 @@ CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] -SimulateDevices = True +SimulateDevices = False DI_E-Stop = "" DI_Setup = "" PowerSupply_VISAName = "COM4" =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/SubVIs/CheckE-Stop.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_CurrentTester/Subpanels/CreateProtocol.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Close.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_DisableAxes.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_GetPosition.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Init.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PositioningUnit_Move.vi (revision 49) =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Close.vi =================================================================== diff --git a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Close.vi b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Close.vi --- a/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Close.vi (revision 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Close.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetCurrent.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_GetPower.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Init.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_Reset.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/PowerSupply_SetCurrent.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WriteForceLimit.vi (revision 49) =================================================================== 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/OverrideVIs/WritePressure.vi (revision 49) 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 48) +++ b/CurrentTester [LabVIEW]/class_HSMP2/class_HSMP2.lvclass (revision 49) @@ -347,7 +347,7 @@ 1644691985 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%>!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!""!)1J.97ZV97R.<W2F!!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!F$<'&T=S"0>81!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!)1WRB=X-A37Y!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!6!$Q!!Q!!Q!%!!1!"1!%!!9!"!!(!!A!"!!%!!1$!!"Y!!!.#!!!!!!!!!!!!!!*!!!!!!!!!)U(!!!!!!!!E!!!!!I!!!!!!!!!!!!!!!!!!!!!!1!*!!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%>!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!""!)1J.97ZV97R.<W2F!!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!F$<'&T=S"0>81!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!)1WRB=X-A37Y!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!6!$Q!!Q!!Q!%!!1!"1!%!!9!"!!(!!A!"!!%!!1$!!"Y!!!.#!!!!!!!!!!!!!!*!!!!!!!!!)U(!!!!!!!!EA!!!!I!!!!!!!!!!!!!!!!!!!!!!1!*!!!!!! -1 0 false @@ -356,7 +356,7 @@ 1115685392 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!(;!!!!%A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!B!)1*03Q!!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!*1WRB=X-A4X6U!!5!#A!!'E"Q!!A!!1!(!")!!!N1<X.J>'FP<F*F:A!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!01!I!#&:F<'^D;82Z!!!41!I!$%&D9W6M:8*B>'FP<A!!#U!+!!2+:8*L!!":!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59UVP>GFO:V"B=G&N:82F=CZD>'Q!)%"1!!-!#Q!-!!U047^W;7ZH5'&S97VF>'6S!"6!#A!/6'&S:W6U5'^T;82J<WY!!!N!!A!%18BJ=Q!!6!$Q!!Q!!Q!%!!5!"!!%!!9!#!!*!!I!$A!0!"!$!!"Y!!!.#!!!!!!!!!E!!!!!!!!!!!!!!)U(!!!1!!!!E!!!!!I!!!!1!!!!%!!!!"!!!!!!!1!2!!!!!! + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!(;!!!!%A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!!B!)1*03Q!!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!*1WRB=X-A4X6U!!5!#A!!'E"Q!!A!!1!(!")!!!N1<X.J>'FP<F*F:A!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!01!I!#&:F<'^D;82Z!!!41!I!$%&D9W6M:8*B>'FP<A!!#U!+!!2+:8*L!!":!0%!!!!!!!!!!BND<'&T=V^$>8*S:7ZU6'6T>'6S,GRW9WRB=X-59UVP>GFO:V"B=G&N:82F=CZD>'Q!)%"1!!-!#Q!-!!U047^W;7ZH5'&S97VF>'6S!"6!#A!/6'&S:W6U5'^T;82J<WY!!!N!!A!%18BJ=Q!!6!$Q!!Q!!Q!%!!5!"!!%!!9!#!!*!!I!$A!0!"!$!!"Y!!!.#!!!!!!!!!E!!!!!!!!!!!!!!)U(!!!1!!!!EA!!!!I!!!!1!!!!%!!!!"!!!!!!!1!2!!!!!! -1 0 false @@ -392,22 +392,22 @@ 1879581201 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$M!!!!#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-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!>!#A!"*1"5!0!!$!!$!!1!"!!%!!1!"!!%!!5!"A!%!!=!"!)!!(A!!!U)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#1!!!!#!!!!!!!!!!1!!!!!!!!!!!"!!A!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$M!!!!#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-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!>!#A!"*1"5!0!!$!!$!!1!"!!%!!1!"!!%!!5!"A!%!!=!"!-!!(A!!!U)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#1!!!!#A!!!!!!!!!1!!!!!!!!!!!"!!A!!!!! + -1 + 0 + false + 1 + 1 + 1115685392 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$U!!!!#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-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!^!#A!)5(*F=X.V=G5!!&1!]!!-!!-!"!!%!!1!"!!%!!1!"1!'!!1!"Q!%!A!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*!!!!!)!!!!!!!!!"!!!!!!!!!!!!%!#!!!!!! - -1 - 0 - false - 1 - 1 - 1115685377 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$U!!!!#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-!#%.M98.T)%FO!!!A1&!!!Q!!!!%!!B.F=H*P=C"J<C!I<G]A:8*S<X)J!!^!#A!)5(*F=X.V=G5!!&1!]!!-!!-!"!!%!!1!"!!%!!1!"1!'!!1!"Q!%!Q!!?!!!$1A!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*!!!!!+!!!!!!!!!")!!!!!!!!!!!%!#!!!!!! + -1 + 0 + false + 1 + 1 + 1115685393 )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!$%!!!!"!!%!!!!0%"Q!"Y!!#%1356'8UV02%*65SZM>GRJ9AZ$<'FF<H1O<(:D<'&T=Q!2356',6>F=GZF=C"$<'FF<H1!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!)1WRB=X-A37Y!!&1!]!!-!!!!!1!!!!!!!!!!!!!!!A!!!!!!!!!!!A!!?!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!Q!!!!! @@ -509,58 +509,58 @@ 0 - )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=!!!!!!!#1!!!!#!!!!!!!!!!!!!!!!!!!!!!"!!A!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )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!!!E!!!!!!!!!!!!!!!!!!!!!!!!!D1=!!!!!!!#1!!!!#A!!!!!!!!!!!!!!!!!!!!!"!!A!!!!! + -1 + 0 + false + 1 + 1 + 1115685392 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%A!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!".!#A!.4X6U=(6U1X6S=G6O>!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!F$<'&T=S"0>81!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!)1WRB=X-A37Y!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!6!$Q!!Q!!Q!%!!5!"!!%!!9!"!!(!!A!"!!%!!1#!!"Y!!!.#!!!!!!!!!E!!!!!!!!!!!!!!)U(!!!!!!!!E!!!!!A!!!!!!!!!!!!!!!!!!!!!!1!*!!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%A!!!!#A!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!"!!!!".!#A!.4X6U=(6U1X6S=G6O>!!I1(!!(A!!&2.D<'&T=V^)5UV1-CZM>G.M98.T!!F$<'&T=S"0>81!+%"Q!"Y!!"549WRB=X.@3&..5$)O<(:D<'&T=Q!)1WRB=X-A37Y!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO<S"F=H*P=CE!6!$Q!!Q!!Q!%!!5!"!!%!!9!"!!(!!A!"!!%!!1$!!"Y!!!.#!!!!!!!!!E!!!!!!!!!!!!!!)U(!!!!!!!!E!!!!!I!!!!!!!!!!!!!!!!!!!!!!1!*!!!!!! + -1 + 0 + false + 1 + 1 + 1107296784 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%F!!!!#Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!$5!+!!>$>8*S:7ZU!!N!#A!&5'^X:8)!"!!!!#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!'!!9!"Q!'!!A!#1!'!!9!"A)!!(A!!!U)!!!*!!!!#1!!!!!!!!!!!!!!D1=!!!!!!!#1!!!!#!!!!!!!!!!!!!!!!!!!!!!"!!I!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%F!!!!#Q!-1#%'=X2B>(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&!!!Q!!!!%!!AFF=H*P=C"P>81!$5!+!!>$>8*S:7ZU!!N!#A!&5'^X:8)!"!!!!#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!'!!9!"Q!'!!A!#1!'!!9!"A-!!(A!!!U)!!!*!!!!#1!!!!!!!!!!!!!!D1=!!!!!!!#1!!!!#A!!!!!!!!!!!!!!!!!!!!!"!!I!!!!! + -1 + 0 + false + 1 + 1 + 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=!!!!!!!#1!!!!#!!!!!!!!!!!!!!!!!!!!!!"!!A!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )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 + 0 + false + 1 + 1 + 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=!!!!!!!#1!!!!#!!!!!!!!!!!!!!!!!!!!!!"!!A!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )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=!!!!!!!#1!!!!#A!!!!!!!!!!!!!!!!!!!!!"!!A!!!!! + -1 + 0 + false + 1 + 1 + 1115685392 - )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%A!!!!#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!41!I!$5^V>("V>%.V=H*F<H1!6!$Q!!Q!!Q!%!!1!"!!%!!5!"!!'!!=!"!!)!!1#!!"Y!!!.#!!!!!!!!!!!!!!!!!!!!!!!!)U(!!!!!!!!E!!!!!A!!!!!!!!!%!!!!!!!!!!!!1!*!!!!!! - -1 - 0 - false - 1 - 1 - 1115685376 + )1#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!%A!!!!#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!41!I!$5^V>("V>%.V=H*F<H1!6!$Q!!Q!!Q!%!!1!"!!%!!5!"!!'!!=!"!!)!!1$!!"Y!!!.#!!!!!!!!!!!!!!!!!!!!!!!!)U(!!!!!!!!E!!!!!I!!!!!!!!!%!!!!!!!!!!!!1!*!!!!!! + -1 + 0 + false + 1 + 1 + 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 48) +++ b/builds/CurrentTester.exe (revision 49) Index: builds/data/Initialization.ini =================================================================== diff --git a/builds/data/Initialization.ini b/builds/data/Initialization.ini --- a/builds/data/Initialization.ini (revision 48) +++ b/builds/data/Initialization.ini (revision 49) @@ -36,7 +36,7 @@ SensorsDescription 12 = "NI-9219_3: Ch2" SensorsDescription 13 = "NI-9219_3: Ch3" SensorsDescription 14 = "NI-9219_3: Ch4" -VoltageDescription. = "4 2" +VoltageDescription. = "5 2" VoltageDescription 0 = "NI-9215: Ch1" VoltageDescription 1 = "Prüflingsspannung [V]" VoltageDescription 2 = "NI-9215: Ch2" @@ -45,6 +45,8 @@ VoltageDescription 5 = "Strom [A]" VoltageDescription 6 = "" VoltageDescription 7 = "Widerstand [mOhm]" +VoltageDescription 8 = "" +VoltageDescription 9 = "Leistung [W]" CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] @@ -90,8 +92,8 @@ 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" -VoltageOffset = " 0,000000 0,000000 0,000000 0,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] 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 48) +++ b/builds/data/Initialization_HSMP1.ini (revision 49) @@ -36,7 +36,7 @@ SensorsDescription 12 = "" SensorsDescription 13 = "" SensorsDescription 14 = "" -VoltageDescription. = "4 2" +VoltageDescription. = "5 2" VoltageDescription 0 = "Keithley: Ch2" VoltageDescription 1 = "Prüflingsspannung [V]" VoltageDescription 2 = "Keithley: Ch4" @@ -45,6 +45,8 @@ VoltageDescription 5 = "Strom [A]" VoltageDescription 6 = "" VoltageDescription 7 = "Widerstand [mOhm]" +VoltageDescription 8 = "" +VoltageDescription 9 = "Leistung [W]" CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] @@ -90,8 +92,8 @@ 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" -VoltageOffset = " 0,000000 0,000000 0,000000 0,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" [HSMP1] 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 48) +++ b/builds/data/Initialization_HSMP2.ini (revision 49) @@ -36,7 +36,7 @@ SensorsDescription 12 = "NI-9219_3: Ch2" SensorsDescription 13 = "NI-9219_3: Ch3" SensorsDescription 14 = "NI-9219_3: Ch4" -VoltageDescription. = "4 2" +VoltageDescription. = "5 2" VoltageDescription 0 = "NI-9215: Ch1" VoltageDescription 1 = "Prüflingsspannung [V]" VoltageDescription 2 = "NI-9215: Ch2" @@ -45,6 +45,8 @@ VoltageDescription 5 = "Strom [A]" VoltageDescription 6 = "" VoltageDescription 7 = "Widerstand [mOhm]" +VoltageDescription 8 = "" +VoltageDescription 9 = "Leistung [W]" CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] @@ -90,8 +92,8 @@ 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" -VoltageOffset = " 0,000000 0,000000 0,000000 0,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] 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 48) +++ b/builds/data/Initialization_SMP3.ini (revision 49) @@ -36,7 +36,7 @@ SensorsDescription 12 = "" SensorsDescription 13 = "" SensorsDescription 14 = "" -VoltageDescription. = "4 2" +VoltageDescription. = "5 2" VoltageDescription 0 = "NI PXI-6281: Ch4" VoltageDescription 1 = "Prüflingsspannung [V]" VoltageDescription 2 = "NI PXI-6281: Ch5" @@ -45,6 +45,8 @@ VoltageDescription 5 = "Strom [A]" VoltageDescription 6 = "" VoltageDescription 7 = "Widerstand [mOhm]" +VoltageDescription 8 = "" +VoltageDescription 9 = "Leistung [W]" CalibrationPassword = "48c8947f69c054a5caa934674ce8881d02bb18fb59d5a63eeaddff735b0e9801e87294783281ae49fc8287a0fd86779b27d7972d3e84f0fa0d826d7cb67dfefc" [Hardware] @@ -90,8 +92,8 @@ DMM_ContactLimits = " 0,000000 1,200000" 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" -VoltageOffset = " 0,000000 0,000000 0,000000 0,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]