From 6b8c0b523cc158a71188aa219807a71ae73e1af3 Mon Sep 17 00:00:00 2001 From: Rolf Bork <rolf.bork@ligo.org> Date: Thu, 18 Jan 2018 23:11:12 +0000 Subject: [PATCH] Update to DAC Status MEDM screens based on IOP or User App. git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4639 6dcd42c9-f523-4c6d-aada-af552506706e --- src/epics/util/lib/Dac.pm | 6 ++++++ src/epics/util/lib/Dac18.pm | 6 ++++++ src/epics/util/lib/Dac20.pm | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/src/epics/util/lib/Dac.pm b/src/epics/util/lib/Dac.pm index a8de01904..5dd0e5d6a 100644 --- a/src/epics/util/lib/Dac.pm +++ b/src/epics/util/lib/Dac.pm @@ -261,15 +261,18 @@ sub createDac16Medm } # ************* Add Data Monitors *************************************************************************** + if($::adcMaster == 1) { # Add On Line Status Monitor $xpos = 26; $ypos = 52; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","0","0",$ecolors{green},$ecolors{red}); + } # Add Watchdog Status Monitor $xpos = 26; $ypos = 67; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","1","1",$ecolors{green},$ecolors{red}); # Add Overrange Status Monitor $xpos = 26; $ypos = 82; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","2","2",$ecolors{green},$ecolors{red}); + if($::adcMaster == 1) { # Add FIFO Status Monitor $xpos = 26; $ypos = 112; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","3","3",$ecolors{green},$ecolors{red}); @@ -285,12 +288,14 @@ sub createDac16Medm # Add ON LINE Label $xpos = 51; $ypos = 52; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"ON LINE",$ecolors{black}); + } # Add WATCHDOG Label $xpos = 51; $ypos = 67; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"WATCHDOG",$ecolors{black}); # Add OVERRANGE Label $xpos = 51; $ypos = 82; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"OVERRANGE",$ecolors{black}); + if($::adcMaster == 1) { # Add FIFO STATUS Label $xpos = 51; $ypos = 112; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"FIFO STATUS",$ecolors{black}); @@ -303,6 +308,7 @@ sub createDac16Medm # Add FIFO FULL Label $xpos = 81; $ypos = 162; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"FULL",$ecolors{black}); + } print OUTMEDM "$medmdata \n"; close OUTMEDM; diff --git a/src/epics/util/lib/Dac18.pm b/src/epics/util/lib/Dac18.pm index a569bbe17..90a08692a 100644 --- a/src/epics/util/lib/Dac18.pm +++ b/src/epics/util/lib/Dac18.pm @@ -258,15 +258,18 @@ sub createDac18Medm } # ************* Add Data Monitors *************************************************************************** + if($::adcMaster == 1) { # Add On Line Status Monitor $xpos = 26; $ypos = 52; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","0","0",$ecolors{green},$ecolors{red}); + } # Add Watchdog Status Monitor $xpos = 26; $ypos = 67; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","1","1",$ecolors{green},$ecolors{red}); # Add Overrange Status Monitor $xpos = 26; $ypos = 82; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","2","2",$ecolors{green},$ecolors{red}); + if($::adcMaster == 1) { # Add AI Chassis WD Status Monitor $xpos = 26; $ypos = 97; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","4","4",$ecolors{green},$ecolors{red}); @@ -285,12 +288,14 @@ sub createDac18Medm # Add ON LINE Label $xpos = 51; $ypos = 52; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"ON LINE",$ecolors{black}); + } # Add WATCHDOG Label $xpos = 51; $ypos = 67; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"WATCHDOG",$ecolors{black}); # Add OVERRANGE Label $xpos = 51; $ypos = 82; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"OVERRANGE",$ecolors{black}); + if($::adcMaster == 1) { # Add AI CHASSIS WD Label $xpos = 51; $ypos = 97; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"AI CHASSIS WD",$ecolors{black}); @@ -306,6 +311,7 @@ sub createDac18Medm # Add FIFO FULL Label $xpos = 81; $ypos = 162; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"FULL",$ecolors{black}); + } print OUTMEDM "$medmdata \n"; close OUTMEDM; diff --git a/src/epics/util/lib/Dac20.pm b/src/epics/util/lib/Dac20.pm index 42181137c..788cc792f 100644 --- a/src/epics/util/lib/Dac20.pm +++ b/src/epics/util/lib/Dac20.pm @@ -260,15 +260,18 @@ sub createDac20Medm } # ************* Add Data Monitors *************************************************************************** + if($::adcMaster == 1) { # Add On Line Status Monitor $xpos = 26; $ypos = 52; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","0","0",$ecolors{green},$ecolors{red}); + } # Add Watchdog Status Monitor $xpos = 26; $ypos = 67; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","1","1",$ecolors{green},$ecolors{red}); # Add Overrange Status Monitor $xpos = 26; $ypos = 82; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","2","2",$ecolors{green},$ecolors{red}); + if($::adcMaster == 1) { # Add AI Chassis WD Status Monitor $xpos = 26; $ypos = 97; $width = 12; $height = 12; $medmdata .= ("CDS::medmGen::medmGenByte") -> ($xpos,$ypos,$width,$height,"$site\:FEC-$dcuid\_DAC_STAT_$dacNum","4","4",$ecolors{green},$ecolors{red}); @@ -287,12 +290,14 @@ sub createDac20Medm # Add ON LINE Label $xpos = 51; $ypos = 52; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"ON LINE",$ecolors{black}); + } # Add WATCHDOG Label $xpos = 51; $ypos = 67; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"WATCHDOG",$ecolors{black}); # Add OVERRANGE Label $xpos = 51; $ypos = 82; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"OVERRANGE",$ecolors{black}); + if($::adcMaster == 1) { # Add AI CHASSIS WD Label $xpos = 51; $ypos = 97; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"AI CHASSIS WD",$ecolors{black}); @@ -308,6 +313,7 @@ sub createDac20Medm # Add FIFO FULL Label $xpos = 81; $ypos = 162; $width = 100; $height = 15; $medmdata .= ("CDS::medmGen::medmGenTextLeft") -> ($xpos,$ypos,$width,$height,"FULL",$ecolors{black}); + } print OUTMEDM "$medmdata \n"; close OUTMEDM; -- GitLab