From 52239c79a4416f0695f5fa70c76b3cd820fb0d8d Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Thu, 19 Dec 2019 17:31:11 +0000 Subject: [PATCH] Commit BBC --- epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db | 5 +++++ epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt | 3 ++- epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/envPaths | 2 +- epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/run-ioc.sh | 0 .../ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav | 6 +++--- epics/iocs/ISTTOKrpi/protocols/sendmail.proto | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-) mode change 100644 => 100755 epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/run-ioc.sh diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db index 48323cc..31fd91c 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db @@ -172,6 +172,11 @@ record(stringout, "$(P)$(R)TraceMessage") { field(VAL, "Trace mode ON") } +record(stringout, "$(P)$(R)LogMessage") { + field(DESC, "Log Message ") +# field(VAL, "Trace mode ON") +} + record(mbbi, "$(P)$(R)STARTINGSTATE") { field(DESC, "Starting State Sequence") field(ZRVL, "0") diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index ad1d79b..04b4a9d 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -404,7 +404,8 @@ ss PulseSequence { /* Vacuum emergency: Pulse state change to Stopping */ IsttokOPREQ = STOP; pvPut(IsttokOPREQ); - strcpy(sendMail, "Vacuum Emergency while Process"); + //strcpy(sendMail, "Vacuum Emergency while Process"); + sprintf(sendMail, "R1:%1.1e R2:%.1e T1:%d T2:%d",IsttokRPump1_Pressure,IsttokRPump2_Pressure,IsttokTMPump1_Emergency,IsttokTMPump2_Emergency); pvPut(sendMail); } state Stopping diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/envPaths b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/envPaths index a12d17a..666b481 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/envPaths +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/envPaths @@ -1,5 +1,5 @@ epicsEnvSet("IOC","iocISTTOKrpi") -epicsEnvSet("TOP","/opt/epics/iocs/ISTTOKrpi") +epicsEnvSet("TOP","/home/pi/ISTTOK/epics/iocs/ISTTOKrpi") epicsEnvSet("SUPPORT","/usr/local/epics/base/../synApps_5_8/support") epicsEnvSet("SNCSEQ","/usr/local/epics/base/../synApps_5_8/support/seq-2-2-1") epicsEnvSet("ASYN","/usr/local/epics/base/../synApps_5_8/support/asyn-4-26") diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/run-ioc.sh b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/run-ioc.sh old mode 100644 new mode 100755 diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav index 0916142..d73c945 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav @@ -1,8 +1,8 @@ -# autosave R5.3 Automatically generated - DO NOT MODIFY - 191212-114303 -ISTTOK:central:PULSE-NUMBER.VAL 48173 +# autosave R5.3 Automatically generated - DO NOT MODIFY - 191219-172657 +ISTTOK:central:PULSE-NUMBER.VAL 48291 ISTTOK:central:LASTOPSTATE.VAL 2 ISTTOK:central:OPREQ 1 -ISTTOK:central:PROCESS-MODE.VAL 0 +ISTTOK:central:PROCESS-MODE.VAL 1 ISTTOK:central:CLEANINGMANMODE.VAL 1 ISTTOK:central:Emergency-UserButton.VAL 0 ISTTOK:central:TMPump1-ManualValve.VAL 1 diff --git a/epics/iocs/ISTTOKrpi/protocols/sendmail.proto b/epics/iocs/ISTTOKrpi/protocols/sendmail.proto index 1d04261..3a7fe99 100644 --- a/epics/iocs/ISTTOKrpi/protocols/sendmail.proto +++ b/epics/iocs/ISTTOKrpi/protocols/sendmail.proto @@ -39,7 +39,8 @@ mail_end { send { mail_start; - out "Problem is: %s"; + out "Problem is: %s\n"; + out "Please check: http://epics.ipfn.ist.utl.pt/isttok"; mail_end; }