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

Commit BBC

Browse Source
This commit is contained in:
Bernardo Carvalho
2019-12-05 19:11:57 +00:00
parent 5d5b5160fb
commit 697199b47f
4 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -882,15 +882,10 @@ ss CleaningSequence{
ss ShotSequence { ss ShotSequence {
state NonShoting { state NonShoting {
entry { entry {
strcpy(msg, "Waiting for Trigger...");
pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg);
IsttokWSHOTINGSTATE = WSHTST_NonShoting; IsttokWSHOTINGSTATE = WSHTST_NonShoting;
pvPut(IsttokWSHOTINGSTATE); pvPut(IsttokWSHOTINGSTATE);
strcpy(IsttokShotCountdownScan, "Passive"); strcpy(IsttokShotCountdownScan, "Passive");
pvPut(IsttokShotCountdownScan); pvPut(IsttokShotCountdownScan);
// IsttokShotCountdown = 160;
// pvPut(IsttokShotCountdown);
} }
when( IsttokOPSTATE == POS_WaitShot ){ when( IsttokOPSTATE == POS_WaitShot ){
strcpy(msg, "Waiting for Trigger..."); strcpy(msg, "Waiting for Trigger...");
@@ -911,6 +906,8 @@ ss ShotSequence {
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);
strcpy(IsttokShotCountdownScan, "Passive"); strcpy(IsttokShotCountdownScan, "Passive");
pvPut(IsttokShotCountdownScan); pvPut(IsttokShotCountdownScan);
IsttokProcReq = STOP;
pvPut(IsttokProcReq);
IsttokWSHOTINGSTATE = WSHTST_NonShoting; IsttokWSHOTINGSTATE = WSHTST_NonShoting;
pvPut(IsttokWSHOTINGSTATE); pvPut(IsttokWSHOTINGSTATE);
IsttokOPSTATE = POS_Process; IsttokOPSTATE = POS_Process;
@@ -921,8 +918,6 @@ ss ShotSequence {
pvPut(msg); pvPut(msg);
IsttokShotCountdown = -70; IsttokShotCountdown = -70;
pvPut(IsttokShotCountdown); pvPut(IsttokShotCountdown);
// strcpy(IsttokShotCountdownScan, "1 second");
// pvPut(IsttokShotCountdownScan);
IsttokWSHOTINGSTATE = WSHTST_Shoting2; IsttokWSHOTINGSTATE = WSHTST_Shoting2;
pvPut(IsttokWSHOTINGSTATE); pvPut(IsttokWSHOTINGSTATE);
} state Shoting2 } state Shoting2

11
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
View File

@@ -1,19 +1,14 @@
ISTTOK:central:PULSE-NUMBER.VAL ISTTOK:central:PULSE-NUMBER.VAL
ISTTOK:central:PROCESS-MODE.VAL
ISTTOK:central:TMPump1-ManualValve.VAL
ISTTOK:central:LASTOPSTATE.VAL ISTTOK:central:LASTOPSTATE.VAL
ISTTOK:central:OPREQ ISTTOK:central:OPREQ
ISTTOK:central:PROCESS-MODE.VAL 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:CLEANINGMANMODE.VAL
#ISTTOK:central:WSHOTINGSTATE.VAL
ISTTOK:central:Emergency-UserButton.VAL ISTTOK:central:Emergency-UserButton.VAL
ISTTOK:central:TMPump1-ManualValve.VAL
#ALARM Limits
ISTTOK:central:RPump1-Pressure.HIGH ISTTOK:central:RPump1-Pressure.HIGH
ISTTOK:central:RPump1-Pressure.HIHI ISTTOK:central:RPump1-Pressure.HIHI
ISTTOK:central:RPump2-Pressure.HIGH ISTTOK:central:RPump2-Pressure.HIGH

7
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
View File

@@ -1,12 +1,11 @@
# autosave R5.3 Automatically generated - DO NOT MODIFY - 191205-170936 # autosave R5.3 Automatically generated - DO NOT MODIFY - 191205-191128
ISTTOK:central:PULSE-NUMBER.VAL 0 ISTTOK:central:PULSE-NUMBER.VAL 46294
ISTTOK:central:PROCESS-MODE.VAL 1
ISTTOK:central:TMPump1-ManualValve.VAL 1
ISTTOK:central:LASTOPSTATE.VAL 2 ISTTOK:central:LASTOPSTATE.VAL 2
ISTTOK:central:OPREQ 1 ISTTOK:central:OPREQ 1
ISTTOK:central:PROCESS-MODE.VAL 1 ISTTOK:central:PROCESS-MODE.VAL 1
ISTTOK:central:CLEANINGMANMODE.VAL 1 ISTTOK:central:CLEANINGMANMODE.VAL 1
ISTTOK:central:Emergency-UserButton.VAL 0 ISTTOK:central:Emergency-UserButton.VAL 0
ISTTOK:central:TMPump1-ManualValve.VAL 1
ISTTOK:central:RPump1-Pressure.HIGH 0.05 ISTTOK:central:RPump1-Pressure.HIGH 0.05
ISTTOK:central:RPump1-Pressure.HIHI 0.1 ISTTOK:central:RPump1-Pressure.HIHI 0.1
ISTTOK:central:RPump2-Pressure.HIGH 0.05 ISTTOK:central:RPump2-Pressure.HIGH 0.05

1
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
View File

@@ -67,4 +67,3 @@ create_monitor_set("$(IOC).req", 30)
## Start any sequence programs ## Start any sequence programs
seq IsttokSeqExec seq IsttokSeqExec
#, "unit=ISTTOK"