Commit 8364a3e8 authored by Holger Brand's avatar Holger Brand
Browse files

Add Handle WatchdogPollingStopped Msg; update submodules

parent 28a6f9e3
Subproject commit 120b910fecc98ed05264faefcaeebfdfed25d319
Subproject commit 109802f10f454fe0c246fed1a3102429db52a4dd
Subproject commit 33ca513663667c8db6af715d2dac491414342cfa
Subproject commit 6cec811c376bf86b4c5aba5f27555a6d4444a256
Subproject commit a533f77acc21754b99a272488145d78e6a401f40
Subproject commit 50153dd4c50d413edea38c380a396b5e6c9a88b8
Subproject commit 5004afdd0157f10c905b07ee077faff9d5dff484
Subproject commit 6500e787c227866b0a0b7583bd013420241fabe8
......@@ -46,6 +46,7 @@ Planckstr. 1, 64291 Darmstadt, Germany</Property>
<Item Name="Enable BMIL Chopper Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Enable BMIL Chopper Msg/Enable BMIL Chopper Msg.lvclass"/>
<Item Name="Enable BMIL Counting Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Enable BMIL Counting Msg/Enable BMIL Counting Msg.lvclass"/>
<Item Name="Enable BMIL DMA to File Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Enable BMIL DMA to File Msg/Enable BMIL DMA to File Msg.lvclass"/>
<Item Name="Handle WatchdogPollingStopped Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Handle WatchdogPollingStopped Msg/Handle WatchdogPollingStopped Msg.lvclass"/>
<Item Name="Handle WatchdogPVTimeout Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Handle WatchdogPVTimeout Msg/Handle WatchdogPVTimeout Msg.lvclass"/>
<Item Name="Launch BeamControlGUI Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Launch BeamControlGUI Msg/Launch BeamControlGUI Msg.lvclass"/>
<Item Name="Launch DSCAlarmViewer Msg.lvclass" Type="LVClass" URL="../UTCS_MainGUI Messages/Launch DSCAlarmViewer Msg/Launch DSCAlarmViewer Msg.lvclass"/>
......
......@@ -1218,6 +1218,7 @@ CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_Watchdog:Watchdog.WDTOMsg="UTCS_MainGUI.lvlib:Handle_WatchdogPVTimeout Msg.lvclass"
CSPP_Watchdog:Watchdog.WDPSMsg="UTCS_MainGUI.lvlib:Handle_WatchdogPollingStopped Msg.lvclass"
[Watchdog.URLs]
PollingCounter="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingDeltaT"
......
......@@ -474,8 +474,8 @@ Pyrometer-IL="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Pyrometer-IL"
Pyrometer-IL-Enabled="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Pyrometer-IL-Enabled"
Magnet-IL="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Magnet-IL"
Magnet-IL-Enabled="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Magnet-IL-Enabled"
Targetwheel-IL="ni.var.psp://localhost/UTCS_BMIL/BMIL_Targetwheel-IL"
Targetwheel-IL-Enabled="ni.var.psp://localhost/UTCS_BMIL/BMIL_Targetwheel-IL-Enabled"
Targetwheel-IL="ni.var.psp://localhost/UTCS_BMIL_SV/BMIL_Targetwheel-IL"
Targetwheel-IL-Enabled="ni.var.psp://localhost/UTCS_BMIL_SV/BMIL_Targetwheel-IL-Enabled"
Charge-State="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Charge-State"
Logging="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Logging"
Chopper-In="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Chopper-In"
......@@ -520,7 +520,7 @@ Enable_DMA_IQ_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Enable-DMA-IQ"
Enable_RatTrap_IL_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Enable-RatTrap-IL"
Enable_Pyrometer_IL_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Enable-Pyrometer-IL"
Enable_Magnet_IL_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Enable-Magnet-IL"
Enable_Targetwheel_IL_Msg="ni.var.psp://localhost/UTCS_BMIL/BMIL_Enable-Targetwheel-IL"
Enable_Targetwheel_IL_Msg="ni.var.psp://localhost/UTCS_BMIL_SV/BMIL_Enable-Targetwheel-IL"
Reset_Counter_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Reset-Counter"
Reset_DMA_IQ_Timeout_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Reset-DMA-IQ-Timeout"
Reset_Interlock_Msg="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Reset-Interlock"
......@@ -1153,7 +1153,6 @@ Target="ni.var.psp://kcpc080/UTCS_AE/Target"
Targetwheel-IL="ni.var.psp://kcpc080/UTCS_AE/Targetwheel-IL"
Targetwheel-IL-Enabled="ni.var.psp://kcpc080/UTCS_AE/Targetwheel-IL-Enabled"
Target-Temperature="ni.var.psp://kcpc080/UTCS_AE/Target-Temperature"
[InterlockGUI]
LVClassPath="UTCS_InterlockGUI.lvlib:UTCS_InterlockGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
......@@ -1198,7 +1197,57 @@ LVClassPath="UTCS_MainGUI.lvlib:UTCS_MainGUI.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
UTCS_MainGUI:UTCS_MainGUI.BMIL="BMIL"
UTCS_MainGUI:UTCS_MainGUI.Alarm="DSCAlarmViewer"
UTCS_MainGUI:UTCS_MainGUI.Watchdog="Watchdog"
[Watchdog]
LVClassPath="CSPP_Watchdog.lvlib:Watchdog.lvclass"
# '-MI-n' will be appended to actor name if AllowMultipleInstances=True
# Attention: AllowMultipleInstances=True ist incompatibe with LaunchPVProxy=True since proxy name need to be unique.
CSPP_BaseActor:CSPP_BaseActor.AllowMultipleInstances=False
CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
# Settings: "Ignore", "Auto", "User"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=60.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="WatchdogProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_Watchdog:Watchdog.WDTOMsg="UTCS_MainGUI.lvlib:Handle_WatchdogPVTimeout Msg.lvclass"
[Watchdog.URLs]
PollingCounter="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingCounter"
PollingDeltaT="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingDeltaT"
PollingInterval="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingInterval"
PollingIterations="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingIterations"
PollingMode="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingMode"
PollingTime="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_PollingTime"
[Watchdog.Alarm-URLs]
#Make sure that item follow lexical ordering. Alarm-PV_009, _010,...,_099,_100, etc.
#corresponding to comma separated list in Scale_PV_Msg in [PVScalerProxy.URLs]Watchdog_PV_Msg?Timeout
Alarm-PV_000="ni.var.psp://KCPC080/UTCS_AE/BMIL-WDAlarm?10"
Alarm-PV_001="ni.var.psp://KCPC080/UTCS_AE/RTCGC-WDAlarm?10"
Alarm-PV_002="ni.var.psp://KCPC080/UTCS_AE/TASCAGC-WDAlarm?10"
Alarm-PV_003="ni.var.psp://KCPC080/UTCS_AE/TPG300-1-WDAlarm?10"
Alarm-PV_004="ni.var.psp://KCPC080/UTCS_AE/TPG300-2-WDAlarm?10"
Alarm-PV_005="ni.var.psp://KCPC080/UTCS_AE/TPG300-3-WDAlarm?10"
Alarm-PV_006="ni.var.psp://KCPC080/UTCS_AE/TPG300-4-WDAlarm?10"
Alarm-PV_007="ni.var.psp://KCPC080/UTCS_AE/TPG300-5-WDAlarm?10"
Alarm-PV_008="ni.var.psp://KCPC080/UTCS_AE/Pyrometer-WDAlarm?10"
[WatchdogProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI=""
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="Watchdog"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=False
[WatchdogProxy.URLs]
Activate="ni.var.psp://localhost/CSPP-Watchdog-SV/WatchdogProxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP-Watchdog-SV/WatchdogProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_Set-PollingInterval"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_Set-PollingIterations"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Watchdog-SV/Watchdog_Set-PollingStartStop"
Watchdog_PV_Msg="ni.var.psp://KCPC080/UTCS_BMIL_SV/BMIL_PollingCounter,ni.var.psp://KCPC080/UTCS_MKS647_SV/RTCGC_PollingCounter,ni.var.psp://KCPC080/UTCS_MKS647_SV/TASCAGC_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-1_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-2_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-3_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-4_PollingCounter,ni.var.psp://KCPC080/UTCS_TPG300_SV/TPG300-5_PollingCounter,ni.var.psp://KCPC080/UTCS_IGA140_SV/IGA140_PollingCounter"
[A_ObjectManager]
LVClassPath="CSPP_ObjectManager.lvlib:CSPP_ObjectManager.lvclass"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
......@@ -1353,28 +1402,28 @@ CSPP_IGA140:CSPP_IGA140.ExposureTime=2
CSPP_IGA140:CSPP_IGA140.TSRMin=303
CSPP_IGA140:CSPP_IGA140.TSRMax=1273
[IGA140.URLs]
PollingCounter="ni.var.psp://localhost/CSPP_IGA140/IGA140_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/CSPP_IGA140/IGA140_PollingDeltaT?.1"
PollingInterval="ni.var.psp://localhost/CSPP_IGA140/IGA140_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/CSPP_IGA140/IGA140_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/CSPP_IGA140/IGA140_PollingMode?.1"
PollingTime="ni.var.psp://localhost/CSPP_IGA140/IGA140_PollingTime?.1"
ResourceName="ni.var.psp://localhost/CSPP_IGA140/IGA140_ResourceName"
DriverRevision="ni.var.psp://localhost/CSPP_IGA140/IGA140_DriverRevision"
FirmwareRevision="ni.var.psp://localhost/CSPP_IGA140/IGA140_FirmwareRevision"
SelftestResultCode="ni.var.psp://localhost/CSPP_IGA140/IGA140_SelftestResultCode"
SelftestResultMessage="ni.var.psp://localhost/CSPP_IGA140/IGA140_SelftestResultMessage"
ErrorCode="ni.var.psp://localhost/CSPP_IGA140/IGA140_ErrorCode"
ErrorMessage="ni.var.psp://localhost/CSPP_IGA140/IGA140_ErrorMessage"
AmbientTemperature="ni.var.psp://localhost/CSPP_IGA140/IGA140_AmbientTemperature"
ClearMaxTime="ni.var.psp://localhost/CSPP_IGA140/IGA140_ClearMaxTime"
DeviceTemperature="ni.var.psp://localhost/CSPP_IGA140/IGA140_DeviceTemperature"
Emissivity="ni.var.psp://localhost/CSPP_IGA140/IGA140_Emissivity"
ExposureTime="ni.var.psp://localhost/CSPP_IGA140/IGA140_ExposureTime"
Laser="ni.var.psp://localhost/CSPP_IGA140/IGA140_Laser"
Temperature="ni.var.psp://EELPC007/CSPP_IGA140/IGA140_Temperature"
TSRMin="ni.var.psp://localhost/CSPP_IGA140/IGA140_TSRMin"
TSRMax="ni.var.psp://localhost/CSPP_IGA140/IGA140_TSRMax"
PollingCounter="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_PollingDeltaT?.1"
PollingInterval="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_PollingMode?.1"
PollingTime="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_PollingTime?.1"
ResourceName="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_ResourceName"
DriverRevision="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_DriverRevision"
FirmwareRevision="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_FirmwareRevision"
SelftestResultCode="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_SelftestResultCode"
SelftestResultMessage="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_SelftestResultMessage"
ErrorCode="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_ErrorCode"
ErrorMessage="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_ErrorMessage"
AmbientTemperature="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_AmbientTemperature"
ClearMaxTime="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_ClearMaxTime"
DeviceTemperature="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_DeviceTemperature"
Emissivity="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Emissivity"
ExposureTime="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_ExposureTime"
Laser="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Laser"
Temperature="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Temperature"
TSRMin="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_TSRMin"
TSRMax="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_TSRMax"
[IGA140Proxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_IGA140GUI.lvlib:CSPP_IGA140GUI.lvclass"
......@@ -1383,19 +1432,19 @@ CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="IGA140"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[IGA140Proxy.URLs]
Activate="ni.var.psp://localhost/CSPP_IGA140/IGA140Proxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP_IGA140/IGA140Proxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-PollingStartStop?.1"
Reset_Device_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Reset"
Ambient_Temperature_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-AmbientTemperature"
Clear_Max_Time_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-ClearMaxTime"
Emissivity_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-Emissivity"
Exposure_Time_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-ExposureTime"
Laser_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-Laser"
Temperature_Subrange_Minimum_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-TSRMin"
Temperature_Subrange_Maximum_Msg="ni.var.psp://localhost/CSPP_IGA140/IGA140_Set-TSRMax"
Activate="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140Proxy_Activate"
WorkerActor="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140Proxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-PollingStartStop?.1"
Reset_Device_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Reset"
Ambient_Temperature_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-AmbientTemperature"
Clear_Max_Time_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-ClearMaxTime"
Emissivity_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-Emissivity"
Exposure_Time_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-ExposureTime"
Laser_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-Laser"
Temperature_Subrange_Minimum_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-TSRMin"
Temperature_Subrange_Maximum_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-TSRMax"
[IGA140GUI]
LVClassPath="CSPP_IGA140GUI.lvlib:CSPP_IGA140GUI.lvclass"
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
......
......@@ -1082,7 +1082,7 @@ Die sprachspezifischen Genehmigungen und Beschränkungen unter der Lizenz sind d
<Item Name="CSPP_AsyncCallbackMsg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_AsyncCallbackMsg/CSPP_AsyncCallbackMsg.lvlib"/>
<Item Name="CSPP_DataUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_DataUpdate Msg/CSPP_DataUpdate Msg.lvlib"/>
<Item Name="CSPP_PVUpdate Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_PVUpdate Msg/CSPP_PVUpdate Msg.lvlib"/>
<Item Name="CSPP_WatchdogTimeout Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_WatchdogTimeout Msg/CSPP_WatchdogTimeout Msg.lvlib"/>
<Item Name="CSPP_Watchdog Msg.lvlib" Type="Library" URL="../Packages/CSPP_Core/Messages/CSPP_Watchdog Msg/CSPP_Watchdog Msg.lvlib"/>
</Item>
<Item Name="CSPP_Core-errors.txt" Type="Document" URL="../Packages/CSPP_Core/CSPP_Core-errors.txt"/>
<Item Name="CSPP_Core.ini" Type="Document" URL="../Packages/CSPP_Core/CSPP_Core.ini"/>
......
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