From d0946e993a74f087f9f1d9601a1e1f1593424464 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 26 Aug 2024 11:39:37 +0200 Subject: [PATCH 1/2] fix: conf_mtca_evm_300 increased with 16 numRearInp. --- evgMrmApp/src/evgInit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evgMrmApp/src/evgInit.cpp b/evgMrmApp/src/evgInit.cpp index 61f0b87f..c0aa6667 100644 --- a/evgMrmApp/src/evgInit.cpp +++ b/evgMrmApp/src/evgInit.cpp @@ -108,7 +108,7 @@ static const evgMrm::Config conf_mtca_evm_300 = { "mTCA-EVM-300", 3, 16, - 0, + 16, }; static bool From 6ddc071134a262c85175c68a62d707d4598a0ea6 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Tue, 27 Aug 2024 09:03:16 +0200 Subject: [PATCH 2/2] fix: mbbo selections to follow others. --- evgMrmApp/Db/evgDbus.db | 2 +- evgMrmApp/Db/evgMrm.db | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/evgMrmApp/Db/evgDbus.db b/evgMrmApp/Db/evgDbus.db index 4d62e061..75f5f669 100644 --- a/evgMrmApp/Db/evgDbus.db +++ b/evgMrmApp/Db/evgDbus.db @@ -177,7 +177,7 @@ record(mbbo, "$(P)Src2-Sel") { field(PINI, "YES") field(VAL, "0") field(ZRST, "Off") - field(ONST, "FrontInp2") + field(ONST, "Front2") field(TWST, "Rear0") field(ZRVL, "0") field(ONVL, "1") diff --git a/evgMrmApp/Db/evgMrm.db b/evgMrmApp/Db/evgMrm.db index 1e36e45e..88578dc0 100644 --- a/evgMrmApp/Db/evgMrm.db +++ b/evgMrmApp/Db/evgMrm.db @@ -190,13 +190,13 @@ record(mbbo, "$(P)PpsInp1-Sel") { field(UDF, "0") field(VAL, "0") field(ZRST, "None") - field(ONST, "UnivInp11") - field(TWST, "UnivInp12") - field(THST, "UnivInp13") - field(FRST, "UnivInp14") - field(FVST, "UnivInp15") + field(ONST, "Univ11") + field(TWST, "Univ12") + field(THST, "Univ13") + field(FRST, "Univ14") + field(FVST, "Univ15") field(SXST, "EPICS Scan") - field(SVST, "RearInp0") + field(SVST, "Rear0") field(ZRVL, "0x0") field(ONVL, "0x1") field(TWVL, "0x2")