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

Added ISTTOK:central:ELCO-Enable. PV and State Machine

Browse Source 
Signed-off-by: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
This commit is contained in:
Bernardo Carvalho
2023-12-05 18:19:42 +00:00
parent b84e2c3cd2
commit d27b978ff4
3 changed files with 128 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,14 +267,23 @@ record( bo, "$(P)$(R)RPump2-Valve" ) {
################################
record(bo, "$(P)$(R)VVessel-Filament" ) {
field(DESC,"Vacuum Vessel Filament power")
# record(bo, "$(P)$(R)FilamentOnOff" ) {
field( OUT, "$(P)$(R)PCF8574:60:REGISTER.B4 PP" )
field( ZNAM, "On" )
field( ONAM, "Off" )
field(VAL,"1")
field(PINI,"YES")
field( ZNAM, "On" )
field( ONAM, "Off" )
field(VAL,"1")
field(PINI,"YES")
}
################################
# ELCO Security Relay #
################################
record(bo, "$(P)$(R)ELCO-Enable") {
field(DESC,"ELCO Charging Relay Enable")
field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B5 PP" )
field(ZNAM, "On" )
field(ONAM, "Off" )
field(VAL,"1")
field(ZSV,"MINOR")
}
############
# NOT USED #
############

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

@@ -247,6 +247,9 @@ assign IsttokClean_PrimContactor to "ISTTOK:central:Clean-PrimContactor";
short IsttokClean_PrimPneuBreaker;
assign IsttokClean_PrimPneuBreaker to "ISTTOK:central:Clean-PrimPneuBreaker";
short IsttokElco_Enable;
assign IsttokElco_Enable to "ISTTOK:central:ELCO-Enable";
short IsttokWaitTimer;
assign IsttokWaitTimer to "ISTTOK:central:COUNTDOWN";
monitor IsttokWaitTimer;
@@ -337,6 +340,9 @@ ss PulseSequence {
IsttokVVessel_Filament = PCF_RELAY_OFF;
pvPut(IsttokVVessel_Filament);
IsttokElco_Enable= PCF_RELAY_OFF;
pvPut(IsttokElco_Enable);
IsttokGasIS_Valves = SEEED_RELAY_OFF;
pvPut(IsttokGasIS_Valves);
@@ -751,6 +757,10 @@ ss PulseSequence {
errlogSevPrintf(MAJOR, "%s\n",msg);
IsttokVVessel_Filament = PCF_RELAY_OFF;
pvPut(IsttokVVessel_Filament);
IsttokElco_Enable= PCF_RELAY_OFF;
pvPut(IsttokElco_Enable);
}
when (delay(1.0) && (IsttokEmergency == OFF) && (IsttokOPSTATE == POS_WaitShot || IsttokOPSTATE==POS_Clean) ){
/* Pulse state change to Idle */
@@ -1182,6 +1192,9 @@ ss ShotSequence {
when( IsttokTTSystem_tzero == 0 ){
strcpy(msg, "Trigger received...");
pvPut(msg);
IsttokElco_Enable= PCF_RELAY_ON;
pvPut(IsttokElco_Enable);
IsttokWaitTimer = -70;
pvPut(IsttokWaitTimer);
WSHOTINGSTATE = WSHTST_Shooting2;
@@ -1293,6 +1306,9 @@ ss ShotSequence {
strcpy(msg, "Buzzer 2-Sound" );
pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n", msg);
IsttokElco_Enable= PCF_RELAY_OFF;
pvPut(IsttokElco_Enable);
IsttokBuzzer = SEEED_RELAY_PULSE;
pvPut(IsttokBuzzer);
strcpy(msg, "Filament ON");

185
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt
View File

@@ -1,21 +1,22 @@
ISTTOK:central:PCF8574:56:REGISTER:READ:FNOUT
ISTTOK:central:PCF8574:57:REGISTER:READ:FNOUT
ISTTOK:central:TMPump1-Power
ISTTOK:central:TMPump1-Emergency
ISTTOK:central:TMPump1-Acceleration
ISTTOK:central:TMPump1-NormalOperation
ISTTOK:central:TMPump2-Emergency
ISTTOK:central:TMPump2-Acceleration
ISTTOK:central:TTSystem-tzero
ISTTOK:central:Emergency-PhysButton
ISTTOK:central:PCF8574:56:REGISTER:READ
ISTTOK:central:PCF8574:57:REGISTER:READ
ISTTOK:central:PCF8574:60:REGISTER:READ
ISTTOK:central:PCF8574:61:REGISTER:READ
ISTTOK:central:SEEED4RELAY:17:REGISTER:READ
ISTTOK:central:SEEED4RELAY:18:REGISTER:READ
ISTTOK:central:SEEED4RELAY:19:REGISTER:READ
ISTTOK:central:CurrentTime
ISTTOK:central:PCF8591:72:DAC
ISTTOK:central:TDA8444:32:DAC_CH0
ISTTOK:central:TDA8444:32:DAC_CH1
ISTTOK:central:TDA8444:32:DAC_CH2
ISTTOK:central:TDA8444:32:DAC_CH3
ISTTOK:central:TDA8444:32:DAC_CH4
ISTTOK:central:TDA8444:32:DAC_CH5
ISTTOK:central:TDA8444:32:DAC_CH6
ISTTOK:central:Shot-TorPSCurrent
ISTTOK:SR_0_State
ISTTOK:SR_1_State
ISTTOK:SR_2_State
ISTTOK:SR_3_State
ISTTOK:SR_4_State
ISTTOK:SR_5_State
ISTTOK:SR_6_State
ISTTOK:SR_7_State
ISTTOK:SR_disableMaxSecs
ISTTOK:central:OPCALCSTATE
ISTTOK:central:STARTCALCSTATE
ISTTOK:central:STOPPINGCALCSTATE
@@ -32,6 +33,71 @@ ISTTOK:central:VVessel-Pressure
ISTTOK:central:RPump1-Pressure
ISTTOK:central:TMPump1-PressureAdmission
ISTTOK:central:RPump2-Pressure
ISTTOK:central:UPS-OnBattery
ISTTOK:central:UPS-Shutdown
ISTTOK:central:OPREQ
ISTTOK:central:CLEANINGMANMODE
ISTTOK:central:FSTriggerStart
ISTTOK:central:PROCESS-MODE
ISTTOK:central:PROCESS-REQ
ISTTOK:central:AUTHORISATION
ISTTOK:central:TMPump1-ControllerOn
ISTTOK:central:TMPump1-ControllerOff
ISTTOK:central:TMPump1-MotorOn
ISTTOK:central:TMPump1-MotorOff
ISTTOK:central:TMPump2-Motor
ISTTOK:central:Emergency-UserButton
ISTTOK:central:RPump1-Motor
ISTTOK:central:RPump1-Valve
ISTTOK:central:RPump2-Motor
ISTTOK:central:RPump2-Valve
ISTTOK:central:VVessel-Filament
ISTTOK:central:ELCO-Enable
ISTTOK:central:Shot-TorPSTrigger
ISTTOK:central:GasIS-Valves
ISTTOK:central:TMPump1-ManualValve
ISTTOK:central:Clean-PrimPneuBreaker
ISTTOK:central:CapBank-Discharge
ISTTOK:central:Clean-TorPneuBreaker
ISTTOK:central:Clean-PrimContactor
ISTTOK:central:Clean-TorContactor
ISTTOK:central:CapBank-Charge
ISTTOK:central:Buzzer
ISTTOK:central:Shot-TorPSDisable
ISTTOK:central:Lab-WarningLight
ISTTOK:SR_heartbeat
ISTTOK:SR_i_am_alive
ISTTOK:SR_deadIfZero
ISTTOK:SR_disable
ISTTOK:central:TMPump1-Power
ISTTOK:central:TMPump1-Emergency
ISTTOK:central:TMPump1-Acceleration
ISTTOK:central:TMPump1-NormalOperation
ISTTOK:central:TMPump2-Emergency
ISTTOK:central:TMPump2-Acceleration
ISTTOK:central:TTSystem-tzero
ISTTOK:central:Emergency-PhysButton
ISTTOK:central:PCF8574:56:REGISTER:READ:FNOUT
ISTTOK:central:PCF8574:57:REGISTER:READ:FNOUT
ISTTOK:marte2:ADC0S
ISTTOK:central:TMPump2-Speed
ISTTOK:central:TMPump2-Current
ISTTOK:central:Shot-TorPSCurrentImage
ISTTOK:central:PCF8574:56:REGISTER:READ
ISTTOK:central:PCF8574:57:REGISTER:READ
ISTTOK:central:PCF8574:60:REGISTER:READ
ISTTOK:central:PCF8574:61:REGISTER:READ
ISTTOK:central:SEEED4RELAY:17:REGISTER:READ
ISTTOK:central:SEEED4RELAY:18:REGISTER:READ
ISTTOK:central:SEEED4RELAY:19:REGISTER:READ
ISTTOK:central:PCF8574:56:REGISTER
ISTTOK:central:PCF8574:57:REGISTER
ISTTOK:central:PCF8574:60:REGISTER
ISTTOK:central:PCF8574:61:REGISTER
ISTTOK:central:PCF8591:72:CTRLREGISTER
ISTTOK:central:SEEED4RELAY:17:REGISTER
ISTTOK:central:SEEED4RELAY:18:REGISTER
ISTTOK:central:SEEED4RELAY:19:REGISTER
ISTTOK:central:TraceMessage
ISTTOK:central:LogMessage
ISTTOK:central:RS485Debug
@@ -64,39 +130,6 @@ ISTTOK:SR_6_Time
ISTTOK:SR_7_Name
ISTTOK:SR_7_StatusStr
ISTTOK:SR_7_Time
ISTTOK:central:PCF8591:72:DAC
ISTTOK:central:TDA8444:32:DAC_CH0
ISTTOK:central:TDA8444:32:DAC_CH1
ISTTOK:central:TDA8444:32:DAC_CH2
ISTTOK:central:TDA8444:32:DAC_CH3
ISTTOK:central:TDA8444:32:DAC_CH4
ISTTOK:central:TDA8444:32:DAC_CH5
ISTTOK:central:TDA8444:32:DAC_CH6
ISTTOK:central:Shot-TorPSCurrent
ISTTOK:SR_0_State
ISTTOK:SR_1_State
ISTTOK:SR_2_State
ISTTOK:SR_3_State
ISTTOK:SR_4_State
ISTTOK:SR_5_State
ISTTOK:SR_6_State
ISTTOK:SR_7_State
ISTTOK:SR_disableMaxSecs
ISTTOK:central:PCF8574:56:REGISTER
ISTTOK:central:PCF8574:57:REGISTER
ISTTOK:central:PCF8574:60:REGISTER
ISTTOK:central:PCF8574:61:REGISTER
ISTTOK:central:PCF8591:72:CTRLREGISTER
ISTTOK:central:SEEED4RELAY:17:REGISTER
ISTTOK:central:SEEED4RELAY:18:REGISTER
ISTTOK:central:SEEED4RELAY:19:REGISTER
ISTTOK:central:TMPump1-ControllerOnInv
ISTTOK:central:TMPump1-ControllerOffInv
ISTTOK:central:TMPump1-MotorOnInv
ISTTOK:central:TMPump1-MotorOffInv
ISTTOK:central:Shot-TorPSTriggerInv
ISTTOK:central:REGISTER61-BLINK
ISTTOK:central:REGISTER56-BLINK
ISTTOK:central:OPSTATE
ISTTOK:central:LASTOPSTATE
ISTTOK:central:STARTINGSTATE
@@ -113,44 +146,11 @@ ISTTOK:SR_4_Status
ISTTOK:SR_5_Status
ISTTOK:SR_6_Status
ISTTOK:SR_7_Status
ISTTOK:central:UPS-OnBattery
ISTTOK:central:UPS-Shutdown
ISTTOK:central:OPREQ
ISTTOK:central:CLEANINGMANMODE
ISTTOK:central:FSTriggerStart
ISTTOK:central:PROCESS-MODE
ISTTOK:central:PROCESS-REQ
ISTTOK:central:AUTHORISATION
ISTTOK:central:TMPump1-ControllerOn
ISTTOK:central:TMPump1-ControllerOff
ISTTOK:central:TMPump1-MotorOn
ISTTOK:central:TMPump1-MotorOff
ISTTOK:central:TMPump2-Motor
ISTTOK:central:Emergency-UserButton
ISTTOK:central:RPump1-Motor
ISTTOK:central:RPump1-Valve
ISTTOK:central:RPump2-Motor
ISTTOK:central:RPump2-Valve
ISTTOK:central:VVessel-Filament
ISTTOK:central:Shot-TorPSTrigger
ISTTOK:central:GasIS-Valves
ISTTOK:central:TMPump1-ManualValve
ISTTOK:central:Clean-PrimPneuBreaker
ISTTOK:central:CapBank-Discharge
ISTTOK:central:Clean-TorPneuBreaker
ISTTOK:central:Clean-PrimContactor
ISTTOK:central:Clean-TorContactor
ISTTOK:central:CapBank-Charge
ISTTOK:central:Buzzer
ISTTOK:central:Shot-TorPSDisable
ISTTOK:central:Lab-WarningLight
ISTTOK:SR_heartbeat
ISTTOK:SR_i_am_alive
ISTTOK:SR_deadIfZero
ISTTOK:SR_disable
ISTTOK:central:TMPump2-Speed
ISTTOK:central:TMPump2-Current
ISTTOK:central:Shot-TorPSCurrentImage
ISTTOK:marte2:STATUS
ISTTOK:marte2:COMMAND
ISTTOK:marte2:RESET
ISTTOK:marte2:TIME
ISTTOK:marte2:COUNTER
ISTTOK:central:PCF8591:72:ADC_CH1
ISTTOK:central:PCF8591:72:ADC_CH2
ISTTOK:central:PCF8591:72:ADC_CH3
@@ -162,3 +162,12 @@ ISTTOK:central:P003:M
ISTTOK:central:P003:E
ISTTOK:central:P004:M
ISTTOK:central:P004:E
ISTTOK:marte2:HIST-IDLE-CT
ISTTOK:marte2:HIST-RUN-CT
ISTTOK:central:TMPump1-ControllerOnInv
ISTTOK:central:TMPump1-ControllerOffInv
ISTTOK:central:TMPump1-MotorOnInv
ISTTOK:central:TMPump1-MotorOffInv
ISTTOK:central:Shot-TorPSTriggerInv
ISTTOK:central:REGISTER61-BLINK
ISTTOK:central:REGISTER56-BLINK