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

- Removed automatic loading of status file on startup

Browse Source 
- make soft motor values the default all over
- Introduced nxscript putSlab
- Fixed a bug in polldriv
This commit is contained in:
koennecke
2007-02-23 14:31:43 +00:00
parent 8987f54bed
commit 6eb387654e
23 changed files with 710 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
stdscan.c
View File

@ -787,16 +787,8 @@ int prepareDataFile(pScanData self){
pVar = (pVarEntry)pDings;
if(pVar)
{
if(jochenFlag == 1 &&
strcmp(pVar->pObject->pDescriptor->name, "Motor") == 0)
{
MotorGetSoftPosition((pMotor)pVar->pObject,self->pCon,&fVal);
}
else
{
fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
}
AppendScanVar(pVar,fVal);
fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
AppendScanVar(pVar,fVal);
sprintf(pItem,"%-9.9s ",ScanVarName(pVar));
strcat(pHead,pItem);
sprintf(pItem,"%-9.3f ",fVal);
@ -841,11 +833,6 @@ int prepareDataFile(pScanData self){
{
return CollectScanDataIntern(self,iPoint,0);
}
/*--------------------------------------------------------------------------*/
int CollectScanDataJochen(pScanData self, int iPoint)
{
return CollectScanDataIntern(self,iPoint,1);
}
/*------------------------------------------------------------------------*/
int CollectSilent(pScanData self, int iPoint)
{
@ -867,15 +854,7 @@ int prepareDataFile(pScanData self){
pVar = (pVarEntry)pDings;
if(pVar)
{
if(jochenFlag == 1 &&
strcmp(pVar->pObject->pDescriptor->name, "Motor") == 0)
{
MotorGetSoftPosition((pMotor)pVar->pObject,self->pCon,&fVal);
}
else
{
fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
}
fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
AppendScanVar(pVar,fVal);
}
}