From 9f1e47c4241ce01a7fa943719a5b412f15d3501e Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Tue, 11 May 2021 17:30:11 +0100 Subject: [PATCH] fixing I2C --- .../ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKtda8444.db | 18 +++++++++--------- .../ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto | 4 ++-- .../ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto | 2 +- .../ISTTOKrpi/ISTTOKrpiApp/Db/tda8444.proto | 2 +- .../ISTTOKrpiApp/src/IsttokSeqExec.stt | 6 ++++-- .../iocBoot/iocISTTOKrpi/iocISTTOKrpi.req | 2 -- .../iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav | 7 ++----- .../iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd | 8 ++++---- 8 files changed, 23 insertions(+), 26 deletions(-) diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKtda8444.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKtda8444.db index 00a5a3a..03d9fa5 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKtda8444.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKtda8444.db @@ -19,15 +19,15 @@ ##################################################### record( longout, "$(P)$(R)TDA8444:32:DAC_CH0") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac0(32) I2C") + field(OUT, "@tda8444.proto wDac0(32) $(BUS)") field(DRVH, "63" ) - field(DRVL, "0" ) + field(DRVL, "0" ) field(VAL, 32) field(PINI,"YES") } record( longout, "$(P)$(R)TDA8444:32:DAC_CH1") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac1(32) I2C") + field(OUT, "@tda8444.proto wDac1(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) field(VAL, 32) @@ -35,7 +35,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH1") { } record( longout, "$(P)$(R)TDA8444:32:DAC_CH2") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac2(32) I2C") + field(OUT, "@tda8444.proto wDac2(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) field(VAL, 32) @@ -43,7 +43,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH2") { } record( longout, "$(P)$(R)TDA8444:32:DAC_CH3") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac3(32) I2C") + field(OUT, "@tda8444.proto wDac3(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) field(VAL, 32) @@ -51,7 +51,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH3") { } record( longout, "$(P)$(R)TDA8444:32:DAC_CH4") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac4(32) I2C") + field(OUT, "@tda8444.proto wDac4(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) field(VAL, 32) @@ -59,7 +59,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH4") { } record( longout, "$(P)$(R)TDA8444:32:DAC_CH5") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac5(32) I2C") + field(OUT, "@tda8444.proto wDac5(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) field(VAL, 32) @@ -67,7 +67,7 @@ record( longout, "$(P)$(R)TDA8444:32:DAC_CH5") { } record( longout, "$(P)$(R)TDA8444:32:DAC_CH6") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac6(32) I2C") + field(OUT, "@tda8444.proto wDac6(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) 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)Shot-TorPSCurrent") { field(DTYP, "stream") - field(OUT, "@tda8444.proto wDac7(32) I2C") + field(OUT, "@tda8444.proto wDac7(32) $(BUS)") field(DRVH, "63" ) field(DRVL, "0" ) field(VAL, 1) diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto index db2730b..305b265 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto @@ -1,5 +1,5 @@ Terminator = ""; -LockTimeout = 500; +LockTimeout = 200; ReplyTimeout = 100; ReadTimeout = 100; WriteTimeout = 100; @@ -8,7 +8,7 @@ ExtraInput = Error; rReg { out ${1}; - in "%.1r"; + in "%01r"; } ## @init { rReg; } diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto index d66da3e..7e10313 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto @@ -8,7 +8,7 @@ ExtraInput = Error; rReg { out ${1}; - in "%.1r"; + in "%01r"; } # To read adc write control Byte # Bits 0,1 ADC channel Selection diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/tda8444.proto b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/tda8444.proto index 772d5dd..58991a2 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/tda8444.proto +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/tda8444.proto @@ -1,5 +1,5 @@ Terminator = ""; -LockTimeout = 500; +LockTimeout = 200; ReplyTimeout = 100; ReadTimeout = 100; WriteTimeout = 100; diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 228ec10..8dd5702 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -183,11 +183,11 @@ monitor IsttokRPump1_Pressure; float IsttokRPump2_Pressure; assign IsttokRPump2_Pressure to "ISTTOK:central:RPump2-Pressure"; monitor IsttokRPump2_Pressure; -*/ float IsttokVVesselTemperature; assign IsttokVVesselTemperature to "ISTTOK:temperature:VVessel-Temperature"; monitor IsttokVVesselTemperature; +*/ short IsttokShotBuzzer; assign IsttokShotBuzzer to "ISTTOK:central:Buzzer"; @@ -871,14 +871,16 @@ ss CleaningSequence{ CLEANINGSTATE = CLNST_Cleaning4; pvPut(CLEANINGSTATE); } state Cleaning4 + /* when (pvSeverity(IsttokVVesselTemperature) >= pvSevrMAJOR) { - /* Temperature Limit Pulse state change to Process */ + // Temperature Limit Pulse state change to Process IsttokProcReq = STOP; pvPut(IsttokProcReq); strcpy(msg, "Temperature Limit-> State to Process"); pvPut(msg); errlogSevPrintf(MINOR, "%s\n",msg); } state Cleaning5 +*/ } } diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req index e382569..f2f172c 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req @@ -11,8 +11,6 @@ ISTTOK:central:TMPump1-ManualValve.VAL ISTTOK:central:Shot-TorPSCurrent #ALARM Limits -ISTTOK:vacuum:RPump1-Pressure.HIGH -ISTTOK:vacuum:RPump1-Pressure.HIHI #ISTTOK:central:RPump2-Pressure.HIGH #ISTTOK:central:RPump2-Pressure.HIHI diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav index 3fce681..b5bbbba 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav @@ -1,14 +1,11 @@ -# autosave R5.3 Automatically generated - DO NOT MODIFY - 210511-111857 -! 2 channel(s) not connected - or not all gets were successful +# autosave R5.3 Automatically generated - DO NOT MODIFY - 210511-172433 ISTTOK:central:PULSE-NUMBER.VAL 0 ISTTOK:central:LogMessage.VAL -ISTTOK:central:LASTOPSTATE.VAL 0 +ISTTOK:central:LASTOPSTATE.VAL 5 ISTTOK:central:OPREQ 0 ISTTOK:central:PROCESS-MODE.VAL 0 ISTTOK:central:CLEANINGMANMODE.VAL 0 ISTTOK:central:Emergency-UserButton.VAL 0 ISTTOK:central:TMPump1-ManualValve.VAL 0 ISTTOK:central:Shot-TorPSCurrent 1 -#ISTTOK:vacuum:RPump1-Pressure.HIGH Search Issued -#ISTTOK:vacuum:RPump1-Pressure.HIHI Search Issued diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd index 3b50392..6952723 100755 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd @@ -19,9 +19,9 @@ 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/ISTTOKtda8444.db","P=ISTTOK:,R=central:") +dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:,BUS=I2C") +dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:,BUS=I2C") +dbLoadRecords("db/ISTTOKtda8444.db","P=ISTTOK:,R=central:,BUS=I2C") dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:") ## 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 #var streamError 1 #var streamDebug 1 -#streamSetLogfile("logfile.txt") +streamSetLogfile("logfile.txt") ## Run this to trace the stages of iocInit #traceIocInit