Merge pull request #1 from jerzyjamroz/db-vme300-dev

fix: db-vme300-dev branch
jerzyjamroz · Sep 12, 2024 · 8167692 · 8167692
2 parents 0c3898f + 6ddc071
commit 8167692
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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")

diff --git 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