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

Moved pfeiffer sensors to central IOC. MSS fields where added

Browse Source
This commit is contained in:
Bernardo Carvalho
2021-12-15 00:33:46 +00:00
parent 01cb2eec4e
commit a055c01789
8 changed files with 282 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,8 @@ record(bo, "$(P)$(R)TMPump1-ControllerOn" ) {
field(ZNAM, "Off" ) field(ZNAM, "Off" )
field(ONAM, "Pulse" ) field(ONAM, "Pulse" )
field(HIGH, "2.5") field(HIGH, "2.5")
field(FLNK, "$(P)$(R)TMPump1-ControllerOnInv" ) # Disabled until further notice
# field(FLNK, "$(P)$(R)TMPump1-ControllerOnInv" )
field(VAL,"0") field(VAL,"0")
} }
record(calcout, "$(P)$(R)TMPump1-ControllerOnInv") { record(calcout, "$(P)$(R)TMPump1-ControllerOnInv") {
@@ -43,7 +44,8 @@ record(bo, "$(P)$(R)TMPump1-ControllerOff" ) {
field(ZNAM, "Off" ) field(ZNAM, "Off" )
field(ONAM, "Pulse" ) field(ONAM, "Pulse" )
field(HIGH, "2.5") field(HIGH, "2.5")
field(FLNK, "$(P)$(R)TMPump1-ControllerOffInv" ) # Disabled until further notice
# field(FLNK, "$(P)$(R)TMPump1-ControllerOffInv" )
field(VAL,"0") field(VAL,"0")
} }

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

@@ -94,6 +94,8 @@ record(ai, "$(P)$(R)Shot-TorPSCurrentImage" ) {
field(DTYP, "Raw Soft Channel" ) field(DTYP, "Raw Soft Channel" )
field(INP, "$(P)$(R)PCF8591:72:BYTE2_CH3 PP NMS") field(INP, "$(P)$(R)PCF8591:72:BYTE2_CH3 PP NMS")
field(SCAN, ".2 second") field(SCAN, ".2 second")
#Scan Disable Input Link Value
field(DISA, "1")
field(ASLO, "39.215686275" ) field(ASLO, "39.215686275" )
field(AOFF, "0.0" ) field(AOFF, "0.0" )
field(EGU, "A" ) field(EGU, "A" )

13
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db
View File

@@ -1,3 +1,4 @@
# vim: sta:et:sw=4:ts=4:sts=4
# 8/5/2021 Only sensor 2 is working. Running with dspIC # 8/5/2021 Only sensor 2 is working. Running with dspIC
# 20/9/2021 sensors 1,2,3 are working. Running with dspIC # 20/9/2021 sensors 1,2,3 are working. Running with dspIC
# 20/9/2021 sensors 1,2,3 are working. Running with tty USB # 20/9/2021 sensors 1,2,3 are working. Running with tty USB
@@ -8,6 +9,7 @@ record (longin, "$(P)$(R)P001:M")
field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)") field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)")
# field (SCAN, "I/O Intr") # field (SCAN, "I/O Intr")
field (SCAN, "1 second") field (SCAN, "1 second")
field(PHAS, "1")
field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") field (FLNK, "$(P)$(R)TMPump1-PressureAdmission")
} }
record (longin, "$(P)$(R)P001:E") record (longin, "$(P)$(R)P001:E")
@@ -17,7 +19,8 @@ record (longin, "$(P)$(R)P001:E")
record (calc, "$(P)$(R)TMPump1-PressureAdmission") record (calc, "$(P)$(R)TMPump1-PressureAdmission")
{ {
field(DESC, "ISTTOK:central:TMPump1-PressureAdmission") field(DESC, "ISTTOK:central:TMPump1-PressureAdmission")
field(INPA, "$(P)$(R)P001:M") # Maximize Status and Severity, MSS propagate all alarms
field(INPA, "$(P)$(R)P001:M MSS")
field(INPB, "$(P)$(R)P001:E") field(INPB, "$(P)$(R)P001:E")
field(CALC, "(A*0.001)* 10.0**(B-20)") field(CALC, "(A*0.001)* 10.0**(B-20)")
field(PREC, "3") field(PREC, "3")
@@ -39,6 +42,7 @@ record (longin, "$(P)$(R)P002:M")
field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)") field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)")
# field (SCAN, "I/O Intr") # field (SCAN, "I/O Intr")
field (SCAN, "1 second") field (SCAN, "1 second")
field(PHAS, "0")
field (FLNK, "$(P)$(R)RPump1-Pressure") field (FLNK, "$(P)$(R)RPump1-Pressure")
} }
record (longin, "$(P)$(R)P002:E") record (longin, "$(P)$(R)P002:E")
@@ -48,7 +52,7 @@ record (longin, "$(P)$(R)P002:E")
record (calc, "$(P)$(R)RPump1-Pressure") record (calc, "$(P)$(R)RPump1-Pressure")
{ {
field (DESC, "ISTTOK:central:RPump1-Pressure") field (DESC, "ISTTOK:central:RPump1-Pressure")
field(INPA, "$(P)$(R)P002:M") field(INPA, "$(P)$(R)P002:M MSS")
field(INPB, "$(P)$(R)P002:E") field(INPB, "$(P)$(R)P002:E")
field(CALC, "(A*0.001)*10.0**(B-20)") field(CALC, "(A*0.001)*10.0**(B-20)")
field(PREC, "3") field(PREC, "3")
@@ -70,6 +74,7 @@ record (longin, "$(P)$(R)P003:M")
field (DTYP, "stream") field (DTYP, "stream")
field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)") field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)")
field (SCAN, "1 second") field (SCAN, "1 second")
field(PHAS, "2")
# field (SCAN, "I/O Intr") # field (SCAN, "I/O Intr")
field (FLNK, "$(P)$(R)VVessel-Pressure") field (FLNK, "$(P)$(R)VVessel-Pressure")
} }
@@ -81,7 +86,7 @@ record (longin, "$(P)$(R)P003:E")
record (calc, "$(P)$(R)VVessel-Pressure") record (calc, "$(P)$(R)VVessel-Pressure")
{ {
field (DESC, "ISTTOK:central:VVessel-Pressure") field (DESC, "ISTTOK:central:VVessel-Pressure")
field(INPA, "$(P)$(R)P003:M") field(INPA, "$(P)$(R)P003:M MSS")
field(INPB, "$(P)$(R)P003:E") field(INPB, "$(P)$(R)P003:E")
field(CALC, "(A*0.001)*10.0**(B-20)") field(CALC, "(A*0.001)*10.0**(B-20)")
field(PREC, "3") field(PREC, "3")
@@ -111,7 +116,7 @@ record (longin, "$(P)$(R)P004:E")
record (calc, "$(P)$(R)RPump2-Pressure") record (calc, "$(P)$(R)RPump2-Pressure")
{ {
field(DESC, "ISTTOK:central:RPump2-Pressure") field(DESC, "ISTTOK:central:RPump2-Pressure")
field(INPA, "$(P)$(R)P004:M") field(INPA, "$(P)$(R)P004:M MSS")
field(INPB, "$(P)$(R)P004:E") field(INPB, "$(P)$(R)P004:E")
field(CALC, "(A*0.001)* 10.0**(B-20)") field(CALC, "(A*0.001)* 10.0**(B-20)")
field(PREC, "3") field(PREC, "3")

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

@@ -1,3 +1,4 @@
# vim: sta:et:sw=4:ts=4:sts=4
# #
# Project : ISTTOK slow Control # Project : ISTTOK slow Control
# #
@@ -31,6 +32,8 @@ record(mbbi, "$(P)$(R)OPSTATE") {
field(SXST, "Emergency") field(SXST, "Emergency")
field(SVST, "UPSEmergency") field(SVST, "UPSEmergency")
field(VAL, "0") field(VAL, "0")
field(FLNK, "$(P)$(R)OPCALCSTATE")
#field(PINI, "YES")
} }
record(mbbo, "$(P)$(R)LASTOPSTATE") { record(mbbo, "$(P)$(R)LASTOPSTATE") {
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
@@ -51,14 +54,16 @@ record(mbbo, "$(P)$(R)LASTOPSTATE") {
field(FVST, "Stopping") field(FVST, "Stopping")
field(SXST, "Emergency") field(SXST, "Emergency")
field(SVST, "UPSEmergency") field(SVST, "UPSEmergency")
field(PINI, "YES")
# field(VAL, "0") # field(VAL, "0")
} }
# record for bit leds
record(calc, "$(P)$(R)OPCALCSTATE") { record(calc, "$(P)$(R)OPCALCSTATE") {
field(DESC, "Pulse Calculated State") field(DESC, "Pulse Calculated State")
field(CALC,"2^A") field(CALC,"2^A")
field(SCAN,"1 second") #field(SCAN,"1 second")
field(INPA,"$(P)$(R)OPSTATE.VAL PP NMS") field(INPA,"$(P)$(R)OPSTATE.VAL NPP NMS")
} }
record(calc, "$(P)$(R)STARTCALCSTATE") { record(calc, "$(P)$(R)STARTCALCSTATE") {
@@ -112,12 +117,14 @@ record(bo, "$(P)$(R)UPS-Shutdown") {
field(ZNAM, "OFF") field(ZNAM, "OFF")
field(ONAM, "ON") field(ONAM, "ON")
field(OSV, "MAJOR") field(OSV, "MAJOR")
field(PINI, "YES")
} }
record(bo, "$(P)$(R)OPREQ") { record(bo, "$(P)$(R)OPREQ") {
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
field(DESC, "Pulse Sequence Start/Stop") field(DESC, "Pulse Sequence Start/Stop")
# field(VAL, "0") # field(VAL, "0")
field(PINI, "YES")
field(ZNAM, "STOP") field(ZNAM, "STOP")
field(ONAM, "START") field(ONAM, "START")
} }
@@ -135,6 +142,7 @@ record(bo, "$(P)$(R)CLEANINGMANMODE") {
record(bo, "$(P)$(R)FSTriggerStart") { record(bo, "$(P)$(R)FSTriggerStart") {
field(DESC, "FireSignal Trigger Start") field(DESC, "FireSignal Trigger Start")
field(VAL, "0") field(VAL, "0")
field(PINI, "YES")
field(ZNAM, "STOP") field(ZNAM, "STOP")
field(ONAM, "START") field(ONAM, "START")
} }
@@ -143,6 +151,7 @@ record(bo, "$(P)$(R)PROCESS-MODE") {
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
field(DESC, "Plasma Process Mode") field(DESC, "Plasma Process Mode")
#field(VAL, "0") #field(VAL, "0")
field(PINI, "YES")
field(ZNAM, "CLEAN") field(ZNAM, "CLEAN")
field(ONAM, "SHOT") field(ONAM, "SHOT")
} }
@@ -150,6 +159,7 @@ record(bo, "$(P)$(R)PROCESS-MODE") {
record(bo, "$(P)$(R)PROCESS-REQ") { record(bo, "$(P)$(R)PROCESS-REQ") {
field(DESC, "Plasma Process sub-states Start/Stop") field(DESC, "Plasma Process sub-states Start/Stop")
field(VAL, "0") field(VAL, "0")
field(PINI, "YES")
field(ZNAM, "STOP") field(ZNAM, "STOP")
field(ONAM, "START") field(ONAM, "START")
} }
@@ -164,6 +174,7 @@ record(bo, "$(P)$(R)AUTHORISATION") {
record(longout, "$(P)$(R)PULSE-NUMBER") { record(longout, "$(P)$(R)PULSE-NUMBER") {
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
field(DESC, "Pulse Number") field(DESC, "Pulse Number")
field(PINI, "YES")
} }
record(calc, "$(P)$(R)COUNTDOWN") { record(calc, "$(P)$(R)COUNTDOWN") {
@@ -185,7 +196,7 @@ record(stringin, "$(P)$(R)CurrentTime") {
field(DESC, "Current Date and Time of the IOC") field(DESC, "Current Date and Time of the IOC")
field(SCAN, "1 second") field(SCAN, "1 second")
field(DTYP, "Soft Timestamp") field(DTYP, "Soft Timestamp")
field(PINI, "YES") #field(PINI, "YES")
field(INP, "@%d/%m/%Y %H:%M:%S") field(INP, "@%d/%m/%Y %H:%M:%S")
} }

8
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pfeiffer.proto
View File

@@ -1,18 +1,18 @@
Terminator = CR; Terminator = CR;
inTerminator = CR;
# CR and LF are control characters, respectively coded 0x0D (13 decimal) and 0x0A (10 decimal) # CR and LF are control characters, respectively coded 0x0D (13 decimal) and 0x0A (10 decimal)
# CR and LF are control characters, respectively coded 0x0D (13 decimal) and 0x0A (10 decimal) MaxInput = 20;
MaxInput = 30;
ExtraInput = Ignore; ExtraInput = Ignore;
# Values in millisecond # Values in millisecond
LockTimeout = 1000; LockTimeout = 500;
# Affects first out command in a protocol. # Affects first out command in a protocol.
# If other records currently use the device, how many milliseconds to wait for # If other records currently use the device, how many milliseconds to wait for
# exclusive access to the device before giving up? # exclusive access to the device before giving up?
#ReadTimeout = 1500; #ReadTimeout = 1500;
ReplyTimeout = 400; ReplyTimeout = 300;
#PollPeriod = $ReplyTimeout; #PollPeriod = $ReplyTimeout;
#Integer. Affects first in command in I/O Intr mode (see chapter Record Processing). #Integer. Affects first in command in I/O Intr mode (see chapter Record Processing).

7
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
View File

@@ -1,8 +1,9 @@
ISTTOK:central:PULSE-NUMBER.VAL # P=ISTTOK:,R=central:
$(P)$(R)PULSE-NUMBER.VAL
ISTTOK:central:LogMessage.VAL ISTTOK:central:LogMessage.VAL
ISTTOK:central:LASTOPSTATE.VAL ISTTOK:central:LASTOPSTATE.VAL
ISTTOK:central:OPREQ ISTTOK:central:OPREQ.VAL
ISTTOK:central:PROCESS-MODE.VAL ISTTOK:central:PROCESS-MODE.VAL
ISTTOK:central:CLEANINGMANMODE.VAL ISTTOK:central:CLEANINGMANMODE.VAL
@@ -12,7 +13,7 @@ ISTTOK:central:Shot-TorPSCurrent
ISTTOK:central:UPS-Shutdown ISTTOK:central:UPS-Shutdown
#ALARM Limits #ALARM Limits
ISTTOK:central:RPump1-Pressure.HIGH $(P)$(R)RPump1-Pressure.HIGH
ISTTOK:central:RPump1-Pressure.HIHI ISTTOK:central:RPump1-Pressure.HIHI
#ISTTOK:central:RPump2-Pressure.HIGH #ISTTOK:central:RPump2-Pressure.HIGH
#ISTTOK:central:RPump2-Pressure.HIHI #ISTTOK:central:RPump2-Pressure.HIHI

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

@@ -1,8 +1,8 @@
# autosave R5.3 Automatically generated - DO NOT MODIFY - 211214-141949 # autosave R5.3 Automatically generated - DO NOT MODIFY - 211215-002448
ISTTOK:central:PULSE-NUMBER.VAL 0 ISTTOK:central:PULSE-NUMBER.VAL 0
ISTTOK:central:LogMessage.VAL ISTTOK:central:LogMessage.VAL
ISTTOK:central:LASTOPSTATE.VAL 5 ISTTOK:central:LASTOPSTATE.VAL 2
ISTTOK:central:OPREQ 0 ISTTOK:central:OPREQ.VAL 1
ISTTOK:central:PROCESS-MODE.VAL 0 ISTTOK:central:PROCESS-MODE.VAL 0
ISTTOK:central:CLEANINGMANMODE.VAL 0 ISTTOK:central:CLEANINGMANMODE.VAL 0
ISTTOK:central:Emergency-UserButton.VAL 0 ISTTOK:central:Emergency-UserButton.VAL 0

10
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
View File

@@ -46,10 +46,10 @@ dbLoadRecords("db/sendmail.db", "P=ISTTOK:,PORT=L0,R=central:,L=0,A=0")
# Uncomment to Debug STREAMDEVICE serial activity # Uncomment to Debug STREAMDEVICE serial activity
# 2021/12/14 13:11:50.019969 RS0 ISTTOK:central:P002:M: No reply within 200 ms to "0020074002=?107<0d> # 2021/12/14 13:11:50.019969 RS0 ISTTOK:central:P002:M: No reply within 200 ms to "0020074002=?107<0d>
#var streamError 1 var streamError 1
#with this no errors on pfeiffer bus #with this no errors on pfeiffer bus
var streamDebug 1 #var streamDebug 1
streamSetLogfile("logfile.txt") #streamSetLogfile("logfile.txt")
## Run this to trace the stages of iocInit ## Run this to trace the stages of iocInit
#traceIocInit #traceIocInit
@@ -70,11 +70,11 @@ asSetFilename("${TOP}/iocBoot/${IOC}/access_security.acf")
iocInit iocInit
#asInit asInit
# Create request file and start periodic 'save’ # Create request file and start periodic 'save’
# makeAutosaveFileFromDbInfo("$(SAVE_DIR)/$(IOC).req", "autosaveFields") # makeAutosaveFileFromDbInfo("$(SAVE_DIR)/$(IOC).req", "autosaveFields")
create_monitor_set("$(IOC).req", 30) create_monitor_set("$(IOC).req", 30, "P=ISTTOK:,R=central:")
## Start any sequence programs , use safe mode ## Start any sequence programs , use safe mode
seq IsttokSeqExec "unit=ISTTOK" seq IsttokSeqExec "unit=ISTTOK"