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

remove trailing spaces on numerous lines

Browse Source 
r1898 | dcl | 2007-04-20 11:56:22 +1000 (Fri, 20 Apr 2007) | 2 lines
This commit is contained in:
Douglas Clowes
2007-04-20 11:56:22 +10:00
parent ade5216ea9
commit 56cdbec451
1 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
site_ansto/motor_dmc2280.c
View File

@@ -112,7 +112,7 @@ struct __MoDriv {
int airpad_state; /**< state of the airpads finite state machine */ int airpad_state; /**< state of the airpads finite state machine */
int airpad_counter; /**< airpad timer retry counter */ int airpad_counter; /**< airpad timer retry counter */
pNWTimer airpad_timer; /**< timer waiting for airpad action to complete */ pNWTimer airpad_timer; /**< timer waiting for airpad action to complete */
pNWTimer motor_timer; /**< motor off timer */ pNWTimer motoff_timer; /**< motor off timer */
int debug; int debug;
int preseek; /**< Flag = 1 if current move is a backlash preseek */ int preseek; /**< Flag = 1 if current move is a backlash preseek */
}; };
@@ -887,11 +887,11 @@ static int DMC_AirPads(pDMC2280Driv self, int flag) {
* \param context motor data * \param context motor data
* \param mode * \param mode
*/ */
static int motor_timeout(void* context, int mode) { static int motoff_timeout(void* context, int mode) {
pDMC2280Driv self = (pDMC2280Driv) context; pDMC2280Driv self = (pDMC2280Driv) context;
char cmd[CMDLEN]; char cmd[CMDLEN];
self->motor_timer = NULL; self->motoff_timer = NULL;
if (self->has_airpads) { if (self->has_airpads) {
DMC_AirPads(self, 0); DMC_AirPads(self, 0);
return 0; return 0;
@@ -1052,9 +1052,9 @@ static int DMC2280Run(void *pData,float fValue){
return HWFault; return HWFault;
} }
if (self->motor_timer) if (self->motoff_timer)
NetWatchRemoveTimer(self->motor_timer); NetWatchRemoveTimer(self->motoff_timer);
self->motor_timer = NULL; self->motoff_timer = NULL;
if (self->settle) if (self->settle)
self->time_settle_done.tv_sec = 0; self->time_settle_done.tv_sec = 0;
@@ -1114,7 +1114,7 @@ static int DMC2280Status(void *pData){
* If we are waiting for the motor or airpads then we * If we are waiting for the motor or airpads then we
* are busy * are busy
*/ */
if (self->motor_timer || self->airpad_timer) if (self->motoff_timer || self->airpad_timer)
return HWBusy; return HWBusy;
/* Make sure that speed, accel and decel are set correctly */ /* Make sure that speed, accel and decel are set correctly */
@@ -1231,9 +1231,9 @@ static int DMC2280Status(void *pData){
if (self->airpad_state == AIRPADS_LOWER) if (self->airpad_state == AIRPADS_LOWER)
return HWBusy; return HWBusy;
if (self->motOffDelay > 0 ) { if (self->motOffDelay > 0 ) {
NetWatchRegisterTimer(&self->motor_timer, NetWatchRegisterTimer(&self->motoff_timer,
self->motOffDelay, self->motOffDelay,
motor_timeout, self); motoff_timeout, self);
return HWIdle; return HWIdle;
} }
if (!DMC_AirPads(self, 0)) if (!DMC_AirPads(self, 0))
@@ -1245,9 +1245,9 @@ static int DMC2280Status(void *pData){
#if 0 #if 0
snprintf(cmd, CMDLEN, "AT %d; MO%c", self->motOffDelay, self->axisLabel); snprintf(cmd, CMDLEN, "AT %d; MO%c", self->motOffDelay, self->axisLabel);
#else #else
NetWatchRegisterTimer(&self->motor_timer, NetWatchRegisterTimer(&self->motoff_timer,
self->motOffDelay, self->motOffDelay,
motor_timeout, self); motoff_timeout, self);
return HWIdle; return HWIdle;
#endif #endif
} else { } else {