feat: CommitHash pv added for EVG.

jerzyjamroz · Oct 17, 2023 · b21ce7f · b21ce7f
1 parent f320283
commit b21ce7f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/evgMrmApp/Db/evgMrm.db b/evgMrmApp/Db/evgMrm.db
@@ -40,6 +40,13 @@ record(stringin, "$(P)SwVer-I") {
   field(DESC, "Software version")
 }
 
+record(stringin, "$(P)CommitHash-I") {
+  field(DTYP, "Obj Prop string")
+  field(INP , "@OBJ=$(OBJ), PROP=CommitHash")
+  field(PINI, "YES")
+  field(DESC, "Commit hash")
+}
+
 record(bo, "$(P)ResetMxc-Cmd") {
     field( DTYP, "Obj Prop bool")
     field( OUT , "@OBJ=$(OBJ), PROP=Reset MXC")
@@ -148,4 +155,3 @@ record(longin, "$(P)DbusStatus-RB" ) {
     field( INP , "@OBJ=$(OBJ), PROP=DbusStatus")
     info( autosaveFields_pass0, "SCAN")
 }
-
diff --git a/evgMrmApp/src/evg.cpp b/evgMrmApp/src/evg.cpp
@@ -51,6 +51,7 @@ OBJECT_BEGIN(evgMrm) {
     OBJECT_PROP1("DbusStatus", &evgMrm::getDbusStatus);
     OBJECT_PROP1("Version", &evgMrm::getFwVersionStr);
     OBJECT_PROP1("Sw Version", &evgMrm::getSwVersion);
+    OBJECT_PROP1("CommitHash", &evgMrm::getCommitHash);
     OBJECT_PROP2("EvtCode", &evgMrm::writeonly, &evgMrm::setEvtCode);
     {
       bool (evgMrm::*getter)() const = &evgMrm::isSoftSeconds;
@@ -78,5 +79,3 @@ OBJECT_BEGIN(evgMrm) {
     OBJECT_PROP1("Frequency",   &evgMrm::getFrequency);
     OBJECT_PROP1("PLL Lock Status", &evgMrm::pllLocked);
 } OBJECT_END(evgMrm)
-
-
diff --git a/evgMrmApp/src/evgMrm.cpp b/evgMrmApp/src/evgMrm.cpp
@@ -40,6 +40,10 @@
 
 #include <epicsExport.h>
 
+#ifndef __COMMIT_HASH
+#  define __COMMIT_HASH "NotConfigured"
+#endif
+
 static
 EVRMRM::Config evm_evru_conf = {
     "mTCA-EVM-300 (EVRU)",
@@ -235,6 +239,11 @@ evgMrm::getSwVersion() const {
     return MRF_VERSION;
 }
 
+std::string
+evgMrm::getCommitHash() const {
+    return __COMMIT_HASH;
+}
+
 epicsUInt32
 evgMrm::getDbusStatus() const {
     return READ32(m_pReg, Status)>>16;

diff --git a/evgMrmApp/src/evgMrm.h b/evgMrmApp/src/evgMrm.h
@@ -85,6 +85,7 @@ class evgMrm : public mrf::ObjectInst<evgMrm>,
     MRFVersion version() const;
     std::string getFwVersionStr() const;
     std::string getSwVersion() const;
+    std::string getCommitHash() const;
 
     void enable(epicsUInt16);
     epicsUInt16 enabled() const;