From 21d175abcd2ae1e3e80abd5d15f2322c5ee35a16 Mon Sep 17 00:00:00 2001
From: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
Date: Mon, 27 Jan 2020 09:50:29 +0000
Subject: [PATCH] Commit BBC
---
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req | 1 +
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav | 21 +++++++++++----------
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db | 2 +-
epics/README.md | 2 +-
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd | 1 +
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db | 7 ++++---
6 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/epics/README.md b/epics/README.md
index 728a03a..ae884c4 100644
--- a/epics/README.md
+++ b/epics/README.md
@@ -189,7 +189,7 @@
|ISTTOK:central:TMPump2-MotorOn | bo | 2 |
|ISTTOK:central:Buzzer| bo | 3 |
|ISTTOK:central:Emergency-PhysButton| bi | 4 |
-|ISTTOK:central:TTSystem-tzero| bo | 7 |
+|ISTTOK:central:TTSystem-tzero| bi | 7 |
----------
* Connected to PCF8574 Address = 60 (Top Valleman)
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
index c3d6b45..d276c99 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
@@ -249,7 +249,7 @@
# ROTARY1 VALVE #
#############################
record( bo, "$(P)$(R)RPump1-Valve" ) {
- field(DESC,"Abre a valvula da bomba rotatoria 1. Relay 4")
+ field(DESC,"Abre a valvula da bomba rot. Relay 4")
field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B1 PP" )
field(ZNAM, "Closed" )
field(ONAM, "Open" )
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
index 0fe5896..00ff57a 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
@@ -93,16 +93,17 @@
field(DESC, "Toroidal Current Image")
field(DTYP, "Raw Soft Channel" )
field(INP, "$(P)$(R)PCF8591:72:BYTE2_CH3 PP NMS")
- field(SCAN, "1 second")
+ field(SCAN, ".2 second")
field(ASLO, "39.215686275" )
field(AOFF, "0.0" )
field(EGU, "A" )
field(PREC, "3" )
field(HOPR, "10000" )
field(LOPR, "0" )
- field(LOW, "200.0")
+ field(MDEL, "20" )
+# field(LOW, "200.0")
# # field(LOLO,"0.0")
- field(LSV, "MINOR")
+# field(LSV, "MINOR")
# # field(LLSV,"MAJOR")
}
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
index d9fc7bd..9436041 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
@@ -8,6 +8,7 @@
ISTTOK:central:Emergency-UserButton.VAL
ISTTOK:central:TMPump1-ManualValve.VAL
+ISTTOK:central:Shot-TorPSCurrent
#ALARM Limits
ISTTOK:central:RPump1-Pressure.HIGH
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
index 3bc0211..61ac337 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
@@ -1,14 +1,15 @@
-# autosave R5.3 Automatically generated - DO NOT MODIFY - 200115-194537
-ISTTOK:central:PULSE-NUMBER.VAL 48392
-ISTTOK:central:LogMessage.VAL Olá Mundo
-ISTTOK:central:LASTOPSTATE.VAL 2
+# autosave R5.3 Automatically generated - DO NOT MODIFY - 200127-094325
+ISTTOK:central:PULSE-NUMBER.VAL 48422
+ISTTOK:central:LogMessage.VAL Emplastro esteve aqui
+ISTTOK:central:LASTOPSTATE.VAL 5
ISTTOK:central:OPREQ 1
-ISTTOK:central:PROCESS-MODE.VAL 1
-ISTTOK:central:CLEANINGMANMODE.VAL 0
+ISTTOK:central:PROCESS-MODE.VAL 0
+ISTTOK:central:CLEANINGMANMODE.VAL 1
ISTTOK:central:Emergency-UserButton.VAL 0
ISTTOK:central:TMPump1-ManualValve.VAL 1
-ISTTOK:central:RPump1-Pressure.HIGH 0.05
-ISTTOK:central:RPump1-Pressure.HIHI 0.1
-ISTTOK:central:RPump2-Pressure.HIGH 0.05
-ISTTOK:central:RPump2-Pressure.HIHI 0.1
+ISTTOK:central:Shot-TorPSCurrent 34
+ISTTOK:central:RPump1-Pressure.HIGH 0
+ISTTOK:central:RPump1-Pressure.HIHI 0
+ISTTOK:central:RPump2-Pressure.HIGH 0
+ISTTOK:central:RPump2-Pressure.HIHI 0
<END>
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
index bee22e9..280ab44 100755
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
@@ -26,6 +26,7 @@
## Load Serial drivers
drvAsynSerialPortConfigure("RS0","/dev/ttyUSB0")
+#drvAsynSerialPortConfigure("RS0","/dev/ttyAMA0")
asynSetOption("RS0", 0, "baud", "9600")
asynSetOption("RS0", 0, "bits", "8")
--
Gitblit v1.8.0