diff --git a/epics/README.md b/epics/README.md index 50cce26..b943dae 100644 --- a/epics/README.md +++ b/epics/README.md @@ -162,8 +162,8 @@ Process Variables in this IOC Server: |ISTTOK:central:COUNTDOWN | mbbi | no | |ISTTOK:central:PULSE-NUMBER | longout | yes | |ISTTOK:central:OPSTATE |longout | yes | -|ISTTOK:central:UPS-OnBattery | bo | yes | -|ISTTOK:central:UPS-Shutdown | bo | yes | +|ISTTOK:central:UPS-OnBattery | bo | no | +|ISTTOK:central:UPS-Shutdown | bo | no | |ISTTOK:central:CurrentTime | stringin | no | |ISTTOK:central:TraceMessage | stringout | yes | |ISTTOK:central:LogMessage | stringout | yes | @@ -232,12 +232,12 @@ Process Variables in this IOC Server: * Connected to RS485 Bus (Using USB */dev/ttyUSB0*) -|PV Name |PV Type |Archive| RS485 command| +|PV Name |PV Type |Archive| RS485 request command| |:----------|-------|---:|---| -|ISTTOK:central:RPump1-Pressure | ai | yes | out "0020074002=?107"; | +|ISTTOK:central:VVessel-Pressure | ai | yes | out "0010074002=?106"| +|ISTTOK:central:RPump1-Pressure | ai | yes | out "0020074002=?107" | |ISTTOK:central:RPump2-Pressure (Disabled) | ai | yes | | -|ISTTOK:central:TMPump1-PressureAdmission | ai | yes | out "0010074002=?106"; | -|ISTTOK:central:VVessel-Pressure | ai | yes | out "0030074002=?108";| +|ISTTOK:central:TMPump1-PressureAdmission | ai | yes | out "0030074002=?108" | ---------- diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db index 80aaeb7..997e6aa 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db @@ -10,15 +10,15 @@ record (longin, "$(P)$(R)P001:M") # field (SCAN, "I/O Intr") field (SCAN, "1 second") field(PHAS, "1") - field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") + field (FLNK, "$(P)$(R)VVessel-Pressure") } record (longin, "$(P)$(R)P001:E") { field (DESC, "Pressure001 exponent $(bus)") } -record (calc, "$(P)$(R)TMPump1-PressureAdmission") +record (calc, "$(P)$(R)VVessel-Pressure") { - field(DESC, "ISTTOK:central:TMPump1-PressureAdmission") + field (DESC, "ISTTOK:central:VVessel-Pressure") # Maximize Status and Severity, MSS propagate all alarms field(INPA, "$(P)$(R)P001:M MSS") field(INPB, "$(P)$(R)P001:E") @@ -27,12 +27,14 @@ record (calc, "$(P)$(R)TMPump1-PressureAdmission") field(EGU, "mBar") field(HIHI,"1.0e-2") field(HIGH,"1.0e-3") + field(LOW,"1.0e-9") + field(LOLO,"0.5e-9") # field(LOW, "20.0") # field(LOLO,"0.0") field(HHSV,"MAJOR") field(HSV, "MINOR") -# field(LSV, "MINOR") -# field(LLSV,"MAJOR") + field(LSV, "MINOR") + field(LLSV,"MAJOR") } # out "0020074002=?107"; record (longin, "$(P)$(R)P002:M") @@ -76,16 +78,17 @@ record (longin, "$(P)$(R)P003:M") field (SCAN, "1 second") field(PHAS, "2") # field (SCAN, "I/O Intr") - field (FLNK, "$(P)$(R)VVessel-Pressure") + field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") } record (longin, "$(P)$(R)P003:E") { field (DESC, "Pressure003 Exponent $(bus)") } -record (calc, "$(P)$(R)VVessel-Pressure") + +record (calc, "$(P)$(R)TMPump1-PressureAdmission") { - field (DESC, "ISTTOK:central:VVessel-Pressure") + field(DESC, "ISTTOK:central:TMPump1-PressureAdmission") field(INPA, "$(P)$(R)P003:M MSS") field(INPB, "$(P)$(R)P003:E") field(CALC, "(A*0.001)*10.0**(B-20)") @@ -93,8 +96,12 @@ record (calc, "$(P)$(R)VVessel-Pressure") field(EGU, "mBar") field(HIHI,"1.0e-1") field(HIGH,"1.0e-2") + field(LOW,"1.0e-9") + field(LOLO,"0.5e-9") field(HHSV,"MAJOR") field(HSV, "MINOR") + field(LSV, "MINOR") + field(LLSV,"MAJOR") } # out "0040074002=?109"; diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db index 4442c8f..4eb0978 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db @@ -152,7 +152,7 @@ record(bo, "$(P)$(R)PROCESS-MODE") { info(autosaveFields, "VAL") field(DESC, "Plasma Process Mode") #field(VAL, "0") - field(PINI, "YES") + #field(PINI, "YES") field(ZNAM, "CLEAN") field(ONAM, "SHOT") } @@ -163,6 +163,8 @@ record(bo, "$(P)$(R)PROCESS-REQ") { field(PINI, "YES") field(ZNAM, "STOP") field(ONAM, "START") + field(SCAN,"Passive") + field(FLNK, "$(P)$(R)PULSE-NUMBER") } record(bo, "$(P)$(R)AUTHORISATION") { @@ -172,16 +174,23 @@ record(bo, "$(P)$(R)AUTHORISATION") { field(VAL, "0") } -record(longout, "$(P)$(R)PULSE-NUMBER") { +record(calc, "$(P)$(R)PULSE-NUMBER") { info(autosaveFields, "VAL") field(DESC, "Pulse Number") - field(PINI, "YES") + field(INPA, "$(P)$(R)PROCESS-REQ NPP") + field(INPB, "$(P)$(R)PULSE-NUMBER") + field(INPC, "$(P)$(R)PROCESS-MODE NPP") + field(CALC, "(A=1)? B+C :B") + field(SCAN,"Passive") +# field(PINI, "YES") } record(calc, "$(P)$(R)COUNTDOWN") { field(DESC, "Countdown Increment") field(INPA,"$(P)$(R)COUNTDOWN") - field(SCAN,"Passive") + field(DISA,"1") + #field(SCAN,"Passive") + field(SCAN,"1 second") field(CALC,"A+1") field(VAL, "160") } diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 1cee8dc..b34003f 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -233,8 +233,11 @@ short IsttokShotCountdown; assign IsttokShotCountdown to "ISTTOK:central:COUNTDOWN"; monitor IsttokShotCountdown; -string IsttokShotCountdownScan; -assign IsttokShotCountdownScan to "ISTTOK:central:COUNTDOWN.SCAN"; +//string IsttokShotCountdownScan; +//assign IsttokShotCountdownScan to "ISTTOK:central:COUNTDOWN.SCAN"; + +short IsttokShotCountdownDisa; +assign IsttokShotCountdownDisa to "ISTTOK:central:COUNTDOWN.DISA"; short IsttokEmergency; assign IsttokEmergency to "ISTTOK:central:Emergency"; @@ -1027,8 +1030,10 @@ ss ShotSequence { entry { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); - strcpy(IsttokShotCountdownScan, "Passive"); - pvPut(IsttokShotCountdownScan); + IsttokShotCountdownDisa = 1; + pvPut(IsttokShotCountdownDisa); +// strcpy(IsttokShotCountdownScan, "Passive"); +// pvPut(IsttokShotCountdownScan); } when( IsttokOPSTATE == POS_WaitShot ){ //strcpy(msg, "Waiting for Trigger..."); @@ -1036,8 +1041,11 @@ ss ShotSequence { //errlogSevPrintf(NO_ALARM, "%s\n",msg); IsttokShotCountdown = 0; pvPut(IsttokShotCountdown); - strcpy(IsttokShotCountdownScan, "1 second"); - pvPut(IsttokShotCountdownScan); + // Enable Counting + IsttokShotCountdownDisa = 0; + pvPut(IsttokShotCountdownDisa); +// strcpy(IsttokShotCountdownScan, "1 second"); +// pvPut(IsttokShotCountdownScan); WSHOTINGSTATE = WSHTST_ShotEnd; pvPut(WSHOTINGSTATE); //WSHOTINGSTATE = WSHTST_WaitTrg;