From 9c1bb2c809b929eb6e64909bb014f44f041703bd Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 11 Sep 2013 19:45:44 +1000 Subject: [PATCH] SICS-405: Reverted fix of 1/6/2010 to remove sleep() function call. --- site_ansto/hardsup/sct_rfamp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site_ansto/hardsup/sct_rfamp.c b/site_ansto/hardsup/sct_rfamp.c index aaead6ae..3dbf3767 100644 --- a/site_ansto/hardsup/sct_rfamp.c +++ b/site_ansto/hardsup/sct_rfamp.c @@ -177,7 +177,7 @@ int RFAmpReading (Ascon *a) data->transactInProg = txCheckReply; //Jing: add delay to wait for ramping complete - sleep(data->timeout); + /* ffr: Reverted SICS-405 sleep(data->timeout); */ DynStringClear(a->wrBuffer); DynStringConcatBytes(a->wrBuffer, data->statusCmd, LCMDLEN); @@ -245,6 +245,7 @@ int RFAmpReading (Ascon *a) tmpSwitchs = (unsigned char)data->rfCmd[8]; // TODO SICS-405 ffr Removed check because the read values don't immediately match the set values + /* if( (abs(atoi(curr) - atoi(tmpCurr)) > data->currTol) || (atoi(freq) != atoi(tmpFreq)) || ((switches & 0x0F) != (tmpSwitchs & 0x0F)) ) { @@ -254,9 +255,10 @@ int RFAmpReading (Ascon *a) } else { DynStringReplace(a->rdBuffer, "OK", 0); } + */ /* ffr Just report OK until we have a proper fix */ - //DynStringReplace(a->rdBuffer, "OK", 0); + DynStringReplace(a->rdBuffer, "OK", 0); a->state = AsconReadDone; data->transactInProg = txNormalRead;