diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 872e569..5bdb0a5 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -882,15 +882,10 @@ ss CleaningSequence{ ss ShotSequence { state NonShoting { entry { - strcpy(msg, "Waiting for Trigger..."); - pvPut(msg); - errlogSevPrintf(NO_ALARM, "%s\n",msg); IsttokWSHOTINGSTATE = WSHTST_NonShoting; pvPut(IsttokWSHOTINGSTATE); strcpy(IsttokShotCountdownScan, "Passive"); pvPut(IsttokShotCountdownScan); -// IsttokShotCountdown = 160; -// pvPut(IsttokShotCountdown); } when( IsttokOPSTATE == POS_WaitShot ){ strcpy(msg, "Waiting for Trigger..."); @@ -911,6 +906,8 @@ ss ShotSequence { errlogSevPrintf(NO_ALARM, "%s\n",msg); strcpy(IsttokShotCountdownScan, "Passive"); pvPut(IsttokShotCountdownScan); + IsttokProcReq = STOP; + pvPut(IsttokProcReq); IsttokWSHOTINGSTATE = WSHTST_NonShoting; pvPut(IsttokWSHOTINGSTATE); IsttokOPSTATE = POS_Process; @@ -921,8 +918,6 @@ ss ShotSequence { pvPut(msg); IsttokShotCountdown = -70; pvPut(IsttokShotCountdown); -// strcpy(IsttokShotCountdownScan, "1 second"); -// pvPut(IsttokShotCountdownScan); IsttokWSHOTINGSTATE = WSHTST_Shoting2; pvPut(IsttokWSHOTINGSTATE); } state Shoting2 diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req index cf8f51c..53cdc49 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req @@ -1,19 +1,14 @@ ISTTOK:central:PULSE-NUMBER.VAL -ISTTOK:central:PROCESS-MODE.VAL - -ISTTOK:central:TMPump1-ManualValve.VAL ISTTOK:central:LASTOPSTATE.VAL ISTTOK:central:OPREQ ISTTOK:central:PROCESS-MODE.VAL -#ISTTOK:central:PROCESS-REQ.VAL -#ISTTOK:central:STARTINGSTATE.VAL -#ISTTOK:central:STOPPINGSTATE.VAL -#ISTTOK:central:CLEANINGSTATE.VAL ISTTOK:central:CLEANINGMANMODE.VAL -#ISTTOK:central:WSHOTINGSTATE.VAL ISTTOK:central:Emergency-UserButton.VAL +ISTTOK:central:TMPump1-ManualValve.VAL + +#ALARM Limits ISTTOK:central:RPump1-Pressure.HIGH ISTTOK:central:RPump1-Pressure.HIHI ISTTOK:central:RPump2-Pressure.HIGH diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav index 7603bad..2492762 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav @@ -1,12 +1,11 @@ -# autosave R5.3 Automatically generated - DO NOT MODIFY - 191205-170936 -ISTTOK:central:PULSE-NUMBER.VAL 0 -ISTTOK:central:PROCESS-MODE.VAL 1 -ISTTOK:central:TMPump1-ManualValve.VAL 1 +# autosave R5.3 Automatically generated - DO NOT MODIFY - 191205-191128 +ISTTOK:central:PULSE-NUMBER.VAL 46294 ISTTOK:central:LASTOPSTATE.VAL 2 ISTTOK:central:OPREQ 1 ISTTOK:central:PROCESS-MODE.VAL 1 ISTTOK:central:CLEANINGMANMODE.VAL 1 ISTTOK:central:Emergency-UserButton.VAL 0 +ISTTOK:central:TMPump1-ManualValve.VAL 1 ISTTOK:central:RPump1-Pressure.HIGH 0.05 ISTTOK:central:RPump1-Pressure.HIHI 0.1 ISTTOK:central:RPump2-Pressure.HIGH 0.05 diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd index 1e0d70d..db8ae0e 100755 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd @@ -67,4 +67,3 @@ create_monitor_set("$(IOC).req", 30) ## Start any sequence programs seq IsttokSeqExec -#, "unit=ISTTOK"