- Changed tabledrive to new MARS driving
- Various fixes to make SLS magnet controller more stable
This commit is contained in:
@@ -57,7 +57,7 @@ static int TableDriveCheckLimits(void *pData, float fVal, char *error,
|
||||
strncpy(error,"Path Table Not Defined!",25);
|
||||
return 0;
|
||||
}
|
||||
if(fVal < 1. || fVal >= self->tableLength){
|
||||
if(fVal < 1. || fVal > self->tableLength){
|
||||
strncpy(error,"Out of Range",25);
|
||||
return 0;
|
||||
}
|
||||
@@ -267,7 +267,7 @@ static void tableInfo(pTableDrive self, SConnection *pCon){
|
||||
MotorGetPar(moti.pMot,"precision",&tolerance);
|
||||
targetPosition = findTarget(moti,value);
|
||||
snprintf(pBueffel,256,"Motor %10s, should: %8.2f, is %8.2f, diff = %8.2f",
|
||||
moti.motorName, motorPosition, targetPosition,
|
||||
moti.motorName, targetPosition, motorPosition,
|
||||
ABS(targetPosition - motorPosition));
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user