From 8ab9a8dda3a8fbc14d5d64e2ec1e2491d81a279e Mon Sep 17 00:00:00 2001
From: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
Date: Tue, 19 Dec 2023 17:37:12 +0000
Subject: [PATCH] Added MARTe2 PVs

Signed-off-by: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
---
 .../ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db | 55 +++++++++----------
 .../ISTTOKrpiApp/src/IsttokSeqExec.stt        |  8 ++-
 .../ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt | 12 ++--
 .../iocISTTOKrpi/save/iocISTTOKrpi.sav        |  4 +-
 4 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
index 94e9802..df33482 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
@@ -312,40 +312,35 @@ record(mbbo, "$(P)$(R)STOPPINGSTATE") {
   field(VAL, "0")
 }
 
-#### PVs fot ATCA-MARTe2 operation
-record( longin, "ISTTOK:marte2:STATUS")
+#### PVs for ATCA-MARTe2 operation
+#record( mbbi, "$(P)$(R)MARTE-STATUS")
+  #field(DESC, "Get ATCA-MARTE2 State ")
+#  field(ZRVL, "0")
+#  field(ONVL, "1")
+#  field(ZRST, "IDLE")
+#  field(ONST, "RUN")
+  #field(VAL, "0")
+record(mbbi, "$(P)$(R)MARTe2-Status")
 {
-   field(DTYP, "Soft Channel")
+  field(DTYP, "Soft Channel")
+  field(ZRVL, "0")
+  field(ONVL, "1")
+  field(TWVL, "2")
+  field(ZRST, "IDLE")
+  field(ONST, "RUN")
+  field(TWST, "ERROR")
+  #field(VAL, "0")
 }
-record( longin, "ISTTOK:marte2:COMMAND")
+record(mbbo, "$(P)$(R)MARTe2-Command")
 {
-   field(DTYP, "Soft Channel")
+  field(DTYP, "Soft Channel")
+  field(ZRVL, "0")
+  field(ONVL, "1")
+  field(ZRST, "GOTOIDLE")
+  field(ONST, "GOTORUN")
+  field(VAL, "0")
 }
-record( longin, "ISTTOK:marte2:RESET")
-{
-   field(DTYP, "Soft Channel")
-}
-record( waveform, "ISTTOK:marte2:HIST-IDLE-CT")
-{
-   field(DTYP, "Soft Channel")
-   field(NELM, 10)
-   field(FTVL, "LONG")
-}
-record( waveform, "ISTTOK:marte2:HIST-RUN-CT")
-{
-   field(DTYP, "Soft Channel")
-   field(NELM, 10)
-   field(FTVL, "LONG")
-}
-record( longin, "ISTTOK:marte2:TIME")
-{
-   field(DTYP, "Soft Channel")
-}
-record( longin, "ISTTOK:marte2:COUNTER")
-{
-   field(DTYP, "Soft Channel")
-}
-record( ai, "ISTTOK:marte2:ADC0S")
+record( longin, "$(P)$(R)MARTe2-Reset")
 {
    field(DTYP, "Soft Channel")
 }
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
index 98bfc39..2117b83 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
@@ -273,11 +273,17 @@ assign IsttokupsBatteryON  "{unit}:central:UPS-OnBattery";
 monitor IsttokupsBatteryON;
 
 short IsttokUpsShutdown;
-assign IsttokUpsShutdown  "ISTTOK:central:UPS-Shutdown";
+assign IsttokUpsShutdown "ISTTOK:central:UPS-Shutdown";
 monitor IsttokUpsShutdown;
 
+short IsttokMARTe2Status;
+assign IsttokMARTe2Status "ISTTOK:central:MARTe2-Status";
+monitor IsttokMARTe2Status;
 //string tmp1_stat;
 
+short IsttokMARTe2Command;
+assign IsttokMARTe2Command "ISTTOK:central:MARTe2-Command";
+
 /* Trace message record limited to 40 characters */
 string msg;
 assign msg to "ISTTOK:central:TraceMessage.VAL";
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
index b844ff1..cefc758 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
@@ -79,7 +79,6 @@ ISTTOK:central:TTSystem-tzero
 ISTTOK:central:Emergency-PhysButton
 ISTTOK:central:PCF8574:56:REGISTER:READ:FNOUT
 ISTTOK:central:PCF8574:57:REGISTER:READ:FNOUT
-ISTTOK:marte2:ADC0S
 ISTTOK:central:TMPump2-Speed
 ISTTOK:central:TMPump2-Current
 ISTTOK:central:Shot-TorPSCurrentImage
@@ -98,9 +97,11 @@ ISTTOK:central:PCF8591:72:CTRLREGISTER
 ISTTOK:central:SEEED4RELAY:17:REGISTER
 ISTTOK:central:SEEED4RELAY:18:REGISTER
 ISTTOK:central:SEEED4RELAY:19:REGISTER
+ISTTOK:central:MARTe2-Status
 ISTTOK:central:TraceMessage
 ISTTOK:central:LogMessage
 ISTTOK:central:RS485Debug
+ISTTOK:central:RS485Debug-CS
 ISTTOK:central:sendmail
 ISTTOK:SR_recentlyStr
 ISTTOK:SR_rebootStatusStr
@@ -146,11 +147,8 @@ ISTTOK:SR_4_Status
 ISTTOK:SR_5_Status
 ISTTOK:SR_6_Status
 ISTTOK:SR_7_Status
-ISTTOK:marte2:STATUS
-ISTTOK:marte2:COMMAND
-ISTTOK:marte2:RESET
-ISTTOK:marte2:TIME
-ISTTOK:marte2:COUNTER
+ISTTOK:central:MARTe2-Command
+ISTTOK:central:MARTE2-Reset
 ISTTOK:central:PCF8591:72:ADC_CH1
 ISTTOK:central:PCF8591:72:ADC_CH2
 ISTTOK:central:PCF8591:72:ADC_CH3
@@ -162,8 +160,6 @@ ISTTOK:central:P003:M
 ISTTOK:central:P003:E
 ISTTOK:central:P004:M
 ISTTOK:central:P004:E
-ISTTOK:marte2:HIST-IDLE-CT
-ISTTOK:marte2:HIST-RUN-CT
 ISTTOK:central:TMPump1-ControllerOnInv
 ISTTOK:central:TMPump1-ControllerOffInv
 ISTTOK:central:TMPump1-MotorOnInv
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
index 7f5d786..19f88af 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
@@ -1,5 +1,5 @@
-# autosave R5.3	Automatically generated - DO NOT MODIFY - 231215-153844
-ISTTOK:central:PULSE-NUMBER.VAL 51197
+# autosave R5.3	Automatically generated - DO NOT MODIFY - 231219-172829
+ISTTOK:central:PULSE-NUMBER.VAL 51252
 ISTTOK:central:LogMessage.VAL 
 ISTTOK:central:LASTOPSTATE.VAL 2
 ISTTOK:central:OPREQ.VAL 1