- Currently disabled attempts at logging commands
- Added a warning for excessive data rates on monitors - Added statistics to devser and thus to scriptcontext - Added byte concatenation to dynstring - Added aborting for reflection generation to fourmess.c - Added data checksum testing to hipadaba, use for update tests - Fixed interrupt discovery in network.c, caused invalid interrupt codes which in turn confused sicscron which had to be fixed too. - Renamed ubcalc into ubcalcint in order to reclaim the ubcalc for Jurg - Added an a3offset to tasub in order to fix what I perceive an IS problem - Added support for the newer version of the Siemens SPS, the S7 - Added a not yet fully working sinqhttpopt driver which talks to http HM without libghttp SKIPPED: psi/delcam.c psi/make_gen psi/psi.c psi/sinq.c psi/sinq.h psi/sinqhttpopt.c psi/slsvme.c psi/spss7.c
This commit is contained in:
18
motorsec.c
18
motorsec.c
@@ -96,16 +96,26 @@ static long SecMotorRun(void *sulf, SConnection * pCon, float fNew)
|
||||
{
|
||||
pMotor self = (pMotor) sulf;
|
||||
hdbValue v;
|
||||
int accesscode;
|
||||
int accesscode, status;
|
||||
pHdb node = NULL;
|
||||
|
||||
assert(SICSHdbGetPar(self, NULL, "accesscode", &v) == 1);
|
||||
accesscode = (int)v.v.doubleValue;
|
||||
if(!SCMatchRights(pCon, accesscode)){
|
||||
return 0;
|
||||
}
|
||||
self->stopped = 0;
|
||||
|
||||
v = MakeHdbFloat(fNew);
|
||||
return SetHipadabaPar(self->pDescriptor->parNode, v, pCon);
|
||||
status = SetHipadabaPar(self->pDescriptor->parNode, v, pCon);
|
||||
node = GetHipadabaNode(self->pDescriptor->parNode, "status");
|
||||
if(node != NULL){
|
||||
v = MakeHdbText(strdup("run"));
|
||||
UpdateHipadabaPar(node,v,pCon);
|
||||
ReleaseHdbValue(&v);
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
@@ -299,7 +309,9 @@ static int SecMotorStatus(void *sulf, SConnection * pCon)
|
||||
if (SCGetInterrupt(pCon) < (int) interrupt) {
|
||||
SCSetInterrupt(pCon, (int) interrupt);
|
||||
}
|
||||
self->errorCount++;
|
||||
if(self->stopped == 0) {
|
||||
self->errorCount++;
|
||||
}
|
||||
break;
|
||||
case HWIdle:
|
||||
self->posCount = 10000;
|
||||
|
||||
Reference in New Issue
Block a user