From 0c935830b540afb8c0fa3a429b91f98e9dc46953 Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Tue, 15 Oct 2019 19:58:09 +0100 Subject: [PATCH] Paulo Corrections --- epics/iocs/ISTTOKrpi/.gitignore | 3 + .../ISTTOKrpiApp/Db/ISTTOKvacummPumps.db | 20 +++++-- epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile | 1 + .../ISTTOKrpiApp/src/IsttokSeqExec.stt | 57 ++++++++++++------- .../iocBoot/iocISTTOKrpi/iocISTTOKrpi.req | 9 ++- .../ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd | 1 + epics/iocs/ISTTOKrpi/protocols/pcf8591.proto | 4 +- 7 files changed, 68 insertions(+), 27 deletions(-) mode change 100755 => 100644 epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd diff --git a/epics/iocs/ISTTOKrpi/.gitignore b/epics/iocs/ISTTOKrpi/.gitignore index 0e440ec..1703072 100644 --- a/epics/iocs/ISTTOKrpi/.gitignore +++ b/epics/iocs/ISTTOKrpi/.gitignore @@ -20,3 +20,6 @@ db/ dbd/ bin/ lib/ + +#epics IOC autosave files +*.sav* diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKvacummPumps.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKvacummPumps.db index bfce745..725fb40 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKvacummPumps.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKvacummPumps.db @@ -327,11 +327,21 @@ record(ao,"$(P)$(R)Pressure_Primary2Condition"){ field(EGU,"mBar") } -#record(ai,"$(P)$(R)Pressure_Primary2"){ -# field(VAL,"1.0e-3") -# field(PREC,"3") -# field(EGU,"mBar") -#} +record(ai,"$(P)$(R)Bypass_Condition"){ + field(VAL,"0") +} + +record(ai,"$(P)$(R)Turbo2_Speed"){ + field(PREC,"3") + field(EGU,"RPM") + 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") diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile index ad830cc..1ad52ee 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile @@ -7,6 +7,7 @@ include $(TOP)/configure/CONFIG DB += ISTTOKstates.db DB += ISTTOKvacummPumps.db DB += ISTTOKpcf8574.db +DB += ISTTOKpcf8591.db DB += ISTTOKrs485.db # If .db template is not named *.template add diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 2eaf0a6..7d83d50 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -24,6 +24,7 @@ assign IsttokOPSTATE to { "{unit}:central:OPSTATE" }; monitor IsttokOPSTATE; + short IsttokOPREQ[1]; assign IsttokOPREQ to { "{unit}:central:OPREQ" @@ -88,33 +89,39 @@ monitor IsttokWSHOTINGSTATE; short IsttokRotatoryPump; assign IsttokRotatoryPump to "{unit}:central:RotatoryPump"; +monitor IsttokRotatoryPump; short IsttokRotatoryValve; assign IsttokRotatoryValve to "{unit}:central:RotatoryValve"; +monitor IsttokRotatoryValve; short IsttokRotatoryPump2; assign IsttokRotatoryPump2 to "{unit}:central:RotatoryPump2"; +monitor IsttokRotatoryPump2; short IsttokRotatoryValve2; assign IsttokRotatoryValve2 to "{unit}:central:RotatoryValve2"; +monitor IsttokRotatoryValve2; short IsttokTMPControllerOff; assign IsttokTMPControllerOff to "{unit}:central:TMPControllerOff"; +monitor IsttokTMPControllerOff; short IsttokTMPControllerOn; assign IsttokTMPControllerOn to "{unit}:central:TMPControllerOn"; +monitor IsttokTMPControllerOn; short IsttokTMPMotorOff; assign IsttokTMPMotorOff to "{unit}:central:TMPMotorOff"; +monitor IsttokTMPMotorOff; short IsttokTMPMotorOn; assign IsttokTMPMotorOn to "{unit}:central:TMPMotorOn"; +monitor IsttokTMPMotorOn; -short IsttokTMP2MotorOff; -assign IsttokTMP2MotorOff to "{unit}:central:TMP2MotorOnOff"; - -short IsttokTMP2MotorOn; -assign IsttokTMP2MotorOn to "{unit}:central:TMP2MotorOnOff"; +short IsttokTMP2MotorOnOff; +assign IsttokTMP2MotorOnOff to "{unit}:central:TMP2MotorOnOff"; +monitor IsttokTMP2MotorOnOff; short IsttokTurbo_NormalOperation; assign IsttokTurbo_NormalOperation to "{unit}:central:Turbo_NormalOperation"; @@ -214,10 +221,6 @@ short IsttokShotLightsOnOff; assign IsttokShotLightsOnOff to "{unit}:central:LightsOnOff"; monitor IsttokShotLightsOnOff; -short IsttokShotLightsOnOffState; -assign IsttokShotLightsOnOffState to "{unit}:central:LightsOnOff-G"; -monitor IsttokShotLightsOnOffState; - short IsttokShotGISValvesOnOff; assign IsttokShotGISValvesOnOff to "{unit}:central:GISValvesOnOff"; monitor IsttokShotGISValvesOnOff; @@ -242,11 +245,22 @@ short IsttokShotToroidalCleanBreakerOnOff; assign IsttokShotToroidalCleanBreakerOnOff to "{unit}:central:ToroidalCleanBreakerOnOff"; monitor IsttokShotToroidalCleanBreakerOnOff; +short IsttokShotToroidalShotTriggerOnOff; +assign IsttokShotToroidalShotTriggerOnOff to "{unit}:central:ToroidalShotTriggerOnOff"; +monitor IsttokShotToroidalShotTriggerOnOff; + +short IsttokShotToroidalShotEnableOnOff; +assign IsttokShotToroidalShotEnableOnOff to "{unit}:central:ToroidalShotEnableOnOff"; +monitor IsttokShotToroidalShotEnableOnOff; short IsttokShotPrimaryCleanContactorOnOff; assign IsttokShotPrimaryCleanContactorOnOff to "{unit}:central:PrimaryCleanContactorOnOff"; monitor IsttokShotPrimaryCleanContactorOnOff; +short IsttokShotPrimaryCleanBreakerOnOff; +assign IsttokShotPrimaryCleanBreakerOnOff to "{unit}:central:PrimaryCleanBreakerOnOff"; +monitor IsttokShotPrimaryCleanBreakerOnOff; + /*Relays and INPUT (Valleman Board) have negative Logic!*/ short RELAY_ON = 0; short RELAY_OFF= 1; @@ -272,7 +286,6 @@ monitor IsttokTimingTriggerSignal; /* Trace message record limited to 40 characters */ string msg; string tmp1_stat; -string tmp2_stat; assign msg to "{unit}:central:TraceMessage.VAL"; monitor msg; @@ -308,6 +321,9 @@ ss PulseSequence { IsttokShotPrimaryCleanContactorOnOff = 1; pvPut(IsttokShotPrimaryCleanContactorOnOff); + IsttokShotPrimaryCleanBreakerOnOff = 1; + pvPut(IsttokShotPrimaryCleanBreakerOnOff); + IsttokShotBuzzerOnOff = 0; pvPut(IsttokShotBuzzerOnOff); @@ -331,12 +347,15 @@ ss PulseSequence { IsttokShotToroidalCleanContactorOnOff = 1; pvPut(IsttokShotToroidalCleanContactorOnOff); + + IsttokShotToroidalShotTriggerOnOff= 1; + pvPut(IsttokShotToroidalShotTriggerOnOff); + + IsttokShotToroidalShotEnableOnOff = 1; + pvPut(IsttokShotToroidalShotEnableOnOff); - IsttokTMP2MotorOff = 0; - pvPut(IsttokTMP2MotorOff); - - IsttokTMP2MotorOn = 0; - pvPut(IsttokTMP2MotorOn); + IsttokTMP2MotorOnOff = 0; + pvPut(IsttokTMP2MotorOnOff); IsttokTMPControllerOff = 0; pvPut(IsttokTMPControllerOff); @@ -837,11 +856,11 @@ ss StartingSequence { pvPut(IsttokTMPMotorOn); } if(IsttokPressure_Primary2 < IsttokPressure_Primary2Condition){ - strcpy(msg, "TMP2 MotorOn ON" ); + strcpy(msg, "TMP2 MotorOnOff ON" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); - IsttokTMP2MotorOn = ON; - pvPut(IsttokTMP2MotorOn); + IsttokTMP2MotorOnOff = ON; + pvPut(IsttokTMP2MotorOnOff); } if(IsttokTurbo_NormalOperation == PCF_INPUT_ON){ @@ -850,7 +869,7 @@ ss StartingSequence { sprintf(tmp1_stat, "OFF"); } - sprintf(msg, "TMPNO = [1:%s][2:%s]", tmp1_stat, tmp2_stat); + sprintf(msg, "TMPNO = [1:%s]", tmp1_stat); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); IsttokSTARTINGSTATE = STRST_Starting4; diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req index 5e25bb0..291e684 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req @@ -28,8 +28,15 @@ ISTTOK:central:TMP2MotorOnOff.VAL ISTTOK:central:Turbo_NormalOperation.VAL ISTTOK:central:Turbo_PW_Ind.VAL ISTTOK:central:Turbo_Emergency.VAL -ISTTOK:central:TMPManualValve.VAL ISTTOK:central:Turbo2_Emergency.VAL +ISTTOK:central:Turbo2_Speed.VAL +ISTTOK:central:Turbo2_Current.VAL +ISTTOK:central:ToroidalShotTriggerOnOff.VAL +ISTTOK:central:ToroidalShotEnableOnOff.VAL +ISTTOK:central:ToroidalCleanBreakerOnOff.VAL +ISTTOK:central:ToroidalCleanContactorOnOff.VAL +ISTTOK:central:PrimaryCleanContactorOnOff.VAL +ISTTOK:central:PrimaryCleanBreakerOnOff.VAL ISTTOK:central:Pressure_PrimaryCondition.VAL ISTTOK:central:Pressure_Primary2Condition.VAL ISTTOK:central:Bypass_Condition.VAL diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd old mode 100755 new mode 100644 index 055a539..7b81188 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd @@ -34,6 +34,7 @@ dbLoadRecords("db/ISTTOKpcf8574.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:") ## Run this to trace the stages of iocInit #traceIocInit diff --git a/epics/iocs/ISTTOKrpi/protocols/pcf8591.proto b/epics/iocs/ISTTOKrpi/protocols/pcf8591.proto index 76689b3..feb2220 100644 --- a/epics/iocs/ISTTOKrpi/protocols/pcf8591.proto +++ b/epics/iocs/ISTTOKrpi/protocols/pcf8591.proto @@ -3,7 +3,7 @@ LockTimeout = 500; ReplyTimeout = 100; ReadTimeout = 100; WriteTimeout = 100; -MaxInput = 1; +MaxInput = 2; ExtraInput = Error; rReg { @@ -20,7 +20,7 @@ rReg { rConvAdc0 { out ${1} 0x00; - in "%01r"; + in "%02r"; } rConvAdc1 { out ${1} 0x01;