From 1189a07ed726b6fca7f5d51dbe3148740a1949e3 Mon Sep 17 00:00:00 2001
From: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
Date: Thu, 12 Dec 2019 11:49:22 +0000
Subject: [PATCH] Added Pulse Number Counter

---
 .../ISTTOKrpiApp/src/IsttokSeqExec.stt        |   6 +
 .../ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt | 172 +++++++++---------
 .../iocISTTOKrpi/save/iocISTTOKrpi.sav        |   6 +-
 3 files changed, 95 insertions(+), 89 deletions(-)

diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
index e04ae85..0a0e2b5 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
@@ -85,6 +85,10 @@ short IsttokOPSTATE;
 assign IsttokOPSTATE to "ISTTOK:central:OPSTATE";
 monitor IsttokOPSTATE;
  
+int PulseNumber;
+assign PulseNumber to "ISTTOK:central:PULSE-NUMBER";
+monitor PulseNumber;
+ 
 short IsttokLastOPSTATE;
 assign IsttokLastOPSTATE to "ISTTOK:central:LASTOPSTATE";
 monitor IsttokLastOPSTATE;
@@ -902,6 +906,8 @@ ss ShotSequence {
             pvPut(IsttokShotCountdown);
             WSHOTINGSTATE = WSHTST_Shoting2;
             pvPut(WSHOTINGSTATE);
+            PulseNumber +=1;
+            pvPut(PulseNumber);
         } state Shoting2
     }
     state Shoting2 {
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
index bdf57ff..c98408f 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
@@ -1,59 +1,32 @@
-ISTTOK:central:PCF8574:56:REGISTER
-ISTTOK:central:PCF8574:57:REGISTER
-ISTTOK:central:PCF8574:60:REGISTER
-ISTTOK:central:PCF8574:61:REGISTER
-ISTTOK:central:PCF8591:72:CTRLREGISTER
-ISTTOK:central:OPCALCSTATE
-ISTTOK:central:STARTCALCSTATE
-ISTTOK:central:STOPCALCSTATE
-ISTTOK:central:CLEANCALCSTATE
-ISTTOK:central:WSHOTCALCSTATE
-ISTTOK:central:COUNTDOWN
-ISTTOK:central:COUNTER
-ISTTOK:central:PCF8591:72:BYTE2_CH1
-ISTTOK:central:PCF8591:72:BYTE2_CH2
-ISTTOK:central:Emergency
-ISTTOK:central:VVessel-Pressure
-ISTTOK:central:RPump1-Pressure
-ISTTOK:central:TMPump1-PressureAdmission
-ISTTOK:central:RPump2-Pressure
-ISTTOK:central:Temperature_0
-ISTTOK:central:TMPump2-Speed
-ISTTOK:central:TMPump2-Current
 ISTTOK:central:PCF8574:56:REGISTER:READ
 ISTTOK:central:PCF8574:57:REGISTER:READ
 ISTTOK:central:PCF8574:60:REGISTER:READ
 ISTTOK:central:PCF8574:61:REGISTER:READ
-ISTTOK:central:TraceMessage
-ISTTOK:central:RS485Debug
-xxx:SR_recentlyStr
-xxx:SR_rebootStatusStr
-xxx:SR_rebootTime
-xxx:SR_statusStr
-xxx:SR_0_Name
-xxx:SR_0_StatusStr
-xxx:SR_0_Time
-xxx:SR_1_Name
-xxx:SR_1_StatusStr
-xxx:SR_1_Time
-xxx:SR_2_Name
-xxx:SR_2_StatusStr
-xxx:SR_2_Time
-xxx:SR_3_Name
-xxx:SR_3_StatusStr
-xxx:SR_3_Time
-xxx:SR_4_Name
-xxx:SR_4_StatusStr
-xxx:SR_4_Time
-xxx:SR_5_Name
-xxx:SR_5_StatusStr
-xxx:SR_5_Time
-xxx:SR_6_Name
-xxx:SR_6_StatusStr
-xxx:SR_6_Time
-xxx:SR_7_Name
-xxx:SR_7_StatusStr
-xxx:SR_7_Time
+ISTTOK:central:LASTOPSTATE
+ISTTOK:SR_rebootStatus
+ISTTOK:SR_status
+ISTTOK:SR_0_Status
+ISTTOK:SR_1_Status
+ISTTOK:SR_2_Status
+ISTTOK:SR_3_Status
+ISTTOK:SR_4_Status
+ISTTOK:SR_5_Status
+ISTTOK:SR_6_Status
+ISTTOK:SR_7_Status
+ISTTOK:central:OPSTATE
+ISTTOK:central:STARTINGSTATE
+ISTTOK:central:CLEANINGSTATE
+ISTTOK:central:WSHOTINGSTATE
+ISTTOK:central:STOPPINGSTATE
+ISTTOK:central:TMPump1-ControllerOnInv
+ISTTOK:central:TMPump1-ControllerOffInv
+ISTTOK:central:TMPump1-MotorOnInv
+ISTTOK:central:TMPump1-MotorOffInv
+ISTTOK:central:BuzzerInv
+ISTTOK:central:Shot-TorPSTriggerInv
+ISTTOK:central:Temperature_0
+ISTTOK:central:TMPump2-Speed
+ISTTOK:central:TMPump2-Current
 ISTTOK:central:PCF8591:72:ADC_CH1
 ISTTOK:central:PCF8591:72:ADC_CH2
 ISTTOK:central:P001:M
@@ -72,8 +45,66 @@ ISTTOK:central:TMPump2-Emergency
 ISTTOK:central:TMPump2-Acceleration
 ISTTOK:central:TTSystem-tzero
 ISTTOK:central:Emergency-PhysButton
+ISTTOK:central:OPCALCSTATE
+ISTTOK:central:STARTCALCSTATE
+ISTTOK:central:STOPPINGCALCSTATE
+ISTTOK:central:CLEANCALCSTATE
+ISTTOK:central:WSHOTCALCSTATE
+ISTTOK:central:COUNTDOWN
+ISTTOK:central:COUNTER
+ISTTOK:central:PCF8591:72:BYTE2_CH1
+ISTTOK:central:PCF8591:72:BYTE2_CH2
+ISTTOK:central:Emergency
+ISTTOK:central:VVessel-Pressure
+ISTTOK:central:RPump1-Pressure
+ISTTOK:central:TMPump1-PressureAdmission
+ISTTOK:central:RPump2-Pressure
 ISTTOK:central:PCF8574:56:REGISTER:READ:FNOUT
 ISTTOK:central:PCF8574:57:REGISTER:READ:FNOUT
+ISTTOK:central:PULSE-NUMBER
+ISTTOK:SR_0_State
+ISTTOK:SR_1_State
+ISTTOK:SR_2_State
+ISTTOK:SR_3_State
+ISTTOK:SR_4_State
+ISTTOK:SR_5_State
+ISTTOK:SR_6_State
+ISTTOK:SR_7_State
+ISTTOK:central:TraceMessage
+ISTTOK:central:RS485Debug
+ISTTOK:SR_recentlyStr
+ISTTOK:SR_rebootStatusStr
+ISTTOK:SR_rebootTime
+ISTTOK:SR_statusStr
+ISTTOK:SR_0_Name
+ISTTOK:SR_0_StatusStr
+ISTTOK:SR_0_Time
+ISTTOK:SR_1_Name
+ISTTOK:SR_1_StatusStr
+ISTTOK:SR_1_Time
+ISTTOK:SR_2_Name
+ISTTOK:SR_2_StatusStr
+ISTTOK:SR_2_Time
+ISTTOK:SR_3_Name
+ISTTOK:SR_3_StatusStr
+ISTTOK:SR_3_Time
+ISTTOK:SR_4_Name
+ISTTOK:SR_4_StatusStr
+ISTTOK:SR_4_Time
+ISTTOK:SR_5_Name
+ISTTOK:SR_5_StatusStr
+ISTTOK:SR_5_Time
+ISTTOK:SR_6_Name
+ISTTOK:SR_6_StatusStr
+ISTTOK:SR_6_Time
+ISTTOK:SR_7_Name
+ISTTOK:SR_7_StatusStr
+ISTTOK:SR_7_Time
+ISTTOK:central:PCF8574:56:REGISTER
+ISTTOK:central:PCF8574:57:REGISTER
+ISTTOK:central:PCF8574:60:REGISTER
+ISTTOK:central:PCF8574:61:REGISTER
+ISTTOK:central:PCF8591:72:CTRLREGISTER
 ISTTOK:central:OPREQ
 ISTTOK:central:CLEANINGMANMODE
 ISTTOK:central:FSTriggerStart
@@ -103,38 +134,7 @@ ISTTOK:central:Clean-PrimPneuBreaker
 ISTTOK:central:GasIS-Valves
 ISTTOK:central:CapBank-Discharge
 ISTTOK:central:TMPump1-ManualValve
-xxx:SR_heartbeat
-xxx:SR_i_am_alive
-xxx:SR_deadIfZero
-ISTTOK:central:PULSE-NUMBER
-xxx:SR_0_State
-xxx:SR_1_State
-xxx:SR_2_State
-xxx:SR_3_State
-xxx:SR_4_State
-xxx:SR_5_State
-xxx:SR_6_State
-xxx:SR_7_State
+ISTTOK:SR_heartbeat
+ISTTOK:SR_i_am_alive
+ISTTOK:SR_deadIfZero
 ISTTOK:central:CurrentTime
-ISTTOK:central:LASTOPSTATE
-xxx:SR_rebootStatus
-xxx:SR_status
-xxx:SR_0_Status
-xxx:SR_1_Status
-xxx:SR_2_Status
-xxx:SR_3_Status
-xxx:SR_4_Status
-xxx:SR_5_Status
-xxx:SR_6_Status
-xxx:SR_7_Status
-ISTTOK:central:TMPump1-ControllerOnInv
-ISTTOK:central:TMPump1-ControllerOffInv
-ISTTOK:central:TMPump1-MotorOnInv
-ISTTOK:central:TMPump1-MotorOffInv
-ISTTOK:central:BuzzerInv
-ISTTOK:central:Shot-TorPSTriggerInv
-ISTTOK:central:OPSTATE
-ISTTOK:central:STARTINGSTATE
-ISTTOK:central:CLEANINGSTATE
-ISTTOK:central:WSHOTINGSTATE
-ISTTOK:central:STOPPINGSTATE
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
index 2492762..0916142 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
@@ -1,8 +1,8 @@
-# autosave R5.3	Automatically generated - DO NOT MODIFY - 191205-191128
-ISTTOK:central:PULSE-NUMBER.VAL 46294
+# autosave R5.3	Automatically generated - DO NOT MODIFY - 191212-114303
+ISTTOK:central:PULSE-NUMBER.VAL 48173
 ISTTOK:central:LASTOPSTATE.VAL 2
 ISTTOK:central:OPREQ 1
-ISTTOK:central:PROCESS-MODE.VAL 1
+ISTTOK:central:PROCESS-MODE.VAL 0
 ISTTOK:central:CLEANINGMANMODE.VAL 1
 ISTTOK:central:Emergency-UserButton.VAL 0
 ISTTOK:central:TMPump1-ManualValve.VAL 1