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

fixing I2C

Browse Source
This commit is contained in:
Bernardo Carvalho
2021-05-11 17:30:11 +01:00
parent 2c0f99e4be
commit 9f1e47c424
8 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKtda8444.db
View File

@@ -19,15 +19,15 @@
##################################################### #####################################################
record( longout, "$(P)$(R)TDA8444:32:DAC_CH0") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH0") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac0(32) I2C") field(OUT, "@tda8444.proto wDac0(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
field(PINI,"YES") field(PINI,"YES")
} }
record( longout, "$(P)$(R)TDA8444:32:DAC_CH1") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH1") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac1(32) I2C") field(OUT, "@tda8444.proto wDac1(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
@@ -35,7 +35,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH1") {
} }
record( longout, "$(P)$(R)TDA8444:32:DAC_CH2") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH2") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac2(32) I2C") field(OUT, "@tda8444.proto wDac2(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
@@ -43,7 +43,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH2") {
} }
record( longout, "$(P)$(R)TDA8444:32:DAC_CH3") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH3") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac3(32) I2C") field(OUT, "@tda8444.proto wDac3(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
@@ -51,7 +51,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH3") {
} }
record( longout, "$(P)$(R)TDA8444:32:DAC_CH4") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH4") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac4(32) I2C") field(OUT, "@tda8444.proto wDac4(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
@@ -59,7 +59,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH4") {
} }
record( longout, "$(P)$(R)TDA8444:32:DAC_CH5") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH5") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac5(32) I2C") field(OUT, "@tda8444.proto wDac5(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
@@ -67,7 +67,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH5") {
} }
record( longout, "$(P)$(R)TDA8444:32:DAC_CH6") { record( longout, "$(P)$(R)TDA8444:32:DAC_CH6") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac6(32) I2C") field(OUT, "@tda8444.proto wDac6(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 32) field(VAL, 32)
@@ -76,7 +76,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH6") {
#record( longout, "$(P)$(R) TDA8444:32:DAC_CH7") { #record( longout, "$(P)$(R) TDA8444:32:DAC_CH7") {
record( longout, "$(P)$(R)Shot-TorPSCurrent") { record( longout, "$(P)$(R)Shot-TorPSCurrent") {
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@tda8444.proto wDac7(32) I2C") field(OUT, "@tda8444.proto wDac7(32) $(BUS)")
field(DRVH, "63" ) field(DRVH, "63" )
field(DRVL, "0" ) field(DRVL, "0" )
field(VAL, 1) field(VAL, 1)

4
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto
View File

@@ -1,5 +1,5 @@
Terminator = ""; Terminator = "";
LockTimeout = 500; LockTimeout = 200;
ReplyTimeout = 100; ReplyTimeout = 100;
ReadTimeout = 100; ReadTimeout = 100;
WriteTimeout = 100; WriteTimeout = 100;
@@ -8,7 +8,7 @@ ExtraInput = Error;
rReg { rReg {
out ${1}; out ${1};
in "%.1r"; in "%01r";
} }
## @init { rReg; } ## @init { rReg; }

2
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto
View File

@@ -8,7 +8,7 @@ ExtraInput = Error;
rReg { rReg {
out ${1}; out ${1};
in "%.1r"; in "%01r";
} }
# To read adc write control Byte # To read adc write control Byte
# Bits 0,1 ADC channel Selection # Bits 0,1 ADC channel Selection

2
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/tda8444.proto
View File

@@ -1,5 +1,5 @@
Terminator = ""; Terminator = "";
LockTimeout = 500; LockTimeout = 200;
ReplyTimeout = 100; ReplyTimeout = 100;
ReadTimeout = 100; ReadTimeout = 100;
WriteTimeout = 100; WriteTimeout = 100;

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

@@ -183,11 +183,11 @@ monitor IsttokRPump1_Pressure;
float IsttokRPump2_Pressure; float IsttokRPump2_Pressure;
assign IsttokRPump2_Pressure to "ISTTOK:central:RPump2-Pressure"; assign IsttokRPump2_Pressure to "ISTTOK:central:RPump2-Pressure";
monitor IsttokRPump2_Pressure; monitor IsttokRPump2_Pressure;
*/
float IsttokVVesselTemperature; float IsttokVVesselTemperature;
assign IsttokVVesselTemperature to "ISTTOK:temperature:VVessel-Temperature"; assign IsttokVVesselTemperature to "ISTTOK:temperature:VVessel-Temperature";
monitor IsttokVVesselTemperature; monitor IsttokVVesselTemperature;
*/
short IsttokShotBuzzer; short IsttokShotBuzzer;
assign IsttokShotBuzzer to "ISTTOK:central:Buzzer"; assign IsttokShotBuzzer to "ISTTOK:central:Buzzer";
@@ -871,14 +871,16 @@ ss CleaningSequence{
CLEANINGSTATE = CLNST_Cleaning4; CLEANINGSTATE = CLNST_Cleaning4;
pvPut(CLEANINGSTATE); pvPut(CLEANINGSTATE);
} state Cleaning4 } state Cleaning4
/*
when (pvSeverity(IsttokVVesselTemperature) >= pvSevrMAJOR) { when (pvSeverity(IsttokVVesselTemperature) >= pvSevrMAJOR) {
/* Temperature Limit Pulse state change to Process */ // Temperature Limit Pulse state change to Process
IsttokProcReq = STOP; IsttokProcReq = STOP;
pvPut(IsttokProcReq); pvPut(IsttokProcReq);
strcpy(msg, "Temperature Limit-> State to Process"); strcpy(msg, "Temperature Limit-> State to Process");
pvPut(msg); pvPut(msg);
errlogSevPrintf(MINOR, "%s\n",msg); errlogSevPrintf(MINOR, "%s\n",msg);
} state Cleaning5 } state Cleaning5
*/
} }
} }

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

@@ -11,8 +11,6 @@ ISTTOK:central:TMPump1-ManualValve.VAL
ISTTOK:central:Shot-TorPSCurrent ISTTOK:central:Shot-TorPSCurrent
#ALARM Limits #ALARM Limits
ISTTOK:vacuum:RPump1-Pressure.HIGH
ISTTOK:vacuum:RPump1-Pressure.HIHI
#ISTTOK:central:RPump2-Pressure.HIGH #ISTTOK:central:RPump2-Pressure.HIGH
#ISTTOK:central:RPump2-Pressure.HIHI #ISTTOK:central:RPump2-Pressure.HIHI

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

@@ -1,14 +1,11 @@
# autosave R5.3 Automatically generated - DO NOT MODIFY - 210511-111857 # autosave R5.3 Automatically generated - DO NOT MODIFY - 210511-172433
! 2 channel(s) not connected - or not all gets were successful
ISTTOK:central:PULSE-NUMBER.VAL 0 ISTTOK:central:PULSE-NUMBER.VAL 0
ISTTOK:central:LogMessage.VAL ISTTOK:central:LogMessage.VAL
ISTTOK:central:LASTOPSTATE.VAL 0 ISTTOK:central:LASTOPSTATE.VAL 5
ISTTOK:central:OPREQ 0 ISTTOK:central:OPREQ 0
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
ISTTOK:central:TMPump1-ManualValve.VAL 0 ISTTOK:central:TMPump1-ManualValve.VAL 0
ISTTOK:central:Shot-TorPSCurrent 1 ISTTOK:central:Shot-TorPSCurrent 1
#ISTTOK:vacuum:RPump1-Pressure.HIGH Search Issued
#ISTTOK:vacuum:RPump1-Pressure.HIHI Search Issued
<END> <END>

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

@@ -19,9 +19,9 @@ drvAsynI2CConfigure( "I2C", "/dev/i2c-1", 1 )
## Load record instances ## Load record instances
dbLoadRecords("db/ISTTOKstates.db","P=ISTTOK:,R=central:") dbLoadRecords("db/ISTTOKstates.db","P=ISTTOK:,R=central:")
dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:") dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:,BUS=I2C")
dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:") dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:,BUS=I2C")
dbLoadRecords("db/ISTTOKtda8444.db","P=ISTTOK:,R=central:") dbLoadRecords("db/ISTTOKtda8444.db","P=ISTTOK:,R=central:,BUS=I2C")
dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:") dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:")
## Load Serial drivers ## Load Serial drivers
@@ -47,7 +47,7 @@ dbLoadRecords("db/sendmail.db", "P=ISTTOK:,PORT=L0,R=central:,L=0,A=0")
# Uncomment to Debug STREAM serial activity # Uncomment to Debug STREAM serial activity
#var streamError 1 #var streamError 1
#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