From 1b2912fab07823a1efc17f4a32ae9891d55e6bf8 Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Wed, 16 Mar 2022 15:33:48 +0000 Subject: [PATCH] Corrected Times on SM --- .../ISTTOKrpiApp/Db/ISTTOKmachineControl.db | 17 + .../ISTTOKrpiApp/src/IsttokSeqExec.stt | 103 ++--- .../ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt | 383 ++++++------------ .../iocISTTOKrpi/save/iocISTTOKrpi.sav | 8 +- 4 files changed, 186 insertions(+), 325 deletions(-) diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db index 918b8ec..43979fa 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db @@ -301,6 +301,23 @@ record(calcout, "$(P)$(R)Shot-TorPSTriggerInv" ) { field( OOPT, "On Change" ) field( CALC, "A?0:1" ) } +record(calcout, "$(P)$(R)REGISTER61-BLINK" ) { +# field(DESC," $(R)") + field(INPA, "$(P)$(R)REGISTER61-BLINK" ) + field(OUT, "$(P)$(R)PCF8574:61:REGISTER.B7 PP MS" ) + field(OOPT, "Every Time" ) + field(CALC, "A?0:1" ) + field(VAL, "0" ) + field(SCAN, "1 second" ) + field(FLNK, "$(P)$(R)REGISTER56-BLINK" ) +} +record(calcout, "$(P)$(R)REGISTER56-BLINK" ) { +# field(DESC," $(R)") + field(INPA, "$(P)$(R)REGISTER61-BLINK" ) + field(OUT, "$(P)$(R)PCF8574:56:REGISTER.B0 PP MS") + field(OOPT, "On Change") + field(CALC, "A?0:1" ) +} ############################################################ ################################## diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 8d01e26..57924a0 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -64,7 +64,7 @@ short WSHTST_Shooting5 = 5; short WSHTST_Shooting6 = 6; short WSHTST_Shooting7 = 7; short WSHTST_Shooting8 = 8; -short WSHTST_Shooting9 = 9; +short WSHTST_SShot = 9; short WSHTST_Shooting10 = 10; short WSHTST_Shooting11 = 11; short WSHTST_Shooting12 = 12; @@ -247,15 +247,15 @@ assign IsttokClean_PrimContactor to "ISTTOK:central:Clean-PrimContactor"; short IsttokClean_PrimPneuBreaker; assign IsttokClean_PrimPneuBreaker to "ISTTOK:central:Clean-PrimPneuBreaker"; -short IsttokCountdown; -assign IsttokCountdown to "ISTTOK:central:COUNTDOWN"; -monitor IsttokCountdown; +short IsttokWaitTimer; +assign IsttokWaitTimer to "ISTTOK:central:COUNTDOWN"; +monitor IsttokWaitTimer; -//string IsttokCountdownScan; -//assign IsttokCountdownScan to "ISTTOK:central:COUNTDOWN.SCAN"; +//string IsttokWaitTimerScan; +//assign IsttokWaitTimerScan to "ISTTOK:central:COUNTDOWN.SCAN"; -short IsttokCountdownDisa; -assign IsttokCountdownDisa to "ISTTOK:central:COUNTDOWN.DISA"; +short IsttokWaitTimerDisa; +assign IsttokWaitTimerDisa to "ISTTOK:central:COUNTDOWN.DISA"; short IsttokEmergency; assign IsttokEmergency to "ISTTOK:central:Emergency"; @@ -313,8 +313,8 @@ ss PulseSequence { pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); - IsttokCountdown = 160; - pvPut(IsttokCountdown); + IsttokWaitTimer = 160; + pvPut(IsttokWaitTimer); // IsttokProcMode = OFF; // UPON POWER-DOWN OR FAILURE PREVENT TO ENTER WAITSHOT ON POWER-UP! // pvPut(IsttokProcMode); @@ -1101,22 +1101,22 @@ ss ShotSequence { entry { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); - IsttokCountdownDisa = 1; - pvPut(IsttokCountdownDisa); -// strcpy(IsttokCountdownScan, "Passive"); -// pvPut(IsttokCountdownScan); + IsttokWaitTimerDisa = 1; + pvPut(IsttokWaitTimerDisa); +// strcpy(IsttokWaitTimerScan, "Passive"); +// pvPut(IsttokWaitTimerScan); } when( IsttokOPSTATE == POS_WaitShot ){ //strcpy(msg, "Waiting for Trigger..."); // pvPut(msg); //errlogSevPrintf(NO_ALARM, "%s\n",msg); - IsttokCountdown = 0; - pvPut(IsttokCountdown); + IsttokWaitTimer = 0; + pvPut(IsttokWaitTimer); // Enable Counting - IsttokCountdownDisa = 0; - pvPut(IsttokCountdownDisa); -// strcpy(IsttokCountdownScan, "1 second"); -// pvPut(IsttokCountdownScan); + IsttokWaitTimerDisa = 0; + pvPut(IsttokWaitTimerDisa); +// strcpy(IsttokWaitTimerScan, "1 second"); +// pvPut(IsttokWaitTimerScan); WSHOTINGSTATE = WSHTST_ShotEnd; pvPut(WSHOTINGSTATE); //WSHOTINGSTATE = WSHTST_WaitTrg; @@ -1124,7 +1124,7 @@ ss ShotSequence { } state ShotEnd } state ShotWaitTrg { - when ((IsttokCountdown > 1800) || (IsttokOPSTATE != POS_WaitShot)) { + when ((IsttokWaitTimer > 1800) || (IsttokOPSTATE != POS_WaitShot)) { strcpy(msg, "Shooting Out"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); @@ -1137,8 +1137,8 @@ ss ShotSequence { when( IsttokTTSystem_tzero == 0 ){ strcpy(msg, "Trigger received..."); pvPut(msg); - IsttokCountdown = -70; - pvPut(IsttokCountdown); + IsttokWaitTimer = -70; + pvPut(IsttokWaitTimer); WSHOTINGSTATE = WSHTST_Shooting2; pvPut(WSHOTINGSTATE); PulseNumber +=1; @@ -1151,7 +1151,7 @@ ss ShotSequence { pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); } state ShotWaitTrg - when ((IsttokOPSTATE == POS_WaitShot) && (IsttokCountdown == -61)) { + when ((IsttokOPSTATE == POS_WaitShot) && (IsttokWaitTimer == -61)) { strcpy(msg, "Buzzer 1-Sound"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); @@ -1177,7 +1177,7 @@ ss ShotSequence { pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); } state ShotWaitTrg - when (IsttokCountdown == -60) { + when (IsttokWaitTimer == -60) { strcpy(msg, "GIS Valves OPEN"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); @@ -1195,7 +1195,7 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == -59) { + when (IsttokWaitTimer == -59) { WSHOTINGSTATE = WSHTST_Shooting5; pvPut(WSHOTINGSTATE); } state Shooting5 @@ -1208,7 +1208,7 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == -46) { + when (IsttokWaitTimer == -46) { strcpy(msg, "CAPBANK Charge ON" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); @@ -1226,7 +1226,7 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == -16) { + when (IsttokWaitTimer == -16) { strcpy(msg, "CAPBANK Charge OFF" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1244,7 +1244,7 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == -11) { + when (IsttokWaitTimer == -11) { strcpy(msg, "Buzzer 2-Sound" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1267,26 +1267,26 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == -4) { + when (IsttokWaitTimer == -4) { strcpy(msg, "Toroidal PS Trigger"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n",msg); // PS Trigger Pulse Isttok_TorPSTrigger = ON; pvPut(Isttok_TorPSTrigger); - WSHOTINGSTATE = WSHTST_Shooting9; + WSHOTINGSTATE = WSHTST_SShot; pvPut(WSHOTINGSTATE); - } state Shooting9 + } state SShot } - state Shooting9 { + state SShot { when (IsttokOPSTATE != POS_WaitShot) { - strcpy(msg, "Shooting9 Out"); + strcpy(msg, "SShot Out"); pvPut(msg); errlogSevPrintf(MINOR, "%s\n",msg); WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == -2) { + when (IsttokWaitTimer == -2) { strcpy(msg, "Ready for SHOT" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1294,6 +1294,7 @@ ss ShotSequence { pvPut(WSHOTINGSTATE); } state Shooting10 } + /* Does nothing */ state Shooting10 { when (IsttokOPSTATE != POS_WaitShot) { strcpy(msg, "Shooting10 Out"); @@ -1302,12 +1303,7 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == 0) { - strcpy(msg, "CAPBANK CrowBar Close" ); - pvPut(msg); - errlogSevPrintf(NO_ALARM, "%s\n", msg); - IsttokCapBank_Discharge = SEEED_RELAY_OFF; - pvPut(IsttokCapBank_Discharge); + when (IsttokWaitTimer == 1) { WSHOTINGSTATE = WSHTST_Shooting11; pvPut(WSHOTINGSTATE); } state Shooting11 @@ -1320,7 +1316,12 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == 1) { + when (IsttokWaitTimer == 2) { + strcpy(msg, "CAPBANK CrowBar Close" ); + pvPut(msg); + errlogSevPrintf(NO_ALARM, "%s\n", msg); + IsttokCapBank_Discharge = SEEED_RELAY_OFF; + pvPut(IsttokCapBank_Discharge); strcpy(msg, "GIS Valves CLOSE" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1343,7 +1344,7 @@ ss ShotSequence { WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown == 2) { + when (IsttokWaitTimer == 4) { strcpy(msg, "Lights OFF and Recovering..." ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1354,7 +1355,7 @@ ss ShotSequence { } state ShotEnd } state ShotEnd { - when (IsttokCountdown > 160 || IsttokOPSTATE != POS_WaitShot) { + when (IsttokWaitTimer > 160 || IsttokOPSTATE != POS_WaitShot) { strcpy(msg, "Terminated"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1447,7 +1448,7 @@ exit { /**** END PROGRAM ***/ -/* when (IsttokCountdown > 159) { +/* when (IsttokWaitTimer > 159) { strcpy(msg, "Toroidal Field Recovered" ); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); @@ -1455,21 +1456,21 @@ exit { pvPut(WSHOTINGSTATE); } state Shooting12 state Shooting12 { - when ((IsttokOPSTATE != POS_WaitShot ) && (IsttokCountdown == 160) ) { + when ((IsttokOPSTATE != POS_WaitShot ) && (IsttokWaitTimer == 160) ) { strcpy(msg, "Shooting12 Out"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); WSHOTINGSTATE = WSHTST_NonShoting; pvPut(WSHOTINGSTATE); } state NonShoting - when (IsttokCountdown >= 160) { + when (IsttokWaitTimer >= 160) { strcpy(msg, "Terminated"); pvPut(msg); errlogSevPrintf(NO_ALARM, "%s\n", msg); -// strcpy(IsttokCountdownScan, "Passive"); -// pvPut(IsttokCountdownScan); -// IsttokCountdown = 0; -// pvPut(IsttokCountdown); +// strcpy(IsttokWaitTimerScan, "Passive"); +// pvPut(IsttokWaitTimerScan); +// IsttokWaitTimer = 0; +// pvPut(IsttokWaitTimer); } state ShotWaitTrg } diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt index 9196933..a590d0c 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/pvList.txt @@ -1,88 +1,5 @@ -ISTTOK:central:PCF8591:72:ADC_CH1 -ISTTOK:central:PCF8591:72:ADC_CH2 -ISTTOK:central:PCF8591:72:ADC_CH3 -ISTTOK:central:P001:M -ISTTOK:central:P001:E -ISTTOK:central:P002:M -ISTTOK:central:P002:E -ISTTOK:central:P003:M -ISTTOK:central:P003:E -ISTTOK:central:P004:M -ISTTOK:central:P004:E -ISTTOK:central:OPCALCSTATE -ISTTOK:central:STARTCALCSTATE -ISTTOK:central:STOPPINGCALCSTATE -ISTTOK:central:CLEANCALCSTATE -ISTTOK:central:WSHOTCALCSTATE -ISTTOK:central:PULSE-NUMBER -ISTTOK:central:COUNTDOWN -ISTTOK:central:COUNTER -ISTTOK:central:PCF8591:72:BYTE2_CH1 -ISTTOK:central:PCF8591:72:BYTE2_CH2 -ISTTOK:central:PCF8591:72:BYTE2_CH3 -ISTTOK:central:Emergency -ISTTOK:central:VVessel-Pressure -ISTTOK:central:RPump1-Pressure -ISTTOK:central:TMPump1-PressureAdmission -ISTTOK:central:RPump2-Pressure -ISTTOK:central:PCF8591:72:DAC -ISTTOK:central:TDA8444:32:DAC_CH0 -ISTTOK:central:TDA8444:32:DAC_CH1 -ISTTOK:central:TDA8444:32:DAC_CH2 -ISTTOK:central:TDA8444:32:DAC_CH3 -ISTTOK:central:TDA8444:32:DAC_CH4 -ISTTOK:central:TDA8444:32:DAC_CH5 -ISTTOK:central:TDA8444:32:DAC_CH6 -ISTTOK:central:Shot-TorPSCurrent -ISTTOK:SR_0_State -ISTTOK:SR_1_State -ISTTOK:SR_2_State -ISTTOK:SR_3_State -ISTTOK:SR_4_State -ISTTOK:SR_5_State -ISTTOK:SR_6_State -ISTTOK:SR_7_State -ISTTOK:SR_disableMaxSecs ISTTOK:central:PCF8574:56:REGISTER:READ:FNOUT ISTTOK:central:PCF8574:57:REGISTER:READ:FNOUT -ISTTOK:central:TraceMessage -ISTTOK:central:LogMessage -ISTTOK:central:RS485Debug -ISTTOK:central:sendmail -ISTTOK:SR_recentlyStr -ISTTOK:SR_rebootStatusStr -ISTTOK:SR_rebootTime -ISTTOK:SR_statusStr -ISTTOK:SR_0_Name -ISTTOK:SR_0_StatusStr -ISTTOK:SR_0_Time -ISTTOK:SR_1_Name -ISTTOK:SR_1_StatusStr -ISTTOK:SR_1_Time -ISTTOK:SR_2_Name -ISTTOK:SR_2_StatusStr -ISTTOK:SR_2_Time -ISTTOK:SR_3_Name -ISTTOK:SR_3_StatusStr -ISTTOK:SR_3_Time -ISTTOK:SR_4_Name -ISTTOK:SR_4_StatusStr -ISTTOK:SR_4_Time -ISTTOK:SR_5_Name -ISTTOK:SR_5_StatusStr -ISTTOK:SR_5_Time -ISTTOK:SR_6_Name -ISTTOK:SR_6_StatusStr -ISTTOK:SR_6_Time -ISTTOK:SR_7_Name -ISTTOK:SR_7_StatusStr -ISTTOK:SR_7_Time -ISTTOK:central:TMPump1-ControllerOnInv -ISTTOK:central:TMPump1-ControllerOffInv -ISTTOK:central:TMPump1-MotorOnInv -ISTTOK:central:TMPump1-MotorOffInv -ISTTOK:central:BuzzerInv -ISTTOK:central:Shot-TorPSTriggerInv ISTTOK:central:TMPump1-Power ISTTOK:central:TMPump1-Emergency ISTTOK:central:TMPump1-Acceleration @@ -91,175 +8,6 @@ ISTTOK:central:TMPump2-Emergency ISTTOK:central:TMPump2-Acceleration ISTTOK:central:TTSystem-tzero ISTTOK:central:Emergency-PhysButton -ISTTOK:central:LASTOPSTATE -ISTTOK:SR_rebootStatus -ISTTOK:SR_status -ISTTOK:SR_0_Status -ISTTOK:SR_1_Status -ISTTOK:SR_2_Status -ISTTOK:SR_3_Status -ISTTOK:SR_4_Status -ISTTOK:SR_5_Status -ISTTOK:SR_6_Status -ISTTOK:SR_7_Status -ISTTOK:central:PCF8574:56:REGISTER:READ -ISTTOK:central:PCF8574:57:REGISTER:READ -ISTTOK:central:PCF8574:60:REGISTER:READ -ISTTOK:central:PCF8574:61:REGISTER:READ -ISTTOK:central:SEEED4RELAY:17:REGISTER:READ -ISTTOK:central:CurrentTime -ISTTOK:central:TMPump2-Speed -ISTTOK:central:TMPump2-Current -ISTTOK:central:Shot-TorPSCurrentImage -ISTTOK:central:UPS-OnBattery -ISTTOK:central:UPS-Shutdown -ISTTOK:central:OPREQ -ISTTOK:central:CLEANINGMANMODE -ISTTOK:central:FSTriggerStart -ISTTOK:central:PROCESS-MODE -ISTTOK:central:PROCESS-REQ -ISTTOK:central:AUTHORISATION -ISTTOK:central:TMPump1-ControllerOn -ISTTOK:central:TMPump1-ControllerOff -ISTTOK:central:TMPump1-MotorOn -ISTTOK:central:TMPump1-MotorOff -ISTTOK:central:TMPump2-Motor -ISTTOK:central:Buzzer -ISTTOK:central:Emergency-UserButton -ISTTOK:central:RPump1-Motor -ISTTOK:central:RPump1-Valve -ISTTOK:central:RPump2-Motor -ISTTOK:central:RPump2-Valve -ISTTOK:central:VVessel-Filament -ISTTOK:central:Lab-WarningLight -ISTTOK:central:Clean-TorContactor -ISTTOK:central:Clean-TorPneuBreaker -ISTTOK:central:Shot-TorPSDisable -ISTTOK:central:Shot-TorPSTrigger -ISTTOK:central:CapBank-Charge -ISTTOK:central:Clean-PrimContactor -ISTTOK:central:Clean-PrimPneuBreaker -ISTTOK:central:GasIS-Valves -ISTTOK:central:CapBank-Discharge -ISTTOK:central:TMPump1-ManualValve -ISTTOK:SR_heartbeat -ISTTOK:SR_i_am_alive -ISTTOK:SR_deadIfZero -ISTTOK:SR_disable -ISTTOK:central:PCF8574:56:REGISTER -ISTTOK:central:PCF8574:57:REGISTER -ISTTOK:central:PCF8574:60:REGISTER -ISTTOK:central:PCF8574:61:REGISTER -ISTTOK:central:PCF8591:72:CTRLREGISTER -ISTTOK:central:SEEED4RELAY:17:REGISTER -ISTTOK:central:OPSTATE -ISTTOK:central:STARTINGSTATE -ISTTOK:central:CLEANINGSTATE -ISTTOK:central:WSHOTINGSTATE -ISTTOK:central:STOPPINGSTATE -ISTTOK:central:PCF8591:72:ADC_CH1 -ISTTOK:central:PCF8591:72:ADC_CH2 -ISTTOK:central:PCF8591:72:ADC_CH3 -ISTTOK:central:P001:M -ISTTOK:central:P001:E -ISTTOK:central:P002:M -ISTTOK:central:P002:E -ISTTOK:central:P003:M -ISTTOK:central:P003:E -ISTTOK:central:P004:M -ISTTOK:central:P004:E -ISTTOK:central:OPCALCSTATE -ISTTOK:central:STARTCALCSTATE -ISTTOK:central:STOPPINGCALCSTATE -ISTTOK:central:CLEANCALCSTATE -ISTTOK:central:WSHOTCALCSTATE -ISTTOK:central:PULSE-NUMBER -ISTTOK:central:COUNTDOWN -ISTTOK:central:COUNTER -ISTTOK:central:PCF8591:72:BYTE2_CH1 -ISTTOK:central:PCF8591:72:BYTE2_CH2 -ISTTOK:central:PCF8591:72:BYTE2_CH3 -ISTTOK:central:Emergency -ISTTOK:central:VVessel-Pressure -ISTTOK:central:RPump1-Pressure -ISTTOK:central:TMPump1-PressureAdmission -ISTTOK:central:RPump2-Pressure -ISTTOK:central:PCF8591:72:DAC -ISTTOK:central:TDA8444:32:DAC_CH0 -ISTTOK:central:TDA8444:32:DAC_CH1 -ISTTOK:central:TDA8444:32:DAC_CH2 -ISTTOK:central:TDA8444:32:DAC_CH3 -ISTTOK:central:TDA8444:32:DAC_CH4 -ISTTOK:central:TDA8444:32:DAC_CH5 -ISTTOK:central:TDA8444:32:DAC_CH6 -ISTTOK:central:Shot-TorPSCurrent -ISTTOK:SR_0_State -ISTTOK:SR_1_State -ISTTOK:SR_2_State -ISTTOK:SR_3_State -ISTTOK:SR_4_State -ISTTOK:SR_5_State -ISTTOK:SR_6_State -ISTTOK:SR_7_State -ISTTOK:SR_disableMaxSecs -ISTTOK:central:PCF8574:56:REGISTER:READ:FNOUT -ISTTOK:central:PCF8574:57:REGISTER:READ:FNOUT -ISTTOK:central:TraceMessage -ISTTOK:central:LogMessage -ISTTOK:central:RS485Debug -ISTTOK:central:sendmail -ISTTOK:SR_recentlyStr -ISTTOK:SR_rebootStatusStr -ISTTOK:SR_rebootTime -ISTTOK:SR_statusStr -ISTTOK:SR_0_Name -ISTTOK:SR_0_StatusStr -ISTTOK:SR_0_Time -ISTTOK:SR_1_Name -ISTTOK:SR_1_StatusStr -ISTTOK:SR_1_Time -ISTTOK:SR_2_Name -ISTTOK:SR_2_StatusStr -ISTTOK:SR_2_Time -ISTTOK:SR_3_Name -ISTTOK:SR_3_StatusStr -ISTTOK:SR_3_Time -ISTTOK:SR_4_Name -ISTTOK:SR_4_StatusStr -ISTTOK:SR_4_Time -ISTTOK:SR_5_Name -ISTTOK:SR_5_StatusStr -ISTTOK:SR_5_Time -ISTTOK:SR_6_Name -ISTTOK:SR_6_StatusStr -ISTTOK:SR_6_Time -ISTTOK:SR_7_Name -ISTTOK:SR_7_StatusStr -ISTTOK:SR_7_Time -ISTTOK:central:TMPump1-ControllerOnInv -ISTTOK:central:TMPump1-ControllerOffInv -ISTTOK:central:TMPump1-MotorOnInv -ISTTOK:central:TMPump1-MotorOffInv -ISTTOK:central:Shot-TorPSTriggerInv -ISTTOK:central:TMPump1-Power -ISTTOK:central:TMPump1-Emergency -ISTTOK:central:TMPump1-Acceleration -ISTTOK:central:TMPump1-NormalOperation -ISTTOK:central:TMPump2-Emergency -ISTTOK:central:TMPump2-Acceleration -ISTTOK:central:TTSystem-tzero -ISTTOK:central:Emergency-PhysButton -ISTTOK:central:LASTOPSTATE -ISTTOK:SR_rebootStatus -ISTTOK:SR_status -ISTTOK:SR_0_Status -ISTTOK:SR_1_Status -ISTTOK:SR_2_Status -ISTTOK:SR_3_Status -ISTTOK:SR_4_Status -ISTTOK:SR_5_Status -ISTTOK:SR_6_Status -ISTTOK:SR_7_Status ISTTOK:central:PCF8574:56:REGISTER:READ ISTTOK:central:PCF8574:57:REGISTER:READ ISTTOK:central:PCF8574:60:REGISTER:READ @@ -268,9 +16,103 @@ ISTTOK:central:SEEED4RELAY:17:REGISTER:READ ISTTOK:central:SEEED4RELAY:18:REGISTER:READ ISTTOK:central:SEEED4RELAY:19:REGISTER:READ ISTTOK:central:CurrentTime -ISTTOK:central:TMPump2-Speed -ISTTOK:central:TMPump2-Current -ISTTOK:central:Shot-TorPSCurrentImage +ISTTOK:central:OPCALCSTATE +ISTTOK:central:STARTCALCSTATE +ISTTOK:central:STOPPINGCALCSTATE +ISTTOK:central:CLEANCALCSTATE +ISTTOK:central:WSHOTCALCSTATE +ISTTOK:central:PULSE-NUMBER +ISTTOK:central:COUNTDOWN +ISTTOK:central:COUNTER +ISTTOK:central:PCF8591:72:BYTE2_CH1 +ISTTOK:central:PCF8591:72:BYTE2_CH2 +ISTTOK:central:PCF8591:72:BYTE2_CH3 +ISTTOK:central:Emergency +ISTTOK:central:VVessel-Pressure +ISTTOK:central:RPump1-Pressure +ISTTOK:central:TMPump1-PressureAdmission +ISTTOK:central:RPump2-Pressure +ISTTOK:central:TraceMessage +ISTTOK:central:LogMessage +ISTTOK:central:RS485Debug +ISTTOK:central:sendmail +ISTTOK:SR_recentlyStr +ISTTOK:SR_rebootStatusStr +ISTTOK:SR_rebootTime +ISTTOK:SR_statusStr +ISTTOK:SR_0_Name +ISTTOK:SR_0_StatusStr +ISTTOK:SR_0_Time +ISTTOK:SR_1_Name +ISTTOK:SR_1_StatusStr +ISTTOK:SR_1_Time +ISTTOK:SR_2_Name +ISTTOK:SR_2_StatusStr +ISTTOK:SR_2_Time +ISTTOK:SR_3_Name +ISTTOK:SR_3_StatusStr +ISTTOK:SR_3_Time +ISTTOK:SR_4_Name +ISTTOK:SR_4_StatusStr +ISTTOK:SR_4_Time +ISTTOK:SR_5_Name +ISTTOK:SR_5_StatusStr +ISTTOK:SR_5_Time +ISTTOK:SR_6_Name +ISTTOK:SR_6_StatusStr +ISTTOK:SR_6_Time +ISTTOK:SR_7_Name +ISTTOK:SR_7_StatusStr +ISTTOK:SR_7_Time +ISTTOK:central:PCF8591:72:DAC +ISTTOK:central:TDA8444:32:DAC_CH0 +ISTTOK:central:TDA8444:32:DAC_CH1 +ISTTOK:central:TDA8444:32:DAC_CH2 +ISTTOK:central:TDA8444:32:DAC_CH3 +ISTTOK:central:TDA8444:32:DAC_CH4 +ISTTOK:central:TDA8444:32:DAC_CH5 +ISTTOK:central:TDA8444:32:DAC_CH6 +ISTTOK:central:Shot-TorPSCurrent +ISTTOK:SR_0_State +ISTTOK:SR_1_State +ISTTOK:SR_2_State +ISTTOK:SR_3_State +ISTTOK:SR_4_State +ISTTOK:SR_5_State +ISTTOK:SR_6_State +ISTTOK:SR_7_State +ISTTOK:SR_disableMaxSecs +ISTTOK:central:PCF8574:56:REGISTER +ISTTOK:central:PCF8574:57:REGISTER +ISTTOK:central:PCF8574:60:REGISTER +ISTTOK:central:PCF8574:61:REGISTER +ISTTOK:central:PCF8591:72:CTRLREGISTER +ISTTOK:central:SEEED4RELAY:17:REGISTER +ISTTOK:central:SEEED4RELAY:18:REGISTER +ISTTOK:central:SEEED4RELAY:19:REGISTER +ISTTOK:central:TMPump1-ControllerOnInv +ISTTOK:central:TMPump1-ControllerOffInv +ISTTOK:central:TMPump1-MotorOnInv +ISTTOK:central:TMPump1-MotorOffInv +ISTTOK:central:Shot-TorPSTriggerInv +ISTTOK:central:REGISTER61-BLINK +ISTTOK:central:REGISTER56-BLINK +ISTTOK:central:OPSTATE +ISTTOK:central:LASTOPSTATE +ISTTOK:central:STARTINGSTATE +ISTTOK:central:CLEANINGSTATE +ISTTOK:central:WSHOTINGSTATE +ISTTOK:central:STOPPINGSTATE +ISTTOK:SR_rebootStatus +ISTTOK:SR_status +ISTTOK:SR_0_Status +ISTTOK:SR_1_Status +ISTTOK:SR_2_Status +ISTTOK:SR_3_Status +ISTTOK:SR_4_Status +ISTTOK:SR_5_Status +ISTTOK:SR_6_Status +ISTTOK:SR_7_Status ISTTOK:central:UPS-OnBattery ISTTOK:central:UPS-Shutdown ISTTOK:central:OPREQ @@ -290,8 +132,6 @@ ISTTOK:central:RPump1-Valve ISTTOK:central:RPump2-Motor ISTTOK:central:RPump2-Valve ISTTOK:central:VVessel-Filament -ISTTOK:central:Lab-WarningLight -ISTTOK:central:Shot-TorPSDisable ISTTOK:central:Shot-TorPSTrigger ISTTOK:central:GasIS-Valves ISTTOK:central:TMPump1-ManualValve @@ -302,20 +142,23 @@ ISTTOK:central:Clean-PrimContactor ISTTOK:central:Clean-TorContactor ISTTOK:central:CapBank-Charge ISTTOK:central:Buzzer +ISTTOK:central:Shot-TorPSDisable +ISTTOK:central:Lab-WarningLight ISTTOK:SR_heartbeat ISTTOK:SR_i_am_alive ISTTOK:SR_deadIfZero ISTTOK:SR_disable -ISTTOK:central:PCF8574:56:REGISTER -ISTTOK:central:PCF8574:57:REGISTER -ISTTOK:central:PCF8574:60:REGISTER -ISTTOK:central:PCF8574:61:REGISTER -ISTTOK:central:PCF8591:72:CTRLREGISTER -ISTTOK:central:SEEED4RELAY:17:REGISTER -ISTTOK:central:SEEED4RELAY:18:REGISTER -ISTTOK:central:SEEED4RELAY:19:REGISTER -ISTTOK:central:OPSTATE -ISTTOK:central:STARTINGSTATE -ISTTOK:central:CLEANINGSTATE -ISTTOK:central:WSHOTINGSTATE -ISTTOK:central:STOPPINGSTATE +ISTTOK:central:TMPump2-Speed +ISTTOK:central:TMPump2-Current +ISTTOK:central:Shot-TorPSCurrentImage +ISTTOK:central:PCF8591:72:ADC_CH1 +ISTTOK:central:PCF8591:72:ADC_CH2 +ISTTOK:central:PCF8591:72:ADC_CH3 +ISTTOK:central:P001:M +ISTTOK:central:P001:E +ISTTOK:central:P002:M +ISTTOK:central:P002:E +ISTTOK:central:P003:M +ISTTOK:central:P003:E +ISTTOK:central:P004:M +ISTTOK:central:P004:E diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav index af51db7..b8ab7ac 100644 --- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav +++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav @@ -1,10 +1,10 @@ -# autosave R5.3 Automatically generated - DO NOT MODIFY - 220216-181851 -ISTTOK:central:PULSE-NUMBER.VAL 49468 +# autosave R5.3 Automatically generated - DO NOT MODIFY - 220316-152804 +ISTTOK:central:PULSE-NUMBER.VAL 49525 ISTTOK:central:LogMessage.VAL ISTTOK:central:LASTOPSTATE.VAL 2 ISTTOK:central:OPREQ.VAL 1 -ISTTOK:central:PROCESS-MODE.VAL 0 -ISTTOK:central:CLEANINGMANMODE.VAL 0 +ISTTOK:central:PROCESS-MODE.VAL 1 +ISTTOK:central:CLEANINGMANMODE.VAL 1 ISTTOK:central:Emergency-UserButton.VAL 0 ISTTOK:central:TMPump1-ManualValve.VAL 1 ISTTOK:central:Shot-TorPSCurrent 32