From 691ea5dbf05bf5e1dec3649873053c4f8330a169 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 10 May 2007 16:09:04 +1000 Subject: [PATCH] Reverted support for text value parameters. This has been made obsolete by the pActionRoutine. r1954 | ffr | 2007-05-10 16:09:04 +1000 (Thu, 10 May 2007) | 3 lines --- motor.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/motor.c b/motor.c index fd060d40..78eae618 100644 --- a/motor.c +++ b/motor.c @@ -1199,10 +1199,9 @@ extern MotorDriver *MakePiPiezo(Tcl_Interp *pTcl, char *pArray); TokenList *pList = NULL; TokenList *pCurrent; TokenList *pName; - int iRet, iRet2=0; + int iRet; pMotor self; float fValue; - char textValue[TEXTPARLEN]; long lID; pMotInfo pMoti = NULL; @@ -1357,10 +1356,7 @@ extern MotorDriver *MakePiPiezo(Tcl_Interp *pTcl, char *pArray); return 1; } iRet = MotorGetPar(self,pName->text,&fValue); - - if(self->pDriver->GetDriverTextPar != NULL) - iRet2 = self->pDriver->GetDriverTextPar(self->pDriver, pName->text, textValue); - if(!(iRet || iRet2)) + if(!iRet) { sprintf(pBueffel,"Parameter %s not found ",pName->text); SCWrite(pCon,pBueffel,eValue); @@ -1369,10 +1365,7 @@ extern MotorDriver *MakePiPiezo(Tcl_Interp *pTcl, char *pArray); } else { - if (iRet) - sprintf(pBueffel, "%s.%s = %f",self->name,pName->text,fValue); - else if (iRet2) - sprintf(pBueffel, "%s.%s = %s",self->name,pName->text,textValue); + sprintf(pBueffel, "%s.%s = %f",self->name,pName->text,fValue); SCWrite(pCon,pBueffel,eValue); DeleteTokenList(pList); return 1;