Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -ra0aca1a4d87df989303b4f7f41208a4916861afa -r1bbf9da32e622975efed00b1a7589387a9829440 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision a0aca1a4d87df989303b4f7f41208a4916861afa) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 1bbf9da32e622975efed00b1a7589387a9829440) @@ -31,11 +31,11 @@ // ********** private data ********** -static volatile BOOL modeRequest[NUM_OF_MODES - 1]; +static volatile BOOL modeRequest[ NUM_OF_MODES - 1 ]; static OP_MODE currentMode = MODE_INIT; // this matrix determines legal transitions from one mode to another -static const OP_MODE MODE_TRANSITION_TABLE[NUM_OF_MODES - 1][NUM_OF_MODES - 1] = { +static const OP_MODE MODE_TRANSITION_TABLE[ NUM_OF_MODES - 1 ][ NUM_OF_MODES - 1 ] = { // from to-> FAULT SERVICE INIT STANBY PRESCRIP. OP.PARAMS PRE-TREAT TREATMENT POST_TREA /* FAUL */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, }, @@ -77,7 +77,7 @@ // initialize mode requests to none pending for ( i = 0; i < ( NUM_OF_MODES - 1 ); i++ ) { - modeRequest[i] = FALSE; + modeRequest[ i ] = FALSE; } // start in init mode @@ -111,7 +111,7 @@ // any new mode requests? newMode = arbitrateModeRequest(); // will return current mode if no pending requests - newMode = MODE_TRANSITION_TABLE[currentMode][newMode]; + newMode = MODE_TRANSITION_TABLE[ currentMode ][ newMode ]; // is requested new mode valid and legal at this time? if ( newMode >= MODE_NLEG ) @@ -189,7 +189,7 @@ if ( newMode < MODE_NLEG ) { // make request - modeRequest[newMode] = TRUE; + modeRequest[ newMode ] = TRUE; } else { // invalid mode requested @@ -226,12 +226,12 @@ U32 i; // block additional requests until after mode arbitration - // TODO - disable priority task + _disable_IRQ(); // select highest priority mode request -or- current mode if no requests pending for ( i = 0; i < MODE_NLEG; i++ ) { - if ( modeRequest[i] != FALSE ) + if ( modeRequest[ i ] != FALSE ) { reqMode = (OP_MODE)i; break; @@ -241,11 +241,11 @@ // clear all requests now that an arbitration winner is selected for ( i = 0; i < MODE_NLEG; i++ ) { - modeRequest[i] = FALSE; + modeRequest[ i ] = FALSE; } // un-block requests - // TODO - enable priority task + _enable_IRQ(); return reqMode; }