Projects/PositioningSystem Commit

- Bug with disabled start button fixed

LabVIEW -

r60:61

parent child

PositioningSystem [LV2021]/Initialization.ini +42 -41

             [Tester]
-            TesterType = "SCP"
+            TesterType = "EHF1"
-            TesterName = "SCP-Tester"
+            TesterName = "Elektrischer Hochfrequenzmessplatz 1"
             [Dashboard]
-            Name = "SCP"
+            Name = "EHF1"
-            Path = "C:\Work\Labor-Dashboard\SCP.html"
+            Path = "C:\Work\Labor-Dashboard\EHF1.html"
             [cHardware]
             POSConfig.IP = "10.1.2.1"
             POS_AxesNames 0 = "X"
             POS_AxesNames 1 = "Y"
             POS_AxesNames 2 = "Z"
-            POS_Reference_Axes = "<size(s)=3> 1,000000 1,000000 -2,000000"
+            POS_Reference_Axes = "<size(s)=3> 1,000000 1,000000 110,000000"
-            POS_Limits_Axis1 = "<size(s)=2> 0 325"
+            POS_Limits_Axis1 = "<size(s)=2> 0 210"
-            POS_Limits_Axis2 = "<size(s)=2> 0 350"
+            POS_Limits_Axis2 = "<size(s)=2> 0 242"
-            POS_Limits_Axis3 = "<size(s)=2> -44 0"
+            POS_Limits_Axis3 = "<size(s)=2> 0 111"
             POS_AxesFlipped.<size(s)> = "3"
             POS_AxesFlipped 0 = "True"
             POS_AxesFlipped 1 = "True"
             POS_AxesFlipped 2 = "False"
-            Pos_MaxVelocity = "600"
+            Pos_MaxVelocity = "300"
             Pos_MaxVelocityUnblockedDoor = "20"
-            Pos_MaxAcceleration = "40000"
+            Pos_MaxAcceleration = "15000"
             Pos_MaxAccelerationUnblockedDoor = "20"
-            Pos_MaxJerk = "0"
+            Pos_MaxJerk = "140000"
             Pos_MaxJerkUnblockedDoor = "14000"
-            ForceLimit_Axis3 = "<size(s)=5> 10,000000 0,750000 0,780000 0,813000 0,920000"
+            ForceLimit_Axis3 = "<size(s)=5> 10,000000 5,000000 6,000000 7,000000 8,000000"
             ForceLimit_Axis3_Text.<size(s)> = "5"
             ForceLimit_Axis3_Text 0 = ""
             ForceLimit_Axis3_Text 1 = "�30 N"
             ForceLimit_Axis3_Text 4 = "�60 N"
             ForceLimit_Axis3_AO_Limits = "<size(s)=2> 0,000000 10,000000"
             AO_ForceLimit = "Dev0/Ao0"
-            DI_E-Stop = "Dev2/port0/line0"
+            DI_E-Stop = "Dev0/AuxPort/Di0"
-            DI_Door = "Dev2/port0/line1"
+            DI_Door = "Dev0/AuxPort/Di1"
             DC_Wait = "100"
             DC_Device_1 = "USB-6509"
             DC_Device_2 = "USB-6525"
             CameraWindow.<size(s)> = "2"
-            CameraWindow 0 = "Baumer Camera Explorer (64 Bit) v2.8.15736 "
+            CameraWindow 0 = "Kamera"
-            CameraWindow 1 = "Kamera"
+            CameraWindow 1 = "Baumer Camera Explorer (64 Bit) v2.8.15736 "
             DMMConfig.ResourceName = "COM1"
             DMMConfig.Baudrate = "9600"
             DMMConfig.ChannelList = "101,102,103,104,105,106,107,108,109,110"
-            ChargeMeterConfig.ResourceName = "COM2"
+            ChargeMeterConfig.ResourceName = "COM10"
             ChargeMeterConfig.Baudrate = "9600"
             NetworkAnalyser.Names.<size(s)> = "3"
             NetworkAnalyser.Names 0 = "Rohde & Schwarz (ZVA67)"
             NetworkAnalyser.CommonMemory.<size(s)> = "2"
             NetworkAnalyser.CommonMemory 0 = "Z:\"
             NetworkAnalyser.CommonMemory 1 = "D:\Testdaten\"
-            DOs.<size(s)> = "2"
-            DOs 0 = "Dev2/port4/line0"
-            DOs 1 = "Dev2/port4/line1"
             [cPathes]
             pUser = "C:\Work\PositioningSystem\support\User.txt"
             [cDefaultValues]
             MovingParameter.Velocity = "20,000000"
-            MovingParameter.Acceleration = "20,000000"
+            MovingParameter.Acceleration = "50,000000"
-            MovingParameter.Jerk = "0,000000"
+            MovingParameter.Jerk = "140000,000000"
             ForceLimit_Z = "0"
             Learning_Steps.Axis1 = "0,0500000"
             Learning_Steps.Axis2 = "0,0500000"
             CameraSubset.Bottom = "1048"
             [cStateMessages]
-            Info.<size(s)> = "30"
+            Info.<size(s)> = "32"
             Info 0 = "Not-Halt aktiviert!"
             Info 1 = "Einrichtbetrieb f�r Achsensteuerung aktiviert! Nur manuelle Positionierung m�glich"
             Info 2 = "T�r ist freigegeben! Nur manuelle Positionierung m�glich"
             Info 23 = "Messung wird durchgef�hrt..."
             Info 24 = "Lastwechsel wird ausgef�hrt..."
             Info 25 = "Test erfolgreich abgeschlossen"
-            Info 26 = "Fehler aufgetreten!"
+            Info 26 = "Test bestanden"
-            Info 27 = "Test abgebrochen!"
+            Info 27 = "Test fehlgeschlagen"
-            Info 28 = "Messergebnisse werden exportiert... Bitte warten"
+            Info 28 = "Fehler aufgetreten!"
-            Info 29 = "Messergebnisse wurden exportiert"
+            Info 29 = "Test abgebrochen!"
-            Result.<size(s)> = "30"
+            Info 30 = "Messergebnisse werden exportiert... Bitte warten"
+            Info 31 = "Messergebnisse wurden exportiert"
+            Result.<size(s)> = "32"
             Result 0 = "Not-Halt"
             Result 1 = ""
             Result 2 = ""
             Result 5 = "Einrichtbetrieb"
             Result 6 = "Einrichtbetrieb"
             Result 7 = ""
-            Result 8 = "Bereit"
+            Result 8 = ""
             Result 9 = "Einrichtbetrieb"
             Result 10 = "Einrichtbetrieb"
             Result 11 = "Einrichtbetrieb"
             Result 15 = "Einrichtbetrieb"
             Result 16 = "Einrichtbetrieb"
             Result 17 = "Einrichtbetrieb"
-            Result 18 = "Bereit"
+            Result 18 = ""
-            Result 19 = "Bereit"
+            Result 19 = ""
-            Result 20 = "Bereit"
+            Result 20 = ""
             Result 21 = "Test l�uft"
             Result 22 = "Test l�uft"
             Result 23 = "Einrichtbetrieb"
             Result 24 = "Test l�uft"
-            Result 25 = "Test fertig"
+            Result 25 = "Fertig"
-            Result 26 = "Fehler"
+            Result 26 = "Bestanden"
-            Result 27 = "Test Stop"
+            Result 27 = "Fehlgeschlagen"
-            Result 28 = ""
+            Result 28 = "Fehler"
-            Result 29 = ""
+            Result 29 = "Stop"
+            Result 30 = ""
+            Result 31 = ""
             [cDialogMessages]
             Messages.<size(s)> = "15"
             Messages 14 = "Kein HF-Testschritt mit Radiusmessung und Testbestehenskriterien"
             [cCAQ]
-            Login = "Tester-Labor"
+            Login = "EHF1-Tester"
-            Pw = "Tester1"
+            Pw = "EHF1-Tester"
-            AuthIDFile = "\\orion\G K S - Test1\CAQ.txt"
+            AuthIDFile = ""
-            AuthID = ""
+            AuthID = "XB2F9FAFD5559F4FB5B92FE524B40D8A3C"
             MAPNumber = 130
             LocationName = "GKS Montage HF-Tester"

PositioningSystem [LV2021]/Initialization_EHF1.ini +19 -15

             CameraSubset.Bottom = "1048"
             [cStateMessages]
-            Info.<size(s)> = "30"
+            Info.<size(s)> = "32"
             Info 0 = "Not-Halt aktiviert!"
             Info 1 = "Einrichtbetrieb f�r Achsensteuerung aktiviert! Nur manuelle Positionierung m�glich"
             Info 2 = "T�r ist freigegeben! Nur manuelle Positionierung m�glich"
             Info 23 = "Messung wird durchgef�hrt..."
             Info 24 = "Lastwechsel wird ausgef�hrt..."
             Info 25 = "Test erfolgreich abgeschlossen"
-            Info 26 = "Fehler aufgetreten!"
+            Info 26 = "Test bestanden"
-            Info 27 = "Test abgebrochen!"
+            Info 27 = "Test fehlgeschlagen"
-            Info 28 = "Messergebnisse werden exportiert... Bitte warten"
+            Info 28 = "Fehler aufgetreten!"
-            Info 29 = "Messergebnisse wurden exportiert"
+            Info 29 = "Test abgebrochen!"
-            Result.<size(s)> = "30"
+            Info 30 = "Messergebnisse werden exportiert... Bitte warten"
+            Info 31 = "Messergebnisse wurden exportiert"
+            Result.<size(s)> = "32"
             Result 0 = "Not-Halt"
             Result 1 = ""
             Result 2 = ""
             Result 5 = "Einrichtbetrieb"
             Result 6 = "Einrichtbetrieb"
             Result 7 = ""
-            Result 8 = "Bereit"
+            Result 8 = ""
             Result 9 = "Einrichtbetrieb"
             Result 10 = "Einrichtbetrieb"
             Result 11 = "Einrichtbetrieb"
             Result 15 = "Einrichtbetrieb"
             Result 16 = "Einrichtbetrieb"
             Result 17 = "Einrichtbetrieb"
-            Result 18 = "Bereit"
+            Result 18 = ""
-            Result 19 = "Bereit"
+            Result 19 = ""
-            Result 20 = "Bereit"
+            Result 20 = ""
             Result 21 = "Test l�uft"
             Result 22 = "Test l�uft"
             Result 23 = "Einrichtbetrieb"
             Result 24 = "Test l�uft"
-            Result 25 = "Test fertig"
+            Result 25 = "Fertig"
-            Result 26 = "Fehler"
+            Result 26 = "Bestanden"
-            Result 27 = "Test Stop"
+            Result 27 = "Fehlgeschlagen"
-            Result 28 = ""
+            Result 28 = "Fehler"
-            Result 29 = ""
+            Result 29 = "Stop"
+            Result 30 = ""
+            Result 31 = ""
             [cDialogMessages]
             Messages.<size(s)> = "15"

PositioningSystem [LV2021]/Initialization_SCP.ini +19 -15

             CameraSubset.Bottom = "1048"
             [cStateMessages]
-            Info.<size(s)> = "30"
+            Info.<size(s)> = "32"
             Info 0 = "Not-Halt aktiviert!"
             Info 1 = "Einrichtbetrieb f�r Achsensteuerung aktiviert! Nur manuelle Positionierung m�glich"
             Info 2 = "T�r ist freigegeben! Nur manuelle Positionierung m�glich"
             Info 23 = "Messung wird durchgef�hrt..."
             Info 24 = "Lastwechsel wird ausgef�hrt..."
             Info 25 = "Test erfolgreich abgeschlossen"
-            Info 26 = "Fehler aufgetreten!"
+            Info 26 = "Test bestanden"
-            Info 27 = "Test abgebrochen!"
+            Info 27 = "Test fehlgeschlagen"
-            Info 28 = "Messergebnisse werden exportiert... Bitte warten"
+            Info 28 = "Fehler aufgetreten!"
-            Info 29 = "Messergebnisse wurden exportiert"
+            Info 29 = "Test abgebrochen!"
-            Result.<size(s)> = "30"
+            Info 30 = "Messergebnisse werden exportiert... Bitte warten"
+            Info 31 = "Messergebnisse wurden exportiert"
+            Result.<size(s)> = "32"
             Result 0 = "Not-Halt"
             Result 1 = ""
             Result 2 = ""
             Result 5 = "Einrichtbetrieb"
             Result 6 = "Einrichtbetrieb"
             Result 7 = ""
-            Result 8 = "Bereit"
+            Result 8 = ""
             Result 9 = "Einrichtbetrieb"
             Result 10 = "Einrichtbetrieb"
             Result 11 = "Einrichtbetrieb"
             Result 15 = "Einrichtbetrieb"
             Result 16 = "Einrichtbetrieb"
             Result 17 = "Einrichtbetrieb"
-            Result 18 = "Bereit"
+            Result 18 = ""
-            Result 19 = "Bereit"
+            Result 19 = ""
-            Result 20 = "Bereit"
+            Result 20 = ""
             Result 21 = "Test l�uft"
             Result 22 = "Test l�uft"
             Result 23 = "Einrichtbetrieb"
             Result 24 = "Test l�uft"
-            Result 25 = "Test fertig"
+            Result 25 = "Fertig"
-            Result 26 = "Fehler"
+            Result 26 = "Bestanden"
-            Result 27 = "Test Stop"
+            Result 27 = "Fehlgeschlagen"
-            Result 28 = ""
+            Result 28 = "Fehler"
-            Result 29 = ""
+            Result 29 = "Stop"
+            Result 30 = ""
+            Result 31 = ""
             [cDialogMessages]
             Messages.<size(s)> = "15"

PositioningSystem [LV2021]/PositioningSystem.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/Close_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/Close_DMM.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/Close_NetworkAnalyser.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/ConfigMeasure_DMM.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/Init_DMM.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/MeasureForce.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/Reset_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/OverrideVIs/StartMeasure_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_EHF1/class_EHF1.lvclass +1 -1

             				<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">false</Property>
             				<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
             				<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
-            				<Property Name="NI.ClassItem.State" Type="Int">1082139152</Property>
+            				<Property Name="NI.ClassItem.State" Type="Int">1082139156</Property>
             			</Item>
             		</Item>
             		<Item Name="PositioningUnit" Type="Folder">

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/Dialog_MeasureDC.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/Dialog_ResistanceForceDistance.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/InitTest.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/Test.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/TestRun_HFMeasurement.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/fgvButtons.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/SubVIs/fgvInfo.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_PositioningSystem/class_PositioningSystem.lvclass +1 -1

             				<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
             				<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
             				<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
-            				<Property Name="NI.ClassItem.State" Type="Int">1082139154</Property>
+            				<Property Name="NI.ClassItem.State" Type="Int">1082139158</Property>
             			</Item>
             			<Item Name="PositioningUnit_GetPosition.vi" Type="VI" URL="../SubVIs/PositioningUnit_GetPosition.vi">
             				<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">)1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!'\!!!!$A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!!N!#A!&amp;18BJ=T%!#U!+!!6"?'FT-A!,1!I!"5&amp;Y;8-T!&amp;A!]1!!!!!!!!!#(W.M98.T8V"P=WFU;7^O;7ZH5XFT&gt;'6N,GRW9WRB=X-.9V"P=WFU;7^O,G.U&lt;!!C1&amp;!!!Q!&amp;!!9!"R"D1X6S=G6O&gt;&amp;"P=WFU;7^O!!!11#%+47&amp;O&gt;7&amp;M47^E:1!!.%"Q!"Y!!#%@9WRB=X.@5'^T;82J&lt;WZJ&lt;G&gt;4?8.U:7UO&lt;(:D&lt;'&amp;T=Q!*1WRB=X-A4X6U!$2!=!!?!!!B(W.M98.T8V"P=WFU;7^O;7ZH5XFT&gt;'6N,GRW9WRB=X-!#%.M98.T)%FO!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!'%!]!!-!!-!"!!)!!E!"!!+!!1!#Q!-!!1!"!!%!Q!!?!!!$1A!!!!!!!!*!!!!#1!!!!!!!!!."Q!!!!!!!")!!!!+!!!!!!!!!!!!!!!!!!!.!!!!!!!)!!!!!!!!!!!"!!U!!!!!</Property>

PositioningSystem [LV2021]/class_SCP/OverrideVIs/Close_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/Close_DMM.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/Close_NetworkAnalyser.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/ConfigMeasure_DMM.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/Init_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/Init_DMM.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/MeasureForce.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/Reset_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/OverrideVIs/StartMeasure_ChargeMeter.vi 0 0

NO CONTENT: modified file

PositioningSystem [LV2021]/class_SCP/class_SCP.lvclass +1 -1

             				<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">false</Property>
             				<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
             				<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
-            				<Property Name="NI.ClassItem.State" Type="Int">1082139152</Property>
+            				<Property Name="NI.ClassItem.State" Type="Int">1082139156</Property>
             			</Item>
             		</Item>
             		<Item Name="PositioningUnit" Type="Folder">

builds/PositioningSystem.exe 0 0

NO CONTENT: modified file

General Comments 0

Write
Preview

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

No TODOs yet

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

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