Merge branch 'master' of https://git.ipfn.tecnico.ulisboa.pt/r/ISTTOK

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db

@@ -0,0 +1,99 @@
+record (longin, "$(P)$(R)P001:M")
+{
+	field (DESC, "getPressure001  $(bus)")
+	field (DTYP, "stream")
+	field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)")
+	field (SCAN, "1 second")
+	field (FLNK, "$(P)$(R)VVessel-Pressure")
+}
+record (longin, "$(P)$(R)P001:E")
+{
+	field (DESC, "Pressure001 exponent $(bus)")
+}
+record (calc, "$(P)$(R)VVessel-Pressure")
+{
+	field (DESC, "ISTTOK:central:VVessel-Pressure")
+	field(INPA, "$(P)$(R)P001:M")
+	field(INPB, "$(P)$(R)P001:E")
+	field(CALC, "(A*0.001)*10.0**(B-20)")
+	field(PREC, "3") 
+	field(EGU, "mBar")
+}
+
+record (longin, "$(P)$(R)P002:M")
+{
+	field (DESC, "getPressure002  $(bus)")
+	field (DTYP, "stream")
+	field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)")
+	field (SCAN, "2 second")
+	field (FLNK, "$(P)$(R)RPump1-Pressure")
+}
+record (longin, "$(P)$(R)P002:E")
+{
+	field (DESC, "Pressure002 exponent $(bus)")
+}
+record (calc, "$(P)$(R)RPump1-Pressure")
+{
+	field (DESC, "ISTTOK:central:RPump1-Pressure")
+	field(INPA, "$(P)$(R)P002:M")
+	field(INPB, "$(P)$(R)P002:E")
+	field(CALC, "(A*0.001)*10.0**(B-20)")
+	field(PREC, "3") 
+	field(EGU, "mBar")
+}
+
+record (longin, "$(P)$(R)P003:M")
+{
+	field (DESC, "getPressure003 Mantissa $(bus)")
+	field (DTYP, "stream")
+	field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)")
+	field (SCAN, "1 second")
+#	field (SCAN, "I/O Intr")
+	field (FLNK, "$(P)$(R)TMPump1-PressureAdmission")
+}
+
+record (longin, "$(P)$(R)P003:E")
+{
+	field (DESC, "Pressure003 Exponent $(bus)")
+}
+record (calc, "$(P)$(R)TMPump1-PressureAdmission")
+{
+	field(DESC, "ISTTOK:central:TMPump1-PressureAdmission")
+	field(INPA, "$(P)$(R)P003:M")
+	field(INPB, "$(P)$(R)P003:E")
+	field(CALC, "(A*0.001)* 10.0**(B-20)")
+	field(PREC, "3") 
+	field(EGU, "mBar")
+}
+
+
+record (longin, "$(P)$(R)P004:M")
+{
+	field (DESC, "getPressure004 Mantissa $(bus)")
+	field (DTYP, "stream")
+	field (INP, "@pfeiffer.proto getPressure004($(P)$(R)P004:E) $(bus)")
+	field (SCAN, "1 second")
+	field (FLNK, "$(P)$(R)RPump2-Pressure")
+}
+record (longin, "$(P)$(R)P004:E")
+{
+	field (DESC, "Pressure004 Exponent $(bus)")
+}
+
+record (calc, "$(P)$(R)RPump2-Pressure")
+{
+	field(DESC, "ISTTOK:central:RPump2-Pressure")
+	field(INPA, "$(P)$(R)P004:M")
+	field(INPB, "$(P)$(R)P004:E")
+	field(CALC, "(A*0.001)* 10.0**(B-20)")
+	field(PREC, "3") 
+	field(EGU, "mBar")
+}
+
+record(stringout,"$(P)$(R)RS485Debug") {
+	field(DESC, "")
+	field(DTYP, "stream")
+	field(OUT, "@pfeiffer.proto debug $(bus)")
+	field(VAL,"")
+}
+

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKrs485.db

@@ -1,49 +0,0 @@
-record (longin, "$(P)$(R)P003:M")
-{
-	field (DESC, "getPressure003 Mantissa $(bus)")
-	field (DTYP, "stream")
-	field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)")
-	field (SCAN, "I/O Intr")
-	field (FLNK, "$(P)$(R)P003")
-}
-
-record (longin, "$(P)$(R)P003:E")
-{
-	field (DESC, "Pressure003 Exponent $(bus)")
-}
-record (calc, "$(P)$(R)P003")
-{
-	field(INPA, "$(P)$(R)P003:M")
-	field(INPB, "$(P)$(R)P003:E")
-	field(CALC, "(A*0.001)* 10.0**(B-20)")
-	field(PREC, "3") 
-	field(EGU, "mBar")
-}
-record (longin, "$(P)$(R)P002:M")
-{
-	field (DESC, "getPressure002  $(bus)")
-	field (DTYP, "stream")
-	field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)")
-	field (SCAN, "I/O Intr")
-	field (FLNK, "$(P)$(R)P002")
-}
-
-record (longin, "$(P)$(R)P002:E")
-{
-	field (DESC, "Pressure002 exponent $(bus)")
-}
-record (calc, "$(P)$(R)P002")
-{
-	field(INPA, "$(P)$(R)P002:M")
-	field(INPB, "$(P)$(R)P002:E")
-	field(CALC, "(A*0.001)*10.0**(B-20)")
-	field(PREC, "3") 
-	field(EGU, "mBar")
-}
-record(stringout,"$(P)$(R)Debug") {
-	field(DESC, "")
-	field(DTYP, "stream")
-	field(OUT, "@pfeiffer.proto debug $(bus)")
-	field(VAL,"")
-}
-

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKvacummPumps.db

@@ -257,15 +257,23 @@ record(bo, "$(P)$(R)ToroidalCleanBreakerOnOff" ) {
 
 record(bo, "$(P)$(R)ToroidalShotEnableOnOff" ) {
 	field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B1 PP" )
-	field( ZNAM, "On" )
+	field( ZNAM, "Off" )
-	field( ONAM, "Off" )
+	field( ONAM, "On" )
 }
 
 record(bo, "$(P)$(R)ToroidalShotTriggerOnOff" ) {
-	field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B2 PP" )
+	field( ZNAM, "Off" )
-	field( ZNAM, "On" )
+	field( ONAM, "Pulse" )
-	field( ONAM, "Off" )
+	field( HIGH, "2.5")
+	field( FLNK, "$(P)$(R)ToroidalShotTriggerOnOffInv" )
 }
+record(calcout, "$(P)$(R)ToroidalShotTriggerOnOffInv" ) {
+	field( INPA, "$(P)$(R)ToroidalShotTriggerOnOff NPP MS" )
+	field( OUT,  "$(P)$(R)PCF8574:61:REGISTER.B2 PP MS" )
+	field( OOPT, "On Change" )
+	field( CALC, "A?0:1" )
+}
+############################################################
 
 #######################################
 #       CAP BANK CHARGE ON/OFF        #
@@ -337,16 +345,6 @@ record(ai,"$(P)$(R)Turbo2_Speed"){
 	field(VAL,"0")
 }
 
-record(ai,"$(P)$(R)Turbo2_Current"){
-	field(PREC,"3")
-	field(EGU,"mA")
-	field(VAL,"0")
-}
-
-record(ai,"$(P)$(R)Bypass_Condition"){
-	field(VAL,"0")
-}
-
 #######################
 ###TMP1 Manual Valve###
 #######################

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile

@@ -8,7 +8,7 @@ DB += ISTTOKstates.db
 DB += ISTTOKvacummPumps.db
 DB += ISTTOKpcf8574.db
 DB += ISTTOKpcf8591.db
-DB += ISTTOKrs485.db
+DB += ISTTOKpfeiffer.db
 
 # If <anyname>.db template is not named <anyname>*.template add
 # <anyname>_TEMPLATE = <templatename>

epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd

@@ -31,10 +31,26 @@ drvAsynI2CConfigure( "I2C", "/dev/i2c-1", 1 )
 ## Load record instances
 dbLoadRecords("db/ISTTOKstates.db","P=ISTTOK:,R=central:")
 dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:")
+dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:")
 #dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:,ID=57")
 dbLoadRecords("db/ISTTOKvacummPumps.db","P=ISTTOK:,R=central:")
 
-dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:")
+## Load Serial drivers
+drvAsynSerialPortConfigure("RS0","/dev/ttyUSB0")
+
+asynSetOption("RS0", 0, "baud", "9600")
+asynSetOption("RS0", 0, "bits", "8")
+asynSetOption("RS0", 0, "parity", "none")
+asynSetOption("RS0", 0, "stop", "1")
+asynSetOption("RS0", 0, "clocal", "Y")
+asynSetOption("RS0", 0, "crtscts", "N")
+
+dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=central:,bus=RS0")
+
+# Uncomment to Debug STREAM serial activity
+#var streamError 1
+#var streamDebug 1
+#streamSetLogfile("logfile.txt")
 
 ## Run this to trace the stages of iocInit
 #traceIocInit

epics/iocs/ISTTOKrpi/protocols/pfeiffer.proto

@@ -1,17 +1,33 @@
 Terminator=CR; 
 MaxInput = 20;
-ReadTimeout = 2000;
+
-getPressure003 {
+#in millisecond
-    in "0031074006%4u%(\$1)2u%+<sum8>";
+#ReadTimeout = 2000;
+ReplyTimeout = 200;
+
+# Using redirection to read 2 records, mantissa and exponent
+getPressure001 {
+    out "0010074002=?106";
+    in  "0011074006%4u%(\$1)2u%+<sum8>";
 }
 getPressure002 {
-    in "0021074006%4u%(\$1)2u%+<sum8>";
+    out "0020074002=?107";
+    in  "0021074006%4u%(\$1)2u%+<sum8>";
 }
+getPressure003 {
+    out "0030074002=?108";
+    in  "0031074006%4u%(\$1)2u%+<sum8>";
+}
+getPressure004 {
+    out "0040074002=?109";
+    in  "0041074006%4u%(\$1)2u%+<sum8>";
+}
+#
 #    in "0031074006%4u%(\$1)2u%*3u";
 #
-getPressureE003 {
+#getPressureE003 {
-    in "0031074006%*4u%2u%*3u";
+#    in "0031074006%*4u%2u%*3u";
-}
+#}
 
 # Connect a stringout record to this to get
 # a generic command interface.
@@ -20,6 +36,5 @@ getPressureE003 {
 debug {
     ExtraInput = Ignore;
     out "%s"; in "%39c"
-
 }