From e07bd08c92eaa7075cce06d9451f60bc27b371d5 Mon Sep 17 00:00:00 2001 From: Gabriel Fedel Date: Wed, 31 Jan 2024 16:19:40 +0100 Subject: [PATCH] fix: PCIe-DC EVR does not have front panel inputs only universal ones Fixing the numbering and removing the front panel ones --- evrMrmApp/Db/evr-pcie-300dc.substitutions | 41 +++++++++-------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/evrMrmApp/Db/evr-pcie-300dc.substitutions b/evrMrmApp/Db/evr-pcie-300dc.substitutions index eef3494cd..9c3dd1647 100644 --- a/evrMrmApp/Db/evr-pcie-300dc.substitutions +++ b/evrMrmApp/Db/evr-pcie-300dc.substitutions @@ -247,30 +247,21 @@ file "evrdcpulser.template" file "evrin.db" {pattern {IN, OBJ, DESC} -# Front panel inputs 4 -{"$(SYS){$(D)-In:0}", "$(EVR):FPIn0", "FPIN0 (TTL)"} -{"$(SYS){$(D)-In:1}", "$(EVR):FPIn1", "FPIN1 (TTL)"} -{"$(SYS){$(D)-In:2}", "$(EVR):FPIn2", "FPIN2 (TTL)"} -{"$(SYS){$(D)-In:3}", "$(EVR):FPIn3", "FPIN3 (TTL)"} # Univ inputs 20 -{"$(SYS){$(D)-In:FPUV0}", "$(EVR):FPIn4", "In:FPUV0"} -{"$(SYS){$(D)-In:FPUV1}", "$(EVR):FPIn5", "In:FPUV1"} -{"$(SYS){$(D)-In:FPUV2}", "$(EVR):FPIn6", "In:FPUV2"} -{"$(SYS){$(D)-In:FPUV3}", "$(EVR):FPIn7", "In:FPUV3"} -{"$(SYS){$(D)-In:FPUV4}", "$(EVR):FPIn8", "In:FPUV4"} -{"$(SYS){$(D)-In:FPUV5}", "$(EVR):FPIn9", "In:FPUV5"} -{"$(SYS){$(D)-In:FPUV6}", "$(EVR):FPIn10", "In:FPUV6"} -{"$(SYS){$(D)-In:FPUV7}", "$(EVR):FPIn11", "In:FPUV7"} -{"$(SYS){$(D)-In:FPUV8}", "$(EVR):FPIn12", "In:FPUV8"} -{"$(SYS){$(D)-In:FPUV9}", "$(EVR):FPIn13", "In:FPUV9"} -{"$(SYS){$(D)-In:FPUV10}", "$(EVR):FPIn14", "In:FPUV10"} -{"$(SYS){$(D)-In:FPUV11}", "$(EVR):FPIn15", "In:FPUV11"} -{"$(SYS){$(D)-In:FPUV12}", "$(EVR):FPIn16", "In:FPUV12"} -{"$(SYS){$(D)-In:FPUV13}", "$(EVR):FPIn17", "In:FPUV13"} -{"$(SYS){$(D)-In:FPUV14}", "$(EVR):FPIn18", "In:FPUV14"} -{"$(SYS){$(D)-In:FPUV15}", "$(EVR):FPIn19", "In:FPUV15"} -{"$(SYS){$(D)-In:FPUV16}", "$(EVR):FPIn20", "In:FPUV16"} -{"$(SYS){$(D)-In:FPUV17}", "$(EVR):FPIn21", "In:FPUV17"} -{"$(SYS){$(D)-In:FPUV18}", "$(EVR):FPIn22", "In:FPUV18"} -{"$(SYS){$(D)-In:FPUV19}", "$(EVR):FPIn23", "In:FPUV19"} +{"$(SYS){$(D)-In:FPUV0}", "$(EVR):FPIn0", "In:FPUV0"} +{"$(SYS){$(D)-In:FPUV1}", "$(EVR):FPIn1", "In:FPUV1"} +{"$(SYS){$(D)-In:FPUV2}", "$(EVR):FPIn2", "In:FPUV2"} +{"$(SYS){$(D)-In:FPUV3}", "$(EVR):FPIn3", "In:FPUV3"} +{"$(SYS){$(D)-In:FPUV4}", "$(EVR):FPIn4", "In:FPUV4"} +{"$(SYS){$(D)-In:FPUV5}", "$(EVR):FPIn5", "In:FPUV5"} +{"$(SYS){$(D)-In:FPUV6}", "$(EVR):FPIn6", "In:FPUV6"} +{"$(SYS){$(D)-In:FPUV7}", "$(EVR):FPIn7", "In:FPUV7"} +{"$(SYS){$(D)-In:FPUV8}", "$(EVR):FPIn8", "In:FPUV8"} +{"$(SYS){$(D)-In:FPUV9}", "$(EVR):FPIn9", "In:FPUV9"} +{"$(SYS){$(D)-In:FPUV10}", "$(EVR):FPIn10", "In:FPUV10"} +{"$(SYS){$(D)-In:FPUV11}", "$(EVR):FPIn11", "In:FPUV11"} +{"$(SYS){$(D)-In:FPUV12}", "$(EVR):FPIn12", "In:FPUV12"} +{"$(SYS){$(D)-In:FPUV13}", "$(EVR):FPIn13", "In:FPUV13"} +{"$(SYS){$(D)-In:FPUV14}", "$(EVR):FPIn14", "In:FPUV14"} +{"$(SYS){$(D)-In:FPUV15}", "$(EVR):FPIn15", "In:FPUV15"} }