added Inficon gauges

Signed-off-by: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
This commit is contained in:
Bernardo Carvalho
2024-12-11 17:00:23 +00:00
parent 0ea59f7cfe
commit 17bab67ce7
7 changed files with 177 additions and 106 deletions

View File

@@ -97,6 +97,11 @@ short MINOR=1;
short MAJOR=2;
short INVALID=3;
short MARTeIdle=0;
short MARTeWaitingForPre=1;
short MARTePulsing=2;
short MARTeError=15;
/* PV variables */
short IsttokOPSTATE;
assign IsttokOPSTATE to "ISTTOK:central:OPSTATE";
@@ -278,7 +283,7 @@ monitor IsttokUpsShutdown;
short IsttokMARTe2Status;
assign IsttokMARTe2Status "ISTTOK:central:MARTe2-Status";
monitor IsttokMARTe2Status;
// monitor IsttokMARTe2Status;
//string tmp1_stat;
short IsttokMARTe2Command;
@@ -480,7 +485,7 @@ ss PulseSequence {
pvPut(Isttok_TorPSDisable);
IsttokProcReq = STOP;
pvPut(IsttokProcReq);
IsttokMARTe2Command = STOP;
IsttokMARTe2Command = MARTeIdle;
pvPut(IsttokMARTe2Command);
}
when (IsttokUpsShutdown == ON) {
@@ -1166,7 +1171,7 @@ ss ShotSequence {
pvPut(WSHOTINGSTATE);
IsttokWaitTimerDisa = 1;
pvPut(IsttokWaitTimerDisa);
IsttokMARTe2Command = STOP;
IsttokMARTe2Command = MARTeIdle;
pvPut(IsttokMARTe2Command);
// strcpy(IsttokWaitTimerScan, "Passive");
// pvPut(IsttokWaitTimerScan);
@@ -1345,7 +1350,7 @@ ss ShotSequence {
// PS Trigger Pulse
Isttok_TorPSTrigger = ON;
pvPut(Isttok_TorPSTrigger);
IsttokMARTe2Command = START; // ~1.2 s before Btor. ~ 4 sec before TSHOT
IsttokMARTe2Command = MARTeWaitingForPre; // ~1.2 s before Btor. ~ 4 sec before TSHOT
pvPut(IsttokMARTe2Command);
WSHOTINGSTATE = WSHTST_SShot;
pvPut(WSHOTINGSTATE);
@@ -1363,6 +1368,8 @@ ss ShotSequence {
strcpy(msg, "Ready for SHOT" );
pvPut(msg);
errlogSevPrintf(NO_ALARM, "%s\n", msg);
IsttokMARTe2Command = MARTePulsing;
pvPut(IsttokMARTe2Command);
WSHOTINGSTATE = WSHTST_Shooting10;
pvPut(WSHOTINGSTATE);
} state Shooting10
@@ -1405,7 +1412,7 @@ ss ShotSequence {
errlogSevPrintf(NO_ALARM, "%s\n", msg);
IsttokVVessel_Filament = 1;
pvPut(IsttokVVessel_Filament);
IsttokMARTe2Command = STOP;
IsttokMARTe2Command = MARTeIdle;
pvPut(IsttokMARTe2Command);
WSHOTINGSTATE = WSHTST_Shooting12;
pvPut(WSHOTINGSTATE);