bernardo/ISTTOK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MARTe2 PVs in State Machine

Browse Source 
Signed-off-by: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
This commit is contained in:
Bernardo Carvalho
2023-12-19 18:02:25 +00:00
parent 8ab9a8dda3
commit fa28a411c3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
View File

@@ -480,6 +480,8 @@ ss PulseSequence {
pvPut(Isttok_TorPSDisable); pvPut(Isttok_TorPSDisable);
IsttokProcReq = STOP; IsttokProcReq = STOP;
pvPut(IsttokProcReq); pvPut(IsttokProcReq);
IsttokMARTe2Command = STOP;
pvPut(IsttokMARTe2Command);
} }
when (IsttokUpsShutdown == ON) { when (IsttokUpsShutdown == ON) {
strcpy(msg, "Idle: UPS Power Emergency Shutdown. -> Stopping"); strcpy(msg, "Idle: UPS Power Emergency Shutdown. -> Stopping");
@@ -496,7 +498,7 @@ ss PulseSequence {
/* Pulse state change to Emergency*/ /* Pulse state change to Emergency*/
} state Emergency } state Emergency
when (delay(5.0) && (pvStatus(IsttokRPump1_Pressure) != pvStatOK) || (pvStatus(IsttokTMPump1_Emergency) != pvStatOK) ) { when (delay(5.0) && ((pvStatus(IsttokRPump1_Pressure) != pvStatOK) || (pvStatus(IsttokTMPump1_Emergency) != pvStatOK)) ) {
// pvStatus(IsttokTMPump1_Emergency) != pvStatOK || pvStatus(IsttokTMPump2_Emergency) != pvStatOK) { // pvStatus(IsttokTMPump1_Emergency) != pvStatOK || pvStatus(IsttokTMPump2_Emergency) != pvStatOK) {
/* Vacuum emergency: Pulse state change to Stopping */ /* Vacuum emergency: Pulse state change to Stopping */
/*IsttokOPREQ = STOP; State should recover from */ /*IsttokOPREQ = STOP; State should recover from */
@@ -566,7 +568,7 @@ ss PulseSequence {
errlogSevPrintf(MINOR, "%s\n", msg); errlogSevPrintf(MINOR, "%s\n", msg);
} state Idle } state Idle
when ( delay(20.0) && (pvStatus(IsttokRPump1_Pressure) != pvStatOK) || (pvStatus(IsttokTMPump1_Emergency) != pvStatOK) ) { when ( delay(20.0) && ((pvStatus(IsttokRPump1_Pressure) != pvStatOK) || (pvStatus(IsttokTMPump1_Emergency) != pvStatOK) )) {
// pvStatus(IsttokTMPump1_Emergency) != pvStatOK || pvStatus(IsttokTMPump2_Emergency) != pvStatOK) { // pvStatus(IsttokTMPump1_Emergency) != pvStatOK || pvStatus(IsttokTMPump2_Emergency) != pvStatOK) {
/* Vacuum emergency: Pulse state change to Stopping */ /* Vacuum emergency: Pulse state change to Stopping */
IsttokOPREQ = STOP; IsttokOPREQ = STOP;
@@ -1164,6 +1166,8 @@ ss ShotSequence {
pvPut(WSHOTINGSTATE); pvPut(WSHOTINGSTATE);
IsttokWaitTimerDisa = 1; IsttokWaitTimerDisa = 1;
pvPut(IsttokWaitTimerDisa); pvPut(IsttokWaitTimerDisa);
IsttokMARTe2Command = STOP;
pvPut(IsttokMARTe2Command);
// strcpy(IsttokWaitTimerScan, "Passive"); // strcpy(IsttokWaitTimerScan, "Passive");
// pvPut(IsttokWaitTimerScan); // pvPut(IsttokWaitTimerScan);
} }
@@ -1341,6 +1345,8 @@ ss ShotSequence {
// PS Trigger Pulse // PS Trigger Pulse
Isttok_TorPSTrigger = ON; Isttok_TorPSTrigger = ON;
pvPut(Isttok_TorPSTrigger); pvPut(Isttok_TorPSTrigger);
IsttokMARTe2Command = START;
pvPut(IsttokMARTe2Command);
WSHOTINGSTATE = WSHTST_SShot; WSHOTINGSTATE = WSHTST_SShot;
pvPut(WSHOTINGSTATE); pvPut(WSHOTINGSTATE);
} state SShot } state SShot
@@ -1399,6 +1405,8 @@ ss ShotSequence {
errlogSevPrintf(NO_ALARM, "%s\n", msg); errlogSevPrintf(NO_ALARM, "%s\n", msg);
IsttokVVessel_Filament = 1; IsttokVVessel_Filament = 1;
pvPut(IsttokVVessel_Filament); pvPut(IsttokVVessel_Filament);
IsttokMARTe2Command = STOP;
pvPut(IsttokMARTe2Command);
WSHOTINGSTATE = WSHTST_Shooting12; WSHOTINGSTATE = WSHTST_Shooting12;
pvPut(WSHOTINGSTATE); pvPut(WSHOTINGSTATE);
} state Shooting12 } state Shooting12