Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-05-30 10:26:57 +10:00
committed by Douglas Clowes
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions

View File

@@ -1633,6 +1633,7 @@ static void DMCState_Unknown(pDMC2280Driv self, pEvtEvent event) {
/* handle pending message event */
if (self->waitResponse) {
self->subState = 0;
/* FIXME: FIXME_DOUG */
return;
}
/* Set speed */
@@ -2376,7 +2377,7 @@ static void DMCState_Moving(pDMC2280Driv self, pEvtEvent event) {
case eCommandEvent:
switch (event->event.cmd.cmd_type) {
case CMD_RUN:
/* RUN command while running */
/* TODO: FIXME RUN command while running */
if (self->driver_status == HWIdle)
self->driver_status = HWBusy;
self->run_flag = 1;