From d616a7fa1f0daf1362ae2c1feca7f00418d34b61 Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Fri, 4 Feb 2022 15:42:12 +0000 Subject: [PATCH] Inserted 3rd Relay Board and PVs --- .../ISTTOKrpiApp/Db/ISTTOKmachineControl.db | 56 ++++++++++++------- .../ISTTOKrpiApp/src/IsttokSeqExec.stt | 16 +++--- .../iocBoot/iocISTTOKrpi/access_security.acf | 4 +- .../iocISTTOKrpi/save/iocISTTOKrpi.sav | 4 +- 4 files changed, 48 insertions(+), 32 deletions(-) diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db index 7634e06..2133001 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db @@ -275,18 +275,6 @@ record(bo, "$(P)$(R)VVessel-Filament" ) { field(PINI,"YES") } -############################## -# LIGHTS ON/OFF # -############################## -record(bo, "$(P)$(R)Lab-WarningLight" ) { - field(DESC," Luzes de sinalização, 220V ") -# record(bo, "$(P)$(R)LightsOnOff" ) { - field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B5 PP" ) - field(ZNAM, "On" ) - field(ONAM, "Off" ) - field(VAL,"1") -} - ############ # NOT USED # ############ @@ -298,14 +286,6 @@ record(bo, "$(P)$(R)Lab-WarningLight" ) { ############### ############### -record(bo, "$(P)$(R)Shot-TorPSDisable" ) { -# field(DESC," É desligado na emergência e em qualquer estado que não seja Process ou Wait Shot.") - field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B1 PP" ) - field( ZNAM, "Off" ) - field( ONAM, "On" ) - field(VAL,"1") -} - record(bo, "$(P)$(R)Shot-TorPSTrigger" ) { field(DESC," Trigger da FRAEP") field( ZNAM, "Off" ) @@ -463,6 +443,42 @@ record(bo, "$(P)$(R)Buzzer" ) { field(OSV,"MINOR") } +############################## +# LIGHTS ON/OFF # +############################## +record(bo, "$(P)$(R)Lab-WarningLight" ) { + field(DESC,"Luzes de sinalização, 220V ") +# ####field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B5 PP" ) + field(OUT,"$(P)$(R)SEEED4RELAY:19:REGISTER.B0 PP") + field(ZNAM,"OFF") + field(ONAM, "ON") + field(VAL, "0") + field(OSV,"MINOR") +} +# field(ZNAM, "On" ) +# field(ONAM, "Off" ) +# field(VAL,"1") +#} + +###################################### +# Tor Power Supply Disable # +# É desligado na emergência e em qualquer estado que +# não seja Process ou Wait Shot. +###################################### +record(bo, "$(P)$(R)Shot-TorPSDisable" ) { + field(DESC,"Tor Power Supply Disable") + ####field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B1 PP" ) + field(OUT,"$(P)$(R)SEEED4RELAY:19:REGISTER.B1 PP") + field( ZNAM, "Enabled" ) + field( ONAM, "Disabled" ) + field(VAL,"0") + field(OSV,"MINOR") +} +# field( ZNAM, "Off" ) +# field( ONAM, "On" ) +# field(VAL,"1") +#} + # field(ZNAM, "Off" ) # field(ONAM, "Pulse" ) # field(HIGH, "2.5") diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index a6a617f..1a35789 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -312,7 +312,7 @@ ss PulseSequence { IsttokGasIS_Valves = SEEED_RELAY_OFF; pvPut(IsttokGasIS_Valves); - IsttokLab_WarningLight = PCF_RELAY_OFF; + IsttokLab_WarningLight = SEEED_RELAY_OFF; pvPut(IsttokLab_WarningLight); IsttokClean_TorPneuBreaker = SEEED_RELAY_OFF; @@ -321,7 +321,7 @@ ss PulseSequence { IsttokClean_TorContactor = SEEED_RELAY_OFF; pvPut(IsttokClean_TorContactor); - Isttok_TorPSDisable = PCF_RELAY_OFF; + Isttok_TorPSDisable = SEEED_RELAY_OFF; pvPut(Isttok_TorPSDisable); Isttok_TorPSTrigger= OFF; @@ -436,7 +436,7 @@ ss PulseSequence { pvPut(IsttokOPSTATE); IsttokLastOPSTATE = POS_Idle; pvPut(IsttokLastOPSTATE); - Isttok_TorPSDisable = PCF_RELAY_OFF; + Isttok_TorPSDisable = SEEED_RELAY_OFF; pvPut(Isttok_TorPSDisable); IsttokProcReq = STOP; pvPut(IsttokProcReq); @@ -547,7 +547,7 @@ ss PulseSequence { strcpy(msg, "Toroidal Shot Enable"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); - Isttok_TorPSDisable = PCF_RELAY_ON; + Isttok_TorPSDisable = SEEED_RELAY_ON; pvPut(Isttok_TorPSDisable); IsttokOPSTATE = POS_WaitShot; pvPut(IsttokOPSTATE); @@ -597,7 +597,7 @@ ss PulseSequence { IsttokOPSTATE = POS_Stopping; pvPut(IsttokOPSTATE); /*Just to be sure */ - Isttok_TorPSDisable = PCF_RELAY_OFF; + Isttok_TorPSDisable = SEEED_RELAY_OFF; pvPut(Isttok_TorPSDisable); IsttokCapBank_Charge = SEEED_RELAY_OFF; @@ -641,7 +641,7 @@ ss PulseSequence { strcpy(msg, "Emergency Toroidal Shot Disable"); pvPut(msg); errlogSevPrintf(MAJOR, "%s\n",msg); - Isttok_TorPSDisable = PCF_RELAY_OFF; + Isttok_TorPSDisable = SEEED_RELAY_OFF; pvPut(Isttok_TorPSDisable); strcpy(msg, "EMERGENCY: CAPBANK Charge OFF"); @@ -1123,7 +1123,7 @@ ss ShotSequence { strcpy(msg, "Lights ON"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); - IsttokLab_WarningLight = PCF_RELAY_ON; + IsttokLab_WarningLight = SEEED_RELAY_ON; pvPut(IsttokLab_WarningLight); WSHOTINGSTATE = WSHTST_Shooting3; pvPut(WSHOTINGSTATE); @@ -1305,7 +1305,7 @@ ss ShotSequence { strcpy(msg, "Lights OFF and Recovering..." ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); - IsttokLab_WarningLight = PCF_RELAY_OFF; + IsttokLab_WarningLight = SEEED_RELAY_OFF; pvPut(IsttokLab_WarningLight); WSHOTINGSTATE = WSHTST_ShotEnd; pvPut(WSHOTINGSTATE); diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/access_security.acf b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/access_security.acf index a94fc6e..655a5b7 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/access_security.acf +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/access_security.acf @@ -1,6 +1,6 @@ #UAG(uag) {pi,root,opertok,codac-dev,pricardofc} -UAG(uag) {pi,root,opertok,codac-dev} -HAG(hag) {rpi-isttok,opertok-desktop,atca2} +UAG(uag) {pi,root,opertok,codac-dev,oper} +HAG(hag) {rpi-isttok,opertok-desktop,atca2,timings} ASG(DEFAULT) { RULE(1,READ) RULE(1,WRITE) { diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav index b78bc64..a8b23c7 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav @@ -1,7 +1,7 @@ -# autosave R5.3 Automatically generated - DO NOT MODIFY - 220204-002940 +# autosave R5.3 Automatically generated - DO NOT MODIFY - 220204-153705 ISTTOK:central:PULSE-NUMBER.VAL 49468 ISTTOK:central:LogMessage.VAL -ISTTOK:central:LASTOPSTATE.VAL 5 +ISTTOK:central:LASTOPSTATE.VAL 2 ISTTOK:central:OPREQ.VAL 1 ISTTOK:central:PROCESS-MODE.VAL 0 ISTTOK:central:CLEANINGMANMODE.VAL 1