diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 2117b83..6b1e599 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -480,6 +480,8 @@ ss PulseSequence { pvPut(Isttok_TorPSDisable); IsttokProcReq = STOP; pvPut(IsttokProcReq); + IsttokMARTe2Command = STOP; + pvPut(IsttokMARTe2Command); } when (IsttokUpsShutdown == ON) { strcpy(msg, "Idle: UPS Power Emergency Shutdown. -> Stopping"); @@ -496,7 +498,7 @@ ss PulseSequence { /* Pulse state change to 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) { /* Vacuum emergency: Pulse state change to Stopping */ /*IsttokOPREQ = STOP; State should recover from */ @@ -566,7 +568,7 @@ ss PulseSequence { errlogSevPrintf(MINOR, "%s\n", msg); } 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) { /* Vacuum emergency: Pulse state change to Stopping */ IsttokOPREQ = STOP; @@ -1164,6 +1166,8 @@ ss ShotSequence { pvPut(WSHOTINGSTATE); IsttokWaitTimerDisa = 1; pvPut(IsttokWaitTimerDisa); + IsttokMARTe2Command = STOP; + pvPut(IsttokMARTe2Command); // strcpy(IsttokWaitTimerScan, "Passive"); // pvPut(IsttokWaitTimerScan); } @@ -1341,6 +1345,8 @@ ss ShotSequence { // PS Trigger Pulse Isttok_TorPSTrigger = ON; pvPut(Isttok_TorPSTrigger); + IsttokMARTe2Command = START; + pvPut(IsttokMARTe2Command); WSHOTINGSTATE = WSHTST_SShot; pvPut(WSHOTINGSTATE); } state SShot @@ -1399,6 +1405,8 @@ ss ShotSequence { errlogSevPrintf(NO_ALARM, "%s\n", msg); IsttokVVessel_Filament = 1; pvPut(IsttokVVessel_Filament); + IsttokMARTe2Command = STOP; + pvPut(IsttokMARTe2Command); WSHOTINGSTATE = WSHTST_Shooting12; pvPut(WSHOTINGSTATE); } state Shooting12