Commit 60f52aea authored by Daniel Krebs's avatar Daniel Krebs
Browse files

Rename Msg, Add PID-Parameter-SVs; Bugs fixed. Tensile Stress PID-Control basically works.

parent 0a0b8fdb
......@@ -82,7 +82,7 @@ LVClassPath="GDP_Controller.lvlib:GDP_Controller.lvclass"
CS++BaseActor:CS++BaseActor.DefaultGUI="CS++GUIActor.lvlib:CS++GUIActor.lvclass"
CS++BaseActor:CS++BaseActor.LaunchDefaultGUI=False
CS++BaseActor:CS++BaseActor.ErrorDialog=False
CS++BaseActor:CS++BaseActor.PollingInterval_s=10.
CS++BaseActor:CS++BaseActor.PollingInterval_s=-1.
CS++BaseActor:CS++BaseActor.PVProxy="GDP-ControllerProxy"
CS++BaseActor:CS++BaseActor.LaunchPVProxy=True
......@@ -282,9 +282,10 @@ CS++BaseActor:CS++BaseActor.PVProxy="GDP-TensileStressActorProxy"
CS++BaseActor:CS++BaseActor.LaunchPVProxy=True
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CS++BaseActor:CS++BaseActor.WebPubMode=-1
GDP_TensileStress:GDP_TensileStress.PID-Kc=0.001
GDP_TensileStress:GDP_TensileStress.PID-Kc=0.1
GDP_TensileStress:GDP_TensileStress.PID-Ti=0.010
GDP_TensileStress:GDP_TensileStress.PID-Td=0.000
GDP_TensileStress:GDP_TensileStress.PID-Frequency=100.
[GDP-TensileStressActor.URLs]
#PollingMode="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PollingMode?.1"
......@@ -292,23 +293,24 @@ GDP_TensileStress:GDP_TensileStress.PID-Td=0.000
#PollingInterval="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PollingInterval?.1"
#PollingCounter="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PollingCounter?.1"
#PollingIterations="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PollingIterations?.1"
PID-Kc="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PID-Kc?.1"
PID-Ti="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PID-Ti?.1"
PID-Td="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PID-Td?.1"
PID-Enabled="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PID-Enabled?.1"
[GDP-TensileStressActorProxy]
LVClassPath="CS++PVProxy.lvlib:CS++PVProxy.lvclass"
CS++BaseActor:CS++BaseActor.DefaultGUI=""
CS++BaseActor:CS++BaseActor.LaunchDefaultGUI=False
CS++BaseActor:CS++BaseActor.ErrorDialog=True
CS++BaseActor:CS++BaseActor.PollingInterval_s=0.01
CS++BaseActor:CS++BaseActor.PollingInterval_s=-1
CS++PVProxy:CS++PVProxy.WorkerActor="GDP-TensileStressActor"
CS++PVProxy:CS++PVProxy.DelayedActivation=True
[GDP-TensileStressActorProxy.URLs]
Activate="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActorProxy_Activate?.1"
WorkerActor="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActorProxy_WorkerActor|1024?.1"
#Polling_Interval_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PollingInterval?.1"
#Polling_Start_Stop_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_PollingStartStop?.1"
#Polling_Iterations_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_SetPollingIterations?.1"
PID_Kc_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_Set-PID-KC?.1"
PID_Kc_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_Set-PID-Kc?.1"
PID_Ti_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_Set-PID-Ti?.1"
PID_Td_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_Set-PID-Td?.1"
PID_Enable_Msg="ni.var.psp://localhost/GDP-RT-SV/GDP-TensileStressActor_Set-PID-Enable?.1"
......@@ -26,7 +26,9 @@ Daniel Krebs, H.Brand, Planckstr. 1, 64291 Darmstadt, Germany.</Property>
<Property Name="varPersistentID:{1F20D810-D3E2-49FF-9724-37C547B33198}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_Velocity_0</Property>
<Property Name="varPersistentID:{22D03F4E-9A8B-46AC-A3A8-4F5DA4ADC637}" Type="Ref">/RT CompactRIO Target/CS++/Core/CSPP-Core-SV-RT.lvlib/myDeviceActor_DriverRevision</Property>
<Property Name="varPersistentID:{23473CE4-2106-408C-BF86-561D199A036C}" Type="Ref">/RT CompactRIO Target/CS++/Core/CSPP-Core-SV-RT.lvlib/myDeviceActor_SelfTest</Property>
<Property Name="varPersistentID:{23D295EF-120E-46BC-9FAD-3BB45849CE19}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-TensileStressActor_PID-Kc</Property>
<Property Name="varPersistentID:{23FD58B7-B204-419C-9D10-C5AFC4B58D59}" Type="Ref">/RT CompactRIO Target/CS++/Core/CSPP-Core-SV-RT.lvlib/myDeviceActor_ErrorMessage</Property>
<Property Name="varPersistentID:{252A0E4C-6EDC-41D9-BBA4-A1F5DC9F1C06}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-TensileStressActor_PID-Td</Property>
<Property Name="varPersistentID:{26F28B26-83E0-4F54-A299-EE40093317F4}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_Enable_1</Property>
<Property Name="varPersistentID:{280C327B-DDAE-4A2A-8C40-2690DB821FB7}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_Set-Acceleration_2</Property>
<Property Name="varPersistentID:{294E7034-5359-456A-8ADF-2D6124EA46F6}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_ModuleFault_1</Property>
......@@ -53,6 +55,7 @@ Daniel Krebs, H.Brand, Planckstr. 1, 64291 Darmstadt, Germany.</Property>
<Property Name="varPersistentID:{58CD4155-CACD-4EA0-8E5A-31E350F0BD26}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_DriveStatus_2</Property>
<Property Name="varPersistentID:{58EEC349-534D-4DB2-9C11-60FD49DB5370}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_Reset-Position</Property>
<Property Name="varPersistentID:{5B803E54-78C3-4542-9EEC-F52A8A86B833}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FC302_FirmwareRevision</Property>
<Property Name="varPersistentID:{616FE9FC-0B7E-4E2B-8445-984824DC8AEF}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-TensileStressActor_PID-Ti</Property>
<Property Name="varPersistentID:{618D1A18-BD09-499B-A4DD-382C52D10496}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_Set-Acceleration_0</Property>
<Property Name="varPersistentID:{6342806D-763A-492D-BD33-5AE613D88D73}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_DriverRevision</Property>
<Property Name="varPersistentID:{669A112E-B4CA-4CA4-B028-CE832A9DAAEA}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_PollingStartStop</Property>
......@@ -71,6 +74,7 @@ Daniel Krebs, H.Brand, Planckstr. 1, 64291 Darmstadt, Germany.</Property>
<Property Name="varPersistentID:{7C23C605-BEFE-4923-8ACF-8396DBB6AAB3}" Type="Ref">/RT CompactRIO Target/CS++/RT/CSPP-RTSystemHealth-SV.lvlib/Watchdog Status</Property>
<Property Name="varPersistentID:{7DDCF953-47CB-4B2F-AF57-91F9AE285A7F}" Type="Ref">/RT CompactRIO Target/CS++/Core/CSPP-Core-SV-RT.lvlib/myDeviceActor_ErrorCode</Property>
<Property Name="varPersistentID:{7EC3D4E1-EE74-4328-B823-6A8DB4961EBB}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FC302_Enabled</Property>
<Property Name="varPersistentID:{7F60D6FF-BB81-4740-9D99-0204F6E31DEB}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-TensileStressActor_PID-Enabled</Property>
<Property Name="varPersistentID:{82FEE8A2-F645-416E-8DBD-46A0DF5D9A19}" Type="Ref">/RT CompactRIO Target/CS++/RT/CSPP-RTSystemHealth-SV.lvlib/Disc Free V</Property>
<Property Name="varPersistentID:{854C0BD8-FE28-4717-B9B6-CD6BDFE8B8BE}" Type="Ref">/RT CompactRIO Target/CS++/Core/CSPP-Core-SV-RT.lvlib/myDeviceActor_SelftestResultCode</Property>
<Property Name="varPersistentID:{879E818A-F0D9-4065-A0DB-B20FE4975CA7}" Type="Ref">/RT CompactRIO Target/GDP/GDP-RT-SV.lvlib/GDP-FPGA_ModuleFault_2</Property>
......@@ -1543,7 +1547,7 @@ AddOutputFilter chunkFilter
<Property Name="Bld_targetDestDir" Type="Path">/home/lvuser/natinst/bin</Property>
<Property Name="Bld_userLogFile" Type="Path">../builds/GemDiskProduction-RT/RT CompactRIO Target/GemDiskProduction-RT/home/lvuser/natinst/bin/GemDiskProduction-RT_GemDiskProduction-RT_log.txt</Property>
<Property Name="Bld_userLogFile.pathType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_version.build" Type="Int">28</Property>
<Property Name="Bld_version.build" Type="Int">35</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">startup.rtexe</Property>
<Property Name="Destination[0].path" Type="Path">/home/lvuser/natinst/bin/startup.rtexe</Property>
......
......@@ -1545,6 +1545,46 @@ Source of value is a register of the frequency converter. See manual for details
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!I*!!!!"9!A!!!!!!"!""!-0````]'5X2S;7ZH!!!"!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="GDP-TensileStressActor_PID-Enabled" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:SingleWriter" Type="Str">True</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!"9!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="GDP-TensileStressActor_PID-Kc" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:SingleWriter" Type="Str">True</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"9!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="GDP-TensileStressActor_PID-Td" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:SingleWriter" Type="Str">True</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"9!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="GDP-TensileStressActor_PID-Ti" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
<Property Name="Network:SingleWriter" Type="Str">True</Property>
<Property Name="Network:UseBinding" Type="Str">False</Property>
<Property Name="Network:UseBuffering" Type="Str">False</Property>
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"9!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="GDP-TensileStressActor_Set-PID-Enable" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
<Property Name="Network:BuffSize" Type="Str">50</Property>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment