linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various changes

Browse Source
This commit is contained in:
Douglas Clowes
2012-11-30 10:31:59 +11:00
parent 3501c0085a
commit 36697bf25a
1 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
statemon.c
View File

@ -125,9 +125,13 @@ static int StateInterest(int iEvent, void *pEvent, void *pUser)
snprintf(buffer, 255, "SUID MSG FINISH = %s", device); snprintf(buffer, 255, "SUID MSG FINISH = %s", device);
SCWrite(pStateMonDummyCon, buffer, eError); SCWrite(pStateMonDummyCon, buffer, eError);
} }
pVar = (pSicsVariable)FindCommandData(pServ->pSics,SICS_SUID,"SicsVariable"); pVar =
(pSicsVariable) FindCommandData(pServ->pSics, SICS_SUID,
"SicsVariable");
if (pVar == NULL) { if (pVar == NULL) {
SCWrite(pStateMonDummyCon,"ERROR: StateMon.c: Could not find SUID SicsVariable",eError); SCWrite(pStateMonDummyCon,
"ERROR: StateMon.c: Could not find SUID SicsVariable",
eError);
return 0; return 0;
} }
(pVar->iVal)++; (pVar->iVal)++;
@ -141,6 +145,22 @@ static int StateInterest(int iEvent, void *pEvent, void *pUser)
snprintf(buffer, 255, "FINISH = %s", device); snprintf(buffer, 255, "FINISH = %s", device);
SCWrite(pCon, buffer, eWarning); SCWrite(pCon, buffer, eWarning);
} }
if (iEvent == STPAUSE) {
snprintf(buffer, 255, "PAUSE = %s", device);
SCWrite(pCon, buffer, eWarning);
}
if (iEvent == STCONTINUE) {
snprintf(buffer, 255, "CONTINUE = %s", device);
SCWrite(pCon, buffer, eWarning);
}
if (iEvent == STBUSY) {
snprintf(buffer, 255, "BUSY = %s", device);
SCWrite(pCon, buffer, eWarning);
}
if (iEvent == STIDLE) {
snprintf(buffer, 255, "IDLE = %s", device);
SCWrite(pCon, buffer, eWarning);
}
} }
return 1; return 1;
} }
@ -324,9 +344,11 @@ int StateMonFactory(SConnection * pCon, SicsInterp * pSics, void *pData,
} }
/* Make dummy connection for SUID (instrument state id) */ /* Make dummy connection for SUID (instrument state id) */
pStateMonDummyCon = SCCreateDummyConnection(pSics); pStateMonDummyCon = SCCreateDummyConnection(pSics);
lID = RegisterCallback(pNew->pCall, STSTART, StateInterest, pStateMonDummyCon, NULL); lID = RegisterCallback(pNew->pCall, STSTART, StateInterest,
pStateMonDummyCon, NULL);
SCRegister(pStateMonDummyCon, pSics, pNew->pCall, lID); SCRegister(pStateMonDummyCon, pSics, pNew->pCall, lID);
lID = RegisterCallback(pNew->pCall, STEND, StateInterest, pStateMonDummyCon, NULL); lID = RegisterCallback(pNew->pCall, STEND, StateInterest,
pStateMonDummyCon, NULL);
SCRegister(pStateMonDummyCon, pSics, pNew->pCall, lID); SCRegister(pStateMonDummyCon, pSics, pNew->pCall, lID);
pRes = VarCreate(usInternal, veInt, SICS_SUID); pRes = VarCreate(usInternal, veInt, SICS_SUID);
AddCommand(pSics, SICS_SUID, VarWrapper, (KillFunc) VarKill, pRes); AddCommand(pSics, SICS_SUID, VarWrapper, (KillFunc) VarKill, pRes);