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

Inserted Clean Manual State. Change sequencer version, 2.2.9

Browse Source
This commit is contained in:
Bernardo Carvalho
2022-02-16 18:28:45 +00:00
parent 7e88e4ca47
commit 9736f169fc
7 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
View File

@@ -310,9 +310,9 @@ record(bo, "$(P)$(R)GasIS-Valves" ) {
# field(DESC," 2 válvulas pneumáticas de corte do sistema de injecção de H/D/Ne/He no TOK, 24V out = deixa passar") # field(DESC," 2 válvulas pneumáticas de corte do sistema de injecção de H/D/Ne/He no TOK, 24V out = deixa passar")
# record(bo, "$(P)$(R)GISValvesOnOff" ) { # record(bo, "$(P)$(R)GISValvesOnOff" ) {
field( OUT, "$(P)$(R)SEEED4RELAY:17:REGISTER.B0 PP" ) field( OUT, "$(P)$(R)SEEED4RELAY:17:REGISTER.B0 PP" )
field( ZNAM, "OFF" ) field( ZNAM, "OFF" )
field( ONAM, "ON" ) field( ONAM, "ON" )
field(VAL,"0") field(VAL,"0")
} }

2
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
View File

@@ -246,6 +246,7 @@ record(mbbo, "$(P)$(R)CLEANINGSTATE") {
field(FRVL, "4") field(FRVL, "4")
field(FVVL, "5") field(FVVL, "5")
field(SXVL, "6") field(SXVL, "6")
field(SVVL, "7")
field(ZRST, "NonCleaning") field(ZRST, "NonCleaning")
field(ONST, "Cleaning1") field(ONST, "Cleaning1")
field(TWST, "Cleaning2") field(TWST, "Cleaning2")
@@ -253,6 +254,7 @@ record(mbbo, "$(P)$(R)CLEANINGSTATE") {
field(FRST, "Cleaning4") field(FRST, "Cleaning4")
field(FVST, "Cleaning5") field(FVST, "Cleaning5")
field(SXST, "Cleaning6") field(SXST, "Cleaning6")
field(SVST, "Manual")
field(VAL, "0") field(VAL, "0")
} }

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

@@ -52,6 +52,8 @@ short CLNST_Cleaning2 = 2;
short CLNST_Cleaning3 = 3; short CLNST_Cleaning3 = 3;
short CLNST_Cleaning4 = 4; short CLNST_Cleaning4 = 4;
short CLNST_Cleaning5 = 5; short CLNST_Cleaning5 = 5;
short CLNST_Cleaning6 = 6;
short CLNST_Manual = 7;
short WSHTST_NonShoting = 0; short WSHTST_NonShoting = 0;
short WSHTST_WaitTrg = 1; short WSHTST_WaitTrg = 1;
@@ -128,9 +130,9 @@ short CLEANINGSTATE;
assign CLEANINGSTATE to "ISTTOK:central:CLEANINGSTATE"; assign CLEANINGSTATE to "ISTTOK:central:CLEANINGSTATE";
monitor CLEANINGSTATE; monitor CLEANINGSTATE;
short CLEANINGMANMODE; short CLEANING_AUTOMODE;
assign CLEANINGMANMODE to "ISTTOK:central:CLEANINGMANMODE"; assign CLEANING_AUTOMODE to "ISTTOK:central:CLEANINGMANMODE";
monitor CLEANINGMANMODE; monitor CLEANING_AUTOMODE;
short WSHOTINGSTATE; short WSHOTINGSTATE;
assign WSHOTINGSTATE to "ISTTOK:central:WSHOTINGSTATE"; assign WSHOTINGSTATE to "ISTTOK:central:WSHOTINGSTATE";
@@ -529,7 +531,7 @@ ss PulseSequence {
pvPut(IsttokOPSTATE); pvPut(IsttokOPSTATE);
} }
when ((IsttokProcReq==STOP) && (CLEANINGSTATE == CLNST_NonCleaning)) { when ((IsttokProcReq==STOP) && (CLEANINGSTATE == CLNST_NonCleaning)) {
strcpy(msg, "State to Idle From Clean"); strcpy(msg, "State from Clean to Idle");
pvPut(msg); pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);
} state Idle } state Idle
@@ -948,9 +950,19 @@ ss CleaningSequence{
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);
strcpy(msg, "Entry Cleanning State Mach");
pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg);
} }
when(delay(1.0) && CLEANINGMANMODE == 1 && IsttokOPSTATE == POS_Clean){ when(delay(1.0) && CLEANING_AUTOMODE == 0 && IsttokOPSTATE == POS_Clean){
strcpy(msg, "Entry on Manual Cleaning...");
CLEANINGSTATE = CLNST_Manual;
pvPut(CLEANINGSTATE);
} state CleaningManual
when(delay(1.0) && CLEANING_AUTOMODE == 1 && IsttokOPSTATE == POS_Clean){
strcpy(msg, "Initiating Auto Cleaning..."); strcpy(msg, "Initiating Auto Cleaning...");
pvPut(msg); pvPut(msg);
strcpy(msg, "GIS Valves OPEN"); strcpy(msg, "GIS Valves OPEN");
@@ -965,6 +977,10 @@ ss CleaningSequence{
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
} state Cleaning1 } state Cleaning1
} }
state CleaningManual {
when (IsttokProcReq==STOP) {
} state NonCleaning
}
state Cleaning1 { state Cleaning1 {
when (delay(1.0) && IsttokProcReq==STOP) { when (delay(1.0) && IsttokProcReq==STOP) {
// Reversing Cleaning // Reversing Cleaning
@@ -977,14 +993,14 @@ ss CleaningSequence{
pvPut(IsttokGasIS_Valves); pvPut(IsttokGasIS_Valves);
} state NonCleaning } state NonCleaning
when (delay(2.0) && CLEANINGMANMODE == 1 && IsttokOPSTATE == POS_Clean ) { when (delay(2.0) && CLEANING_AUTOMODE == 1 && IsttokOPSTATE == POS_Clean ) {
strcpy(msg, "Filament ON"); strcpy(msg, "Filament ON");
pvPut(msg); pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);
IsttokVVessel_Filament = PCF_RELAY_ON; IsttokVVessel_Filament = PCF_RELAY_ON;
pvPut(IsttokVVessel_Filament); pvPut(IsttokVVessel_Filament);
CLEANINGSTATE = CLNST_Cleaning2; CLEANINGSTATE = CLNST_Cleaning2;
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
} state Cleaning2 } state Cleaning2
} }
state Cleaning2 { state Cleaning2 {
@@ -998,7 +1014,7 @@ ss CleaningSequence{
CLEANINGSTATE = CLNST_Cleaning1; CLEANINGSTATE = CLNST_Cleaning1;
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
} state Cleaning1 } state Cleaning1
when (delay(2.0) && CLEANINGMANMODE == 1 && IsttokOPSTATE == POS_Clean) { when (delay(2.0) && CLEANING_AUTOMODE == 1 && IsttokOPSTATE == POS_Clean) {
strcpy(msg, "Primary-CT ON"); strcpy(msg, "Primary-CT ON");
pvPut(msg); pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);
@@ -1018,7 +1034,7 @@ ss CleaningSequence{
CLEANINGSTATE = CLNST_Cleaning2; CLEANINGSTATE = CLNST_Cleaning2;
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
} state Cleaning2 } state Cleaning2
when(delay(2.0) && CLEANINGMANMODE == 1 && IsttokOPSTATE == POS_Clean){ when(delay(2.0) && CLEANING_AUTOMODE == 1 && IsttokOPSTATE == POS_Clean){
strcpy(msg, "Toroidal-BK CLOSE"); strcpy(msg, "Toroidal-BK CLOSE");
pvPut(msg); pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);
@@ -1039,7 +1055,7 @@ ss CleaningSequence{
CLEANINGSTATE = CLNST_Cleaning3; CLEANINGSTATE = CLNST_Cleaning3;
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
} state Cleaning3 } state Cleaning3
when (delay(2.0) && CLEANINGMANMODE == 1 && IsttokOPSTATE == POS_Clean){ when (delay(2.0) && CLEANING_AUTOMODE == 1 && IsttokOPSTATE == POS_Clean){
strcpy(msg, "Toroidal-CT ON"); strcpy(msg, "Toroidal-CT ON");
pvPut(msg); pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n",msg); errlogSevPrintf(NO_ALARM, "%s\n",msg);

BIN
epics/iocs/ISTTOKrpi/bin/linux-arm/ISTTOKrpi
View File

Binary file not shown.

2
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/envPaths
View File

@@ -7,4 +7,4 @@ epicsEnvSet("ASYN","/home/pi/Apps/epics7/support/asyn")
epicsEnvSet("STREAM","/home/pi/Apps/epics7/support/StreamDevice") epicsEnvSet("STREAM","/home/pi/Apps/epics7/support/StreamDevice")
epicsEnvSet("AUTOSAVE","/home/pi/Apps/epics7/support/autosave") epicsEnvSet("AUTOSAVE","/home/pi/Apps/epics7/support/autosave")
epicsEnvSet("DRVASYNI2C","/home/pi/Apps/epics7/support/drvAsynI2C") epicsEnvSet("DRVASYNI2C","/home/pi/Apps/epics7/support/drvAsynI2C")
epicsEnvSet("SNCSEQ","/home/pi/Apps/epics7/support/seq-2-2") epicsEnvSet("SNCSEQ","/home/pi/Apps/epics7/support/seq-2.2.9")

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

@@ -1,10 +1,10 @@
# autosave R5.3 Automatically generated - DO NOT MODIFY - 220214-164146 # autosave R5.3 Automatically generated - DO NOT MODIFY - 220216-181851
ISTTOK:central:PULSE-NUMBER.VAL 49468 ISTTOK:central:PULSE-NUMBER.VAL 49468
ISTTOK:central:LogMessage.VAL ISTTOK:central:LogMessage.VAL
ISTTOK:central:LASTOPSTATE.VAL 2 ISTTOK:central:LASTOPSTATE.VAL 2
ISTTOK:central:OPREQ.VAL 1 ISTTOK:central:OPREQ.VAL 1
ISTTOK:central:PROCESS-MODE.VAL 0 ISTTOK:central:PROCESS-MODE.VAL 0
ISTTOK:central:CLEANINGMANMODE.VAL 1 ISTTOK:central:CLEANINGMANMODE.VAL 0
ISTTOK:central:Emergency-UserButton.VAL 0 ISTTOK:central:Emergency-UserButton.VAL 0
ISTTOK:central:TMPump1-ManualValve.VAL 1 ISTTOK:central:TMPump1-ManualValve.VAL 1
ISTTOK:central:Shot-TorPSCurrent 32 ISTTOK:central:Shot-TorPSCurrent 32

3
epics/iocs/RELEASE.local
View File

@@ -15,7 +15,8 @@ AUTOSAVE = $(SUPPORT)/autosave
#in configure/RELEASE #in configure/RELEASE
#STREAM_WORKAROUND = 1 #STREAM_WORKAROUND = 1
DRVASYNI2C =$(SUPPORT)/drvAsynI2C DRVASYNI2C =$(SUPPORT)/drvAsynI2C
SNCSEQ=$(SUPPORT)/seq-2-2 SNCSEQ=$(SUPPORT)/seq-2.2.9
#SNCSEQ=$(SUPPORT)/seq-2-2
# #
# SEQ is required for testIPServer # SEQ is required for testIPServer
#SNCSEQ=$(SUPPORT)/seq-2-2-5 #SNCSEQ=$(SUPPORT)/seq-2-2-5