Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -111,13 +111,13 @@ postCompleted = TRUE; // TODO - send POST status on CAN // go to standby mode - requestNewOperationMode( MODE_STAN ); + requestNewOperationMode( DG_MODE_STAN ); break; case DG_POST_STATE_FAILED: // TODO - send POST status on CAN // will want POST faults to wait for us to get here before sending us to fault mode - requestNewOperationMode( MODE_FAUL ); + requestNewOperationMode( DG_MODE_FAUL ); break; default: Index: firmware/App/Modes/ModeRecirculate.c =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Modes/ModeRecirculate.c (.../ModeRecirculate.c) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Modes/ModeRecirculate.c (.../ModeRecirculate.c) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -190,7 +190,7 @@ { BOOL result = TRUE; - requestNewOperationMode( MODE_STAN ); + requestNewOperationMode( DG_MODE_STAN ); return result; } Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -132,7 +132,7 @@ // go to standby solo mode if HD is turned off or stops communicating. if ( FALSE == isHDCommunicating() ) { // TODO if HD comm loss, should we wait an hour or so before going to solo standby? - requestNewOperationMode( MODE_SOLO ); + requestNewOperationMode( DG_MODE_SOLO ); } // if HD requests water sample, go to water sample state else if ( TRUE == pendingSampleWaterRequest ) @@ -145,7 +145,7 @@ else if ( TRUE == pendingStartDGRequest ) { pendingStartDGRequest = FALSE; - requestNewOperationMode( MODE_CIRC ); + requestNewOperationMode( DG_MODE_CIRC ); } return result; Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -43,33 +43,33 @@ // ********** private data ********** static volatile BOOL modeRequest[NUM_OF_DG_MODES - 1]; ///< Array of mode request flags. -static DG_OP_MODE currentMode = MODE_INIT; ///< The currently active mode. +static DG_OP_MODE_T currentMode = DG_MODE_INIT; ///< The currently active mode. static U32 currentSubMode = 0; ///< The currently active state of the active mode. static U32 broadcastModeIntervalCtr = 11; ///< Interval counter used to determine when to broadcase operation mode. Initialize to 11 to stagger broadcast. /// This matrix determines legal transitions from one mode to another. -static const DG_OP_MODE MODE_TRANSITION_TABLE[NUM_OF_DG_MODES - 1][NUM_OF_DG_MODES - 1] = +static const DG_OP_MODE_T MODE_TRANSITION_TABLE[NUM_OF_DG_MODES - 1][NUM_OF_DG_MODES - 1] = { -// from to-> FAULT SERVICE INIT STANBY STBY-SOLO RE-CIRC FILL DRAIN FLUSH HEAT DIS CHEM DIS - /* FAUL */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG }, - /* SERV */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG }, - /* INIT */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_SOLO, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG }, - /* STAN */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_SOLO, MODE_CIRC, MODE_NLEG, MODE_NLEG, MODE_FLUS, MODE_NLEG, MODE_CHEM }, - /* SOLO */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_SOLO, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_FLUS, MODE_HEAT, MODE_NLEG }, - /* CIRC */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_CIRC, MODE_FILL, MODE_DRAI, MODE_NLEG, MODE_NLEG, MODE_NLEG }, - /* FILL */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_CIRC, MODE_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG }, - /* DRAI */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_CIRC, MODE_NLEG, MODE_DRAI, MODE_NLEG, MODE_NLEG, MODE_NLEG }, - /* FLUS */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_SOLO, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_FLUS, MODE_NLEG, MODE_NLEG }, - /* HEAT */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_SOLO, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_HEAT, MODE_NLEG }, - /* CHEM */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_CHEM } +// from to-> FAULT SERVICE INIT STANBY STBY-SOLO RE-CIRC FILL DRAIN FLUSH HEAT DIS CHEM DIS + /* FAUL */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, + /* SERV */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, + /* INIT */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_INIT, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, + /* STAN */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_CIRC, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_NLEG, DG_MODE_CHEM }, + /* SOLO */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_NLEG }, + /* CIRC */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_CIRC, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, + /* FILL */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_CIRC, DG_MODE_FILL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, + /* DRAI */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_CIRC, DG_MODE_NLEG, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, + /* FLUS */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_NLEG, DG_MODE_NLEG }, + /* HEAT */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_HEAT, DG_MODE_NLEG }, + /* CHEM */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_CHEM } }; static U32 dgOpModePublicationTimerCounter = 0; // ********** private function prototypes ********** -static DG_OP_MODE arbitrateModeRequest( void ); -static void transitionToNewOperationMode( DG_OP_MODE newMode ); +static DG_OP_MODE_T arbitrateModeRequest( void ); +static void transitionToNewOperationMode( DG_OP_MODE_T newMode ); static void broadcastOperationMode( void ); /*********************************************************************//** @@ -92,11 +92,11 @@ // start in init mode #ifndef CAN_TEST - currentMode = MODE_INIT; + currentMode = DG_MODE_INIT; #else - currentMode = MODE_FAUL; + currentMode = DG_MODE_FAUL; #endif - transitionToNewOperationMode( MODE_INIT ); + transitionToNewOperationMode( DG_MODE_INIT ); // call initializers for the individual modes initFaultMode(); @@ -125,14 +125,14 @@ *************************************************************************/ void execOperationModes( void ) { - DG_OP_MODE newMode; + DG_OP_MODE_T newMode; // any new mode requests? newMode = arbitrateModeRequest(); // will return current mode if no pending requests newMode = MODE_TRANSITION_TABLE[currentMode][newMode]; // is requested new mode valid and legal at this time? - if ( newMode >= MODE_NLEG ) + if ( newMode >= DG_MODE_NLEG ) { // TODO - s/w fault newMode = currentMode; @@ -149,53 +149,53 @@ // mode specific processing to be done continuously switch ( currentMode ) { - case MODE_FAUL: + case DG_MODE_FAUL: currentSubMode = execFaultMode(); break; - case MODE_SERV: + case DG_MODE_SERV: currentSubMode = execServiceMode(); break; - case MODE_INIT: + case DG_MODE_INIT: currentSubMode = execInitAndPOSTMode(); break; - case MODE_STAN: + case DG_MODE_STAN: currentSubMode = execStandbyMode(); break; - case MODE_SOLO: + case DG_MODE_SOLO: currentSubMode = execSoloMode(); break; - case MODE_CIRC: + case DG_MODE_CIRC: currentSubMode = execRecirculateMode(); break; - case MODE_FILL: + case DG_MODE_FILL: currentSubMode = execFillMode(); break; - case MODE_DRAI: + case DG_MODE_DRAI: currentSubMode = execDrainMode(); break; - case MODE_FLUS: + case DG_MODE_FLUS: currentSubMode = execFlushMode(); break; - case MODE_HEAT: + case DG_MODE_HEAT: currentSubMode = execHeatDisinfectMode(); break; - case MODE_CHEM: + case DG_MODE_CHEM: currentSubMode = execChemicalDisinfectMode(); break; default: // TODO - trigger s/w fault - currentMode = MODE_FAUL; + currentMode = DG_MODE_FAUL; currentSubMode = 0; break; } // end switch @@ -215,10 +215,10 @@ * @param newMode : requested mode * @return none *************************************************************************/ -void requestNewOperationMode( DG_OP_MODE newMode ) +void requestNewOperationMode( DG_OP_MODE_T newMode ) { // validate requested mode - if ( newMode < MODE_NLEG ) + if ( newMode < DG_MODE_NLEG ) { // make request modeRequest[newMode] = TRUE; @@ -237,7 +237,7 @@ * Outputs : Initializes the Operation Modes module. * @return none *************************************************************************/ -DG_OP_MODE getCurrentOperationMode( void ) +DG_OP_MODE_T getCurrentOperationMode( void ) { return currentMode; } @@ -250,26 +250,26 @@ * Outputs : Initializes the Operation Modes module. * @return none *************************************************************************/ -static DG_OP_MODE arbitrateModeRequest( void ) +static DG_OP_MODE_T arbitrateModeRequest( void ) { - DG_OP_MODE reqMode = currentMode; + DG_OP_MODE_T reqMode = currentMode; U32 i; // block additional requests until after mode arbitration _disable_IRQ(); // select highest priority mode request -or- current mode if no requests pending - for ( i = 0; i < MODE_NLEG; i++ ) + for ( i = 0; i < DG_MODE_NLEG; i++ ) { if ( modeRequest[i] != FALSE ) { - reqMode = (DG_OP_MODE)i; + reqMode = (DG_OP_MODE_T)i; break; } } // clear all requests now that an arbitration winner is selected - for ( i = 0; i < MODE_NLEG; i++ ) + for ( i = 0; i < DG_MODE_NLEG; i++ ) { modeRequest[i] = FALSE; } @@ -289,42 +289,42 @@ * @param newMode : new op mode to transition to * @return none *************************************************************************/ -static void transitionToNewOperationMode( DG_OP_MODE newMode ) +static void transitionToNewOperationMode( DG_OP_MODE_T newMode ) { // setup for new operating mode switch ( newMode ) { - case MODE_FAUL: + case DG_MODE_FAUL: transitionToFaultMode(); break; - case MODE_SERV: + case DG_MODE_SERV: transitionToServiceMode(); break; - case MODE_INIT: + case DG_MODE_INIT: transitionToInitAndPOSTMode(); break; - case MODE_STAN: + case DG_MODE_STAN: transitionToStandbyMode(); break; - case MODE_SOLO: + case DG_MODE_SOLO: transitionToSoloMode(); break; - case MODE_CIRC: + case DG_MODE_CIRC: transitionToRecirculateMode(); break; - case MODE_FILL: + case DG_MODE_FILL: transitionToFillMode(); break; - case MODE_DRAI: + case DG_MODE_DRAI: transitionToDrainMode(); break; - case MODE_FLUS: + case DG_MODE_FLUS: transitionToFlushMode(); break; - case MODE_HEAT: + case DG_MODE_HEAT: transitionToHeatDisinfectMode(); break; - case MODE_CHEM: + case DG_MODE_CHEM: transitionToChemicalDisinfectMode(); break; default: Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -35,8 +35,8 @@ void initOperationModes( void ); // initialize this module void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) -void requestNewOperationMode( DG_OP_MODE newMode ); // request a transition to a new operation mode -DG_OP_MODE getCurrentOperationMode( void ); // get the current operation mode +void requestNewOperationMode( DG_OP_MODE_T newMode ); // request a transition to a new operation mode +DG_OP_MODE_T getCurrentOperationMode( void ); // get the current operation mode /**@}*/ Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -102,7 +102,7 @@ BOOL result = FALSE; // switch reservoir command only valid in re-circulate mode - if ( MODE_CIRC == getCurrentOperationMode() ) + if ( DG_MODE_CIRC == getCurrentOperationMode() ) { // validate parameters if ( resID < NUM_OF_RESERVOIRS ) @@ -129,14 +129,14 @@ BOOL result = FALSE; // fill command only valid in re-circulate mode - if ( ( MODE_CIRC == getCurrentOperationMode() ) && + if ( ( DG_MODE_CIRC == getCurrentOperationMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getCurrentRecirculateState() ) ) { // validate parameters if ( fillToVolMl < MAX_FILL_VOLUME_ML ) { fillVolumeTargetMl.data = fillToVolMl; - requestNewOperationMode( MODE_FILL ); + requestNewOperationMode( DG_MODE_FILL ); result = TRUE; } } @@ -157,10 +157,10 @@ BOOL result = FALSE; // stop fill command only valid in fill mode - if ( MODE_FILL == getCurrentOperationMode() ) + if ( DG_MODE_FILL == getCurrentOperationMode() ) { fillVolumeTargetMl.data = 0; - requestNewOperationMode( MODE_CIRC ); + requestNewOperationMode( DG_MODE_CIRC ); } return result; @@ -180,13 +180,13 @@ BOOL result = FALSE; // drain command only valid in re-circulate mode - if ( MODE_CIRC == getCurrentOperationMode() ) + if ( DG_MODE_CIRC == getCurrentOperationMode() ) { // validate parameters if ( ( drainToVolMl > MIN_DRAIN_VOLUME_ML ) && ( drainToVolMl < MAX_DRAIN_VOLUME_ML ) ) { drainVolumeTargetMl.data = drainToVolMl; - requestNewOperationMode( MODE_DRAI ); + requestNewOperationMode( DG_MODE_DRAI ); } } @@ -206,10 +206,10 @@ BOOL result = FALSE; // stop drain command only valid in drain mode - if ( MODE_DRAI == getCurrentOperationMode() ) + if ( DG_MODE_DRAI == getCurrentOperationMode() ) { drainVolumeTargetMl.data = 0; - requestNewOperationMode( MODE_CIRC ); + requestNewOperationMode( DG_MODE_CIRC ); } return result; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 3e7b064885d99793bb56d940bd613555b1cdbdfa) @@ -765,11 +765,11 @@ memcpy( &startingTreatment, message->payload, sizeof(U32) ); - if ( MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment ) + if ( DG_MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment ) { result = requestDGStart(); } - else if ( MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment ) + else if ( DG_MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment ) { result = requestDGStop(); } @@ -792,7 +792,7 @@ if ( message->hdr.payloadLen == 0 ) { - if ( MODE_STAN == getCurrentOperationMode() ) + if ( DG_MODE_STAN == getCurrentOperationMode() ) { result = requestWaterSample(); }