From 41f4f7353a4b729f4fd9829a9109659cf37de9bc Mon Sep 17 00:00:00 2001
From: "ezekiel.dohmen" <ezekiel.dohmen@ligo.org>
Date: Thu, 25 Jul 2024 09:11:23 -0700
Subject: [PATCH] Starting to add dolphin timing xmit indicator
---
src/epics/util/lib/createKernelModuleBuildEnv.pm | 4 ++--
src/epics/util/lib/medmGenGdsTp.pm | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/epics/util/lib/createKernelModuleBuildEnv.pm b/src/epics/util/lib/createKernelModuleBuildEnv.pm
index 21c25f3f0..ba59d48e8 100644
--- a/src/epics/util/lib/createKernelModuleBuildEnv.pm
+++ b/src/epics/util/lib/createKernelModuleBuildEnv.pm
@@ -25,7 +25,7 @@ if ($::dolphinTiming > -1 or $::virtualiop == 2) {
}
print OUTM "USE_DOLPHIN_TIMING:=1\n";
}
-if ($::dolphin_time_xmit > -1) {
+if ($::dolphin_time_xmit > 0) {
if ( $::pciNet < 0 )
{
die "Error: Model is configured to transmit dolphin time (dolphin_time_xmit) but is not configured to be a dolphin node (pciRfm).";
@@ -182,7 +182,7 @@ if ($::iopModel > -1) { #************ SETUP FOR IOP ***************
print OUTM "ccflags-y += -DTEST_1PPS\n";
}
# Set to run IOP as time master for the Dolphin Network
- if ($::dolphin_time_xmit > -1) {
+ if ($::dolphin_time_xmit > 0) {
if ( $::pciNet < 0 )
{
die "Error: Model is configured to transmit dolphin time (dolphin_time_xmit) but is not configured to be a dolphin node (pciRfm).";
diff --git a/src/epics/util/lib/medmGenGdsTp.pm b/src/epics/util/lib/medmGenGdsTp.pm
index f6f549d8c..a04db96be 100644
--- a/src/epics/util/lib/medmGenGdsTp.pm
+++ b/src/epics/util/lib/medmGenGdsTp.pm
@@ -216,6 +216,12 @@ sub createGdsMedm
$xpos = 125; $ypos = 120; $width = 50; $height = 16;
$medmdata .= ("CDS::medmGen::medmGenTextDyn") -> ($xpos,$ypos,$width,$height,"ExtClk",$ecolors{green},"(A&255) == 0","$ifo\:FEC-$dcuid\_TIME_ERR");
+ if($iopModel == 1 && $::dolphin_time_xmit > 0 )
+ {
+ $xpos = 125; $ypos = 140; $width = 50; $height = 16;
+ $medmdata .= ("CDS::medmGen::medmGenText") -> ($xpos,$ypos,$width,$height,"timing xmit master",$ecolors{red});
+ }
+
# Following only for IOP
if($iopModel == 1 and $ioptype == 0 )
--
GitLab