Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -68,7 +68,7 @@ initFaultMode(); setCurrentSubState( NO_SUB_STATE ); // Publish POST failure status to UI if fault triggered in Init/POST mode - if ( DG_MODE_INIT == getPreviousOperationMode() ) + if ( DD_MODE_INIT == getPreviousOperationMode() ) { // Broadcast final POST failed //sendPOSTFinalResult( FALSE ); @@ -115,7 +115,7 @@ // Do nothing unless the test configuration to recover treatment is enabled if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) ) && ( TRUE == hasRecoverFromFaultModeBeenSet() ) ) { - DG_OP_MODE_T prevMode = getPreviousOperationMode(); + DD_OP_MODE_T prevMode = getPreviousOperationMode(); requestNewOperationMode( prevMode ); } Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -273,7 +273,7 @@ // Request whether we are in the RO only mode from UI //requestROOnlyModeStatusFromUI(); // Go to standby mode - requestNewOperationMode( DG_MODE_STAN ); + requestNewOperationMode( DD_MODE_STAN ); break; case DG_POST_STATE_FAILED: @@ -366,7 +366,7 @@ SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_STARTUP, resetReason, systemREG1->GBLSTAT ) // log startup event w/ reset reason(s) bits // Send the first submode change event. It is the mode Init and it does not start from a previous // mode previous and current are both published as Init - SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, DG_MODE_INIT, DG_MODE_INIT ) + SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, DD_MODE_INIT, DD_MODE_INIT ) state = DG_POST_STATE_FW_COMPATIBILITY; startPOSTDelayCounter = 0; } Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -249,7 +249,7 @@ // go to standby solo mode if HD is turned off or stops communicating. if ( FALSE == isTDCommunicating() ) { // TODO if HD comm loss, should we wait an hour or so before going to solo standby? - requestNewOperationMode( DG_MODE_SOLO ); + //requestNewOperationMode( DG_MODE_SOLO ); } // if HD requests water sample, go to water sample state // else if ( TRUE == flushFilterRequest ) @@ -273,7 +273,7 @@ // else if ( TRUE == pendingStartDGHeatDisinfectRequest ) // { // pendingStartDGHeatDisinfectRequest = FALSE; -// requestNewOperationMode( DG_MODE_HEAT ); +// requestNewOperationMode( DD_MODE_HEAT ); // } // else if ( TRUE == pendingStartDGChemicalDisinfectRequest ) // { @@ -284,7 +284,7 @@ // { // pendingStartDGHeatDisinfectActiveCoolRequest = FALSE; // -// requestNewOperationMode( DG_MODE_HCOL ); +// requestNewOperationMode( DD_MODE_HCOL ); // } // else if ( TRUE == pendingStartDGChemicalDisinfectFlushRequest ) // { @@ -294,7 +294,7 @@ // else if ( TRUE == pendingStartDGROPermeateSampleRequest ) // { // pendingStartDGROPermeateSampleRequest = FALSE; -// requestNewOperationMode( DG_MODE_ROPS ); +// requestNewOperationMode( DD_MODE_ROPS ); // } return state; @@ -435,7 +435,7 @@ // switch ( sampleWaterCmd ) // { // case SAMPLE_WATER_CMD_STOP: -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) ) // { // stopSampleWaterRequest = TRUE; // cmdResponse.rejected = FALSE; @@ -444,7 +444,7 @@ // break; // // case SAMPLE_WATER_CMD_START: -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) ) // { // startSampleWaterRequest = TRUE; // cmdResponse.rejected = FALSE; @@ -453,7 +453,7 @@ // break; // // case SAMPLE_WATER_CMD_FLUSH: -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { // flushFilterRequest = TRUE; // cmdResponse.rejected = FALSE; @@ -462,7 +462,7 @@ // break; // // case SAMPLE_WATER_CMD_END: -// if ( DG_MODE_STAN == getCurrentOperationMode() ) +// if ( DD_MODE_STAN == getCurrentOperationMode() ) // { // endSampleWaterRequest = TRUE; // cmdResponse.rejected = FALSE; @@ -513,7 +513,7 @@ { BOOL result = FALSE; - if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DG_STANDBY_MODE_STATE_IDLE ) ) + if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DG_STANDBY_MODE_STATE_IDLE ) ) { result = TRUE; initStandbyMode(); @@ -536,7 +536,7 @@ BOOL result = FALSE; // // If DG is in standby mode or in the solo mode and the standby mode is in Idle state, request DG flush -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) // { // DG_CMD_RESPONSE_T cmdResponse; // DG_USAGE_INFO_RECORD_T usageInfo; @@ -596,7 +596,7 @@ BOOL status = FALSE; // // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect -// if ( ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) +// if ( ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) // { // DG_CMD_RESPONSE_T cmdResponse; // DG_USAGE_INFO_RECORD_T usageInfo; @@ -657,7 +657,7 @@ BOOL status = FALSE; // // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) // { // DG_CMD_RESPONSE_T cmdResponse; // DG_USAGE_INFO_RECORD_T usageInfo; @@ -718,7 +718,7 @@ // // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect // // Chemical disinfect cannot be run in solo mode because the user has to confirm that the acid is inserted or removed -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { // DG_CMD_RESPONSE_T cmdResponse; // @@ -770,7 +770,7 @@ // // // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect flush // // Chemical disinfect flush cannot be run in solo mode because the user has to confirm that the acid is inserted or removed -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); @@ -823,7 +823,7 @@ // cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; // // // If DG is in standby mode and the standby mode is in Idle, request RO permeate sample -// if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { // DG_USAGE_INFO_RECORD_T usageInfo; // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -51,39 +51,39 @@ // ********** private data ********** -static volatile BOOL modeRequest[ NUM_OF_DG_MODES - 1 ]; ///< Array of mode request flags. -static DG_OP_MODE_T lastMode; ///< Last operation mode prior to current mode. -static DG_OP_MODE_T currentMode; ///< The currently active mode. +static volatile BOOL modeRequest[ NUM_OF_DD_MODES - 1 ]; ///< Array of mode request flags. +static DD_OP_MODE_T lastMode; ///< Last operation mode prior to current mode. +static DD_OP_MODE_T currentMode; ///< The currently active mode. static U32 currentSubMode; ///< The currently active state of the active mode. /// DG operation mode data publish interval. static OVERRIDE_U32_T dgOpModePublishInterval = { BROADCAST_DG_OP_MODE_INTERVAL, BROADCAST_DG_OP_MODE_INTERVAL, 0, 0 }; static U32 dataPublishCounter; ///< Interval counter used to determine when to broadcast operation mode. Initialize to 11 to stagger broadcast. static U32 currentSubState; ///< The currently active sub state. /// This matrix determines legal transitions from one mode to another. -static const DG_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_DG_MODES - 1 ][ NUM_OF_DG_MODES - 1 ] = +static const DD_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_DD_MODES - 1 ][ NUM_OF_DD_MODES - 1 ] = { // from to-> FAULT SERVICE INIT STANBY STBY-SOLO GEN-IDLE FILL DRAIN FLUSH HEAT DIS CHEM DIS CHEM_FLUSH HEAT_COOL RO_PER_SAMPLE - /* 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, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, - /* SERV */{ DG_MODE_NLEG, 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, 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, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, - /* STAN */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_INIT, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM, DG_MODE_CHFL, DG_MODE_HCOL, DG_MODE_ROPS }, - /* SOLO */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_INIT, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_HCOL, DG_MODE_ROPS }, - /* GENE */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, 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_GENE, DG_MODE_FILL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, 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_GENE, DG_MODE_NLEG, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, 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, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG }, - /* HEAT */{ 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_NLEG, DG_MODE_HEAT, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_HCOL, 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, DG_MODE_CHFL, DG_MODE_NLEG, DG_MODE_NLEG }, - /* CHFL */{ 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_NLEG, DG_MODE_CHFL, DG_MODE_NLEG, DG_MODE_NLEG }, - /* HCOL */{ 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_NLEG, DG_MODE_NLEG, DG_MODE_HCOL, DG_MODE_NLEG }, - /* ROPS */{ 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_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_ROPS }, + /* FAUL */{ DD_MODE_FAUL, DD_MODE_SERV, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* SERV */{ DD_MODE_NLEG, DD_MODE_SERV, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* INIT *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_INIT, DD_MODE_STAN, DG_MODE_SOLO, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* STAN *///{ DD_MODE_FAUL, DD_MODE_SERV, DD_MODE_INIT, DD_MODE_STAN, DG_MODE_SOLO, DG_MODE_GENE, DD_MODE_NLEG, DD_MODE_NLEG, DG_MODE_FLUS, DD_MODE_HEAT, DG_MODE_CHEM, DG_MODE_CHFL, DD_MODE_HCOL, DD_MODE_ROPS }, + /* SOLO *///{ DD_MODE_FAUL, DD_MODE_SERV, DD_MODE_INIT, DD_MODE_STAN, DG_MODE_SOLO, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DG_MODE_FLUS, DD_MODE_HEAT, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_HCOL, DD_MODE_ROPS }, + /* GENE *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_DRAI, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* FILL *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* DRAI *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DG_MODE_GENE, DD_MODE_NLEG, DG_MODE_DRAI, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* FLUS *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DG_MODE_SOLO, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DG_MODE_FLUS, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG }, + /* HEAT *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DG_MODE_SOLO, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_HEAT, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_HCOL, DD_MODE_NLEG }, + /* CHEM *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DG_MODE_CHEM, DG_MODE_CHFL, DD_MODE_NLEG, DD_MODE_NLEG }, + /* CHFL *///{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DG_MODE_CHFL, DD_MODE_NLEG, DD_MODE_NLEG }, + /* HCOL */{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_HCOL, DD_MODE_NLEG }, + /* ROPS */{ DD_MODE_FAUL, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_STAN, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_NLEG, DD_MODE_ROPS }, }; // ********** private function prototypes ********** -static DG_OP_MODE_T arbitrateModeRequest( void ); -static void transitionToNewOperationMode( DG_OP_MODE_T newMode ); +static DD_OP_MODE_T arbitrateModeRequest( void ); +static void transitionToNewOperationMode( DD_OP_MODE_T newMode ); static U32 getDGOpModePublishInterval( void ); static void broadcastOperationMode( void ); static void sendOperationStatusEvent( void ); @@ -101,19 +101,19 @@ U32 i; // initialize mode requests to none pending - for ( i = 0; i < ( NUM_OF_DG_MODES - 1 ); i++ ) + for ( i = 0; i < ( NUM_OF_DD_MODES - 1 ); i++ ) { modeRequest[ i ] = FALSE; } // start in init mode - lastMode = DG_MODE_INIT; - currentMode = DG_MODE_INIT; + lastMode = DD_MODE_INIT; + currentMode = DD_MODE_INIT; currentSubMode = 0; currentSubState = NO_SUB_STATE; dataPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT; - transitionToNewOperationMode( DG_MODE_INIT ); + transitionToNewOperationMode( DD_MODE_INIT ); // call initializers for the individual modes initFaultMode(); @@ -141,7 +141,7 @@ *************************************************************************/ void execOperationModes( void ) { - DG_OP_MODE_T newMode; + DD_OP_MODE_T newMode; U32 priorSubMode = currentSubMode; U32 priorSubState = currentSubState; @@ -155,7 +155,7 @@ } // is requested new mode valid and legal at this time? - if ( newMode >= DG_MODE_NLEG ) + if ( newMode >= DD_MODE_NLEG ) { //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, (U32)newMode ) newMode = currentMode; @@ -177,19 +177,19 @@ // mode specific processing to be done continuously switch ( currentMode ) { - case DG_MODE_FAUL: + case DD_MODE_FAUL: currentSubMode = execFaultMode(); break; -// case DG_MODE_SERV: +// case DD_MODE_SERV: // currentSubMode = execServiceMode(); // break; - case DG_MODE_INIT: + case DD_MODE_INIT: currentSubMode = execInitAndPOSTMode(); break; // -// case DG_MODE_STAN: +// case DD_MODE_STAN: // currentSubMode = execStandbyMode(); // break; // @@ -213,29 +213,29 @@ // currentSubMode = execFlushMode(); // break; // -// case DG_MODE_HEAT: +// case DD_MODE_HEAT: // currentSubMode = execHeatDisinfectMode(); // break; // // case DG_MODE_CHEM: // currentSubMode = execChemicalDisinfectMode(); // break; // -// case DG_MODE_HCOL: +// case DD_MODE_HCOL: // currentSubMode = execHeatDisinfectActiveCoolMode(); // break; // // case DG_MODE_CHFL: // currentSubMode = execChemicalDisinfectFlushMode(); // break; // -// case DG_MODE_ROPS: +// case DD_MODE_ROPS: // currentSubMode = execROPermeateSampleMode(); // break; default: //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, (U32)currentMode ) - currentMode = DG_MODE_FAUL; + currentMode = DD_MODE_FAUL; currentSubMode = 0; break; } @@ -262,10 +262,10 @@ * @param newMode requested mode * @return none *************************************************************************/ -void requestNewOperationMode( DG_OP_MODE_T newMode ) +void requestNewOperationMode( DD_OP_MODE_T newMode ) { // validate requested mode - if ( newMode < DG_MODE_NLEG ) + if ( newMode < DD_MODE_NLEG ) { // make request modeRequest[ newMode ] = TRUE; @@ -283,7 +283,7 @@ * @details Outputs: none * @return current mode *************************************************************************/ -DG_OP_MODE_T getCurrentOperationMode( void ) +DD_OP_MODE_T getCurrentOperationMode( void ) { return currentMode; } @@ -295,7 +295,7 @@ * @details Outputs: none * @return the previous operation mode *************************************************************************/ -DG_OP_MODE_T getPreviousOperationMode( void ) +DD_OP_MODE_T getPreviousOperationMode( void ) { return lastMode; } @@ -320,26 +320,26 @@ * @details Outputs: Arbitrated mode requests * @return highest priority requested mode *************************************************************************/ -static DG_OP_MODE_T arbitrateModeRequest( void ) +static DD_OP_MODE_T arbitrateModeRequest( void ) { - DG_OP_MODE_T reqMode = currentMode; + DD_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 < DG_MODE_NLEG; i++ ) + for ( i = 0; i < DD_MODE_NLEG; i++ ) { if ( modeRequest[i] != FALSE ) { - reqMode = (DG_OP_MODE_T)i; + reqMode = (DD_OP_MODE_T)i; break; } } // clear all requests now that an arbitration winner is selected - for ( i = 0; i < DG_MODE_NLEG; i++ ) + for ( i = 0; i < DD_MODE_NLEG; i++ ) { modeRequest[i] = FALSE; } @@ -359,7 +359,7 @@ * @param newMode new op mode to transition to * @return none *************************************************************************/ -static void transitionToNewOperationMode( DG_OP_MODE_T newMode ) +static void transitionToNewOperationMode( DD_OP_MODE_T newMode ) { U32 priorSubMode = currentSubMode; @@ -368,16 +368,16 @@ // setup for new operating mode switch ( newMode ) { - case DG_MODE_FAUL: + case DD_MODE_FAUL: currentSubMode = transitionToFaultMode(); break; -// case DG_MODE_SERV: +// case DD_MODE_SERV: // currentSubMode = transitionToServiceMode(); // break; - case DG_MODE_INIT: + case DD_MODE_INIT: currentSubMode = transitionToInitAndPOSTMode(); break; -// case DG_MODE_STAN: +// case DD_MODE_STAN: // currentSubMode = transitionToStandbyMode(); // break; // case DG_MODE_SOLO: @@ -395,19 +395,19 @@ // case DG_MODE_FLUS: // currentSubMode = transitionToFlushMode(); // break; -// case DG_MODE_HEAT: +// case DD_MODE_HEAT: // currentSubMode = transitionToHeatDisinfectMode(); // break; // case DG_MODE_CHEM: // currentSubMode = transitionToChemicalDisinfectMode(); // break; -// case DG_MODE_HCOL: +// case DD_MODE_HCOL: // currentSubMode = transitionToHeatDisinfectActiveCoolMode(); // break; // case DG_MODE_CHFL: // currentSubMode = transitionToChemicalDisinfectFlushMode(); // break; -// case DG_MODE_ROPS: +// case DD_MODE_ROPS: // currentSubMode = transitionToROPermeateSampleMode(); // break; default: @@ -439,7 +439,7 @@ data.currentMode = (U32)currentMode; data.currentSubMode = currentSubMode; - broadcastData( MSG_ID_DG_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( OP_MODES_DATA_T ) ); + broadcastData( MSG_ID_DD_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( OP_MODES_DATA_T ) ); dataPublishCounter = 0; } @@ -518,13 +518,13 @@ * @param newMode ID of requested mode to transition to * @return TRUE if request successful, FALSE if not *************************************************************************/ -BOOL testSetOperationMode( DG_OP_MODE_T newMode ) +BOOL testSetOperationMode( DD_OP_MODE_T newMode ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { - DG_OP_MODE_T check = MODE_TRANSITION_TABLE[ currentMode ][ newMode ]; + DD_OP_MODE_T check = MODE_TRANSITION_TABLE[ currentMode ][ newMode ]; // Is mode transition legal? if ( check == newMode ) Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -44,13 +44,13 @@ void initOperationModes( void ); // initialize this module void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) -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 -DG_OP_MODE_T getPreviousOperationMode( void ); // get the previous operation mode +void requestNewOperationMode( DD_OP_MODE_T newMode ); // request a transition to a new operation mode +DD_OP_MODE_T getCurrentOperationMode( void ); // get the current operation mode +DD_OP_MODE_T getPreviousOperationMode( void ); // get the previous operation mode U32 getCurrentOperationSubMode( void ); // get current operation sub mode void setCurrentSubState( U32 subState ); // Set the current substate. -BOOL testSetOperationMode( DG_OP_MODE_T newMode ); // Force transition to a given mode (if allowed) +BOOL testSetOperationMode( DD_OP_MODE_T newMode ); // Force transition to a given mode (if allowed) BOOL testSetDGOpModePublishIntervalOverride( U32 value ); BOOL testResetDGOpModePublishIntervalOverride( void ); Index: firmware/App/Services/AlarmMgmtDD.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -15,8 +15,6 @@ * ***************************************************************************/ - -#include "SystemCommDD.h" #include "AlarmMgmtDD.h" //#include "CPLD.h" #include "OperationModes.h" @@ -27,6 +25,7 @@ #include "Timers.h" #include "Messaging.h" #include "TDDefs.h" +#include "SystemCommDD.h" /** * @addtogroup AlarmManagement @@ -128,7 +127,7 @@ if ( TRUE == isTransitionToFaultRequired() ) { // If alarm is a DG fault and the alarm manager can transition to fault immediately, go to fault mode - requestNewOperationMode( DG_MODE_FAUL ); + requestNewOperationMode( DD_MODE_FAUL ); } } } @@ -335,12 +334,12 @@ BOOL status = FALSE; // Check all the inlet water conditions - status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH ); - status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW ); - status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH ); - status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW ); - status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH ); - status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW ); +// status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH ); +// status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW ); +// status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH ); +// status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW ); +// status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH ); +// status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW ); return status; } @@ -356,17 +355,17 @@ static BOOL isTransitionToFaultRequired( void ) { BOOL status = TRUE; - DG_OP_MODE_T opMode = getCurrentOperationMode(); + DD_OP_MODE_T opMode = getCurrentOperationMode(); switch( opMode ) { - case DG_MODE_FLUS: - case DG_MODE_HEAT: - case DG_MODE_CHEM: - case DG_MODE_SERV: - case DG_MODE_CHFL: - case DG_MODE_HCOL: - case DG_MODE_ROPS: + //case DG_MODE_FLUS: + case DD_MODE_HEAT: + //case DG_MODE_CHEM: + case DD_MODE_SERV: + //case DG_MODE_CHFL: + case DD_MODE_HCOL: + case DD_MODE_ROPS: status = FALSE; break; Index: firmware/App/Services/AlarmMgmtDD.h =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/AlarmMgmtDD.h (.../AlarmMgmtDD.h) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/AlarmMgmtDD.h (.../AlarmMgmtDD.h) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -19,7 +19,7 @@ #ifndef __ALARM_MGMT_DD_H__ #define __ALARM_MGMT_DD_H__ -#include "DDCommon.h" +//#include "DDCommon.h" /** * @defgroup AlarmManagement AlarmManagement @@ -31,8 +31,10 @@ */ // ********** public definitions ********** -#include "AlarmDefs.h" + //#include "AlarmMgmt.h" +#include "DDCommon.h" +#include "AlarmDefs.h" #include "AlarmMgmtSWFaults.h" /// Safety shutdown activation status Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -28,7 +28,75 @@ /// Listing of specific software faults for logging purposes. typedef enum { - SW_FAULT_ID_NONE = 0, + SW_FAULT_ID_NONE = 0, + SW_FAULT_ID_ALARM_LAMP_INVALID_PATTERN_REQUESTED = 1, + SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE = 2, + SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE = 3, + SW_FAULT_ID_MODE_STANDBY_INVALID_STATE = 4, + SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED = 5, + SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE = 6, + SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED = 7, + SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION = 8, + SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO = 9, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE1 = 10, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE2 = 11, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR1 = 12, + SW_FAULT_ID_ALARM_MGMT_INVALID_USER_ACTION = 13, + SW_FAULT_ID_INVALID_ALARM_USER_ACTION1 = 14, + SW_FAULT_ID_INVALID_ALARM_USER_ACTION2 = 15, + SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE = 16, + SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE = 17, + SW_FAULT_ID_ALARM_MGMT_INVALID_FIFO_TO_RESET = 18, + SW_FAULT_ID_HD_INVALID_ALARM_AUDIO_STATE = 19, + SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA = 20, + SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER = 21, + SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER = 22, + SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER = 23, + SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER = 24, + SW_FAULT_ID_INVALID_DD_OPERATING_MODE = 25, + SW_FAULT_ID_DD_INVALID_COMMAND_RESPONSE_ID = 26, + SW_FAULT_ID_FPGA_INVALID_ALARM_AUDIO_PARAM = 27, + SW_FAULT_ID_PHANTOM_INTERRUPT = 28, + SW_FAULT_ID_INVALID_RTI_NOTIFICATION = 29, + SW_FAULT_ID_CAN_PARITY_ERROR = 30, + SW_FAULT_ID_CAN_OFF_ERROR = 31, + SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT = 32, + SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED = 33, + SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL = 34, + SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL = 35, + SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE = 36, + SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE = 37, + SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE = 38, + SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE = 39, + SW_FAULT_ID_ILLEGAL_MEM_ACCESS = 40, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3 = 41, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2 = 42, + SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1 = 43, + SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2 = 44, + SW_FAULT_ID_FPGA_INVALID_IN_STATE = 45, + SW_FAULT_ID_FPGA_INVALID_OUT_STATE = 46, + SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA = 47, + SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA = 48, + SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA = 49, + SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA = 50, + SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1 = 51, + SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2 = 52, + SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3 = 53, + SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1 = 54, + SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2 = 55, + SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3 = 56, + SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX = 57, + SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED = 58, + SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE = 59, + SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED1 = 60, + SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED2 = 61, + SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT = 62, + SW_FAULT_ID_UTIL_INVALID_WIN_COUNT = 63, + SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR = 64, + SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT = 65, + SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE = 66, + SW_FAULT_ID_WATCHDOG_INVALID_TASK = 67, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_FOR_START_TIME = 68, NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/FPGADD.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/FPGADD.c (.../FPGADD.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/FPGADD.c (.../FPGADD.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -355,13 +355,13 @@ else { result = SELF_TEST_STATUS_FAILED; - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)DG_FPGA_COMPATIBILITY_REV, (U32)fpgaSensorReadings.fpgaCompatibilityRev ) + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)DG_FPGA_COMPATIBILITY_REV, (U32)fpgaSensorReadings.fpgaCompatibilityRev ) } } else { result = SELF_TEST_STATUS_FAILED; - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId ) + //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId ) } return result; @@ -392,13 +392,13 @@ U32 const diffFPGATimerCount = (U32)u16DiffWithWrap( currentFPGATimerCount_ms, newFPGATimerCount_ms ); U32 const diffTimerCount = u32DiffWithWrap( currentTimerCount_ms, newTimerCount_ms ); - if ( getCurrentOperationMode() != DG_MODE_INIT ) + if ( getCurrentOperationMode() != DD_MODE_INIT ) { if ( abs( diffFPGATimerCount - diffTimerCount ) > PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE ) { if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount ); + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount ); } } } @@ -1632,12 +1632,12 @@ * @details Outputs: none * @return status of the hardware configuration *************************************************************************/ -HARDWARE_CONFIG_T getHardwareConfigStatus( void ) -{ - HARDWARE_CONFIG_T configValue = (HARDWARE_CONFIG_T)fpgaSensorReadings.fpgaHWConfigReg; - - return configValue; -} +//HARDWARE_CONFIG_T getHardwareConfigStatus( void ) +//{ +// HARDWARE_CONFIG_T configValue = (HARDWARE_CONFIG_T)fpgaSensorReadings.fpgaHWConfigReg; +// +// return configValue; +//} #endif /*********************************************************************//** @@ -2039,7 +2039,7 @@ { if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.fpgaIOErrorCntProcessor ) + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.fpgaIOErrorCntProcessor ) } } } @@ -2065,7 +2065,7 @@ { if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.fpgaIOErrorCntProcessor ) + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.fpgaIOErrorCntProcessor ) status = TRUE; } } Index: firmware/App/Services/FPGADD.h =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/FPGADD.h (.../FPGADD.h) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/FPGADD.h (.../FPGADD.h) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -148,9 +148,9 @@ U16 getFPGAInternalVccAuxiliaryVoltage( void ); U16 getFPGAVPVNVoltage( void ); -#ifndef _RELEASE_ -HARDWARE_CONFIG_T getHardwareConfigStatus( void ); -#endif +//#ifndef _RELEASE_ +//HARDWARE_CONFIG_T getHardwareConfigStatus( void ); +//#endif //***************** DVT Functions ***************************/ Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -256,7 +256,7 @@ // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_DG_EVENT; + msg.hdr.msgID = MSG_ID_DD_EVENT; msg.hdr.payloadLen = sizeof( EVENT_PAYLOAD_T ); memcpy( &msg.payload, &eventStruct, sizeof( EVENT_PAYLOAD_T ) ); Index: firmware/App/Services/MsgQueues.h =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -18,7 +18,8 @@ #ifndef __MSG_QUEUES_H__ #define __MSG_QUEUES_H__ -#include "DDCommon.h" +#include "DDCommon.h" +#include "CommBuffers.h" /** * @defgroup MsgQueues MsgQueues @@ -52,6 +53,7 @@ /// Message struct. typedef struct { + COMM_BUFFER_T in_buffer; ///< Message received into this channel buffer MESSAGE_HEADER_T hdr; ///< Message header U08 payload[ MAX_MSG_PAYLOAD_SIZE ]; ///< Message payload } MESSAGE_T; Index: firmware/App/Services/SystemCommDD.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Services/SystemCommDD.c (.../SystemCommDD.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Services/SystemCommDD.c (.../SystemCommDD.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -233,584 +233,8 @@ *************************************************************************/ void processReceivedMessage( MESSAGE_T *message ) { - U16 msgID = message->hdr.msgID; - - // handle any messages from other sub-systems - switch ( msgID ) - { - /*case MSG_ID_POWER_OFF_WARNING: - handlePowerOffWarning( message ); - break; - - case MSG_ID_ALARM_CLEARED: - handleAlarmClear( message ); - break; - - case MSG_ID_RTC_EPOCH_DATA: - handleRTCSyncFromHD( message ); - break; - - case MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS: - handleSetDialysateTemperatureCmd( message ); - break; - - case MSG_ID_FW_VERSIONS_REQUEST: - handleFWVersionCmd( message ); - handleDGSerialNumberRequest(); - break; - - case MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST: - handleSwitchReservoirCmd( message ); - break; - - case MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST: - handleChangeValveSettingCmd( message ); - break; - - case MSG_ID_DG_FILL_CMD_REQUEST: - handleFillCmd( message ); - break; - - case MSG_ID_DG_DRAIN_CMD_REQUEST: - handleDrainCmd( message ); - break; - - case MSG_ID_HD_OP_MODE_DATA: - handleSetHDOperationMode( message ); - break; - - case MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST: - handleStartStopTreatmentMsg( message ); - break; - - case MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST: - handleSampleWaterCmd( message ); - break; - - case MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST: - handleHDStartStopTrimmerHeaterCmd( message ); - break; - - case MSG_ID_DG_PARK_CONCENTRATE_PUMPS_CMD_REQUEST: - handleParkConecentratePumpsCmd( message ); - break; - - case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD: - handleDGStartStopTrimmerHeater( message ); - break; - - case MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST: - handleStartStopDGFlush( message ); - break; - - case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST: - handleStartStopDGHeatDisinfect( message ); - break; - - case MSG_ID_DG_START_STOP_CHEM_DISINFECT: - handleStartStopDGChemicalDisinfect( message ); - break; - - case MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH: - handleStartStopDGChemicalDisinfectFlush( message ); - break; - - case MSG_ID_UI_DG_SET_RTC_REQUEST: - handleUIClockSyncRequest( message ); - break; - - case MSG_ID_HD_DG_POST_RESULT_REQUEST: - handleDGPOSTResultRequest( message ); - break; - - case MSG_ID_UI_SERVICE_INFO_REQUEST: - handleDGServiceScheduleRequestToUI( message ); - break; - - case MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST: - handleDGSendConcentrateMixingRatios( message ); - break; - - case MSG_ID_HD_DG_SERVICE_MODE_REQUEST: - handleServiceModeRequest( message ); - break; - - case MSG_ID_HD_DG_USAGE_INFO_REQUEST: - handleHDRequestDGUsageInfo( message ); - break; - - case MSG_ID_DG_SET_SERVICE_TIME_REQUEST: - handleSetDGServiceTime( message ); - break; - - case MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL: - handleStartStopDGHeatDisinfectActiveCool( message ); - break; - - case MSG_ID_HD_DG_ALARMS_REQUEST: - handleResendAllAlarmsCommand( message ); - break; - - case MSG_ID_UI_SET_DG_RO_MODE: - handleSetROOnlyMode( message ); - break; - - case MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG: - handleReceiveChemFlushSampleResultsFromHD( message ); - break; - - case MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST: - handleStartStopDGROPermeateSample( message ); - break; - - case MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG: - handleReceiveROPermeatSampleDispenseRequest( message ); - break; - - case MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD: - handleSendDGServiceRecordToHD( message ); - break;*/ - - // NOTE: This case must be last - case MSG_ID_DG_TESTER_LOGIN_REQUEST: - handleTesterLogInRequest( message ); - break; - - default: - // unrecognized message ID received - ok, ignore - may be a test message handled below - break; - } - - // handle any test messages if tester has logged in successfully - if ( ( msgID > MSG_ID_FIRST_DG_TESTER_MESSAGE ) && ( TRUE == isTestingActivated() ) ) - { - switch ( msgID ) - { - /*case MSG_ID_DG_ALARM_STATE_OVERRIDE: - handleTestAlarmStateOverrideRequest( message ); - break; - - case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE: - handleTestWatchdogCheckInStateOverrideRequest( message ); - break; - - case MSG_ID_DG_SET_RTC_DATE_TIME: - handleSetRTCTimestamp( message ); - break; - - case MSG_ID_START_STOP_PRIMARY_HEATER: - handleStartStopPrimaryHeater ( message ); - break; - - case MSG_ID_LOAD_CELL_OVERRIDE: - handleTestLoadCellOverrideRequest( message ); - break; - - case MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE: - handleTestLoadCellDataBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_PRESSURE_OVERRIDE: - handleTestPressureSensorOverrideRequest( message ); - break; - - case MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE: - handleTestPressureDataBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE: - handleTestMeasuredFlowOverrideRequest( message ); - break; - - case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE: - handleTestROPumpDataBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE: - handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_DRAIN_PUMP_SET_RPM: - handleTestSetDrainPumpRPM( message ); - break; - - case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE: - handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_VALVE_STATE_OVERRIDE: - handleTestValveStateOverrideRequest( message ); - break; - - case MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE: - handleTestValvesStatesPublishIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE: - handleTestDGSafetyShutdownOverrideRequest( message ); - break; - - case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE: - handleTestTemperatureSensorsOverrideRequest( message ); - break; - - case MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE: - handleTestTemperatureSensorsDataPublishOverrideRequest( message ); - break; - - case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE: - handleTestHeatersDataPublishOverrideRequest( message ); - break; - - case MSG_ID_CONDUCTIVITY_OVERRIDE: - handleTestSetConductivityOverrideRequest( message ); - break; - - case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE: - handleTestSetConductivityDataPublishIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_ACCEL_OVERRIDE: - handleTestDGAccelOverrideRequest( message ); - break; - - case MSG_ID_DG_ACCEL_MAX_OVERRIDE: - handleTestDGAccelMaxOverrideRequest( message ); - break; - - case MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE: - handleTestDGAccelBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE: - handleTestMonitoredVoltagesSendIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE: - handleTestMonitoredVoltageOverrideRequest( message ); - break; - - case MSG_ID_DRAIN_PUMP_TARGET_OUTLET_FLOW: - handleSetDrainPumpTargetOutletFlowLPM( message ); - break; - - case MSG_ID_DG_SWITCHES_STATUS_OVERRIDE: - handleSetSwitchesStatusOverrideRequest( message ); - break; - - case MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE: - handleTestSwitchesPublishIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_SOFTWARE_RESET_REQUEST: - handleDGSoftwareResetRequest( message ); - break; - - case MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE: - handleConcentratePumpMeasuredSpeedOverride( message ); - break; - - case MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE: - handleSetConcentratePumpTargetSpeed( message ); - break; - - case MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST: - handleConcentratePumpStateChangeRequest( message ); - break; - - case MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE: - handleConcentratePumpPublishIntervalOverride( message ); - break; - - case MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE: - handleTestThermistorsDataPublishIntervalOverride( message ); - break; - - case MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE: - handleTestThermistorsValueOverride( message ); - break; - - case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE: - handleTestFansDataPublishIntervalOverride( message ); - break; - - case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE: - handleTestROPumpDutyCycleOverride( message ); - break; - - case MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE: - handleTestDGValvesSensedStateOverrideRequest( message ); - break; - - case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW: - handleTestROPumpTargetFlowOverride( message ); - break; - - case MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE: - handleROPumpTargetPressureOverride( message ); - break; - - case MSG_ID_DG_START_STOP_UV_REACTORS: - handleStartStopUVReactors( message ); - break; - - case MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE: - handleTestUVReactorsDataPublishIntervalOverride( message ); - break; - - case MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE: - handleTestUVReactorsHealthOverride( message ); - break; - - case MSG_ID_DG_SET_CALIBRATION_RECORD: - handleSetDGCalibrationRecord( message ); - break; - - case MSG_ID_DG_GET_CALIBRATION_RECORD: - handleGetDGCalibrationRecord( message ); - break; - - case MSG_ID_DG_SET_SYSTEM_RECORD: - handleSetDGSystemRecord( message ); - break; - - case MSG_ID_DG_GET_SYSTEM_RECORD: - handleGetDGSystemRecord( message ); - break; - - case MSG_ID_DG_GET_SERVICE_RECORD: - handleGetDGServiceRecord( message ); - break; - - case MSG_ID_DG_SET_SERVICE_RECORD: - handleSetDGServiceRecord( message ); - break; - - case MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE: - handleSetFluidLeakBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE: - handleSetFluidLeakStateDetectorOverrideRequest( message ); - break; - - case MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE: - handleSetDGOpModeBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE: - handleFilterFlushTimePeriodOverride( message ); - break; - - case MSG_ID_DG_FANS_RPM_OVERRIDE: - handleFansRPMOverride( message ); - break; - - case MSG_ID_DG_STOP_RTC_CLOCK: - handleStopDGRTCClock( message ); - break; - - case MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE: - handleSetDrainPumpMeasuredRPMOverrideRequest( message ); - break; - - case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION: - handleTestBlockMessagesRequest( message ); - break; - - case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD: - handleTestSuperClearAlarmsRequest( message ); - break; - - case MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE: - handleTestAlarmInfoSendIntervalOverrideRequest( message ); - break; - - case MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET: - handleTestFansRPMAlarmStartTimeOffsetRequest( message ); - break; - - case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE: - handleTestUsedAcidVolumeMLOverrideRequest( message ); - break; - - case MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE: - handleTestUsedBicarbVolumeMLOverrideRequest( message ); - break; - -#ifndef _RELEASE_ - case MSG_ID_DG_GET_SW_CONFIG_RECORD: - handleGetDGSoftwareConfigRecord( message ); - break; - - case MSG_ID_DG_SET_SW_CONFIG_RECORD: - handleSetDGSoftwareConfigRecord( message ); - break; -#endif - - case MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE: - handleSetFansDutyCycleOverrideRequest( message ); - break; - - case MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE: - handleTestHDCommunicationStatusOverrideRequest( message ); - break; - - case MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP: - handleSetPrimaryAndTrimmerHeatersTargetTemperature( message ); - break; - - case MSG_ID_DG_GET_USAGE_INFO_RECORD: - handleGetDGUsageInfoRecord( message ); - break; - - case MSG_ID_DG_SET_USAGE_INFO_RECORD: - handleSetDGUsageInfoRecord( message ); - break; - - case MSG_ID_DG_SET_OP_MODE_REQUEST: - handleTestSetOpModeRequest( message ); - break; - - case MSG_ID_DG_RESERVOIR_TARE_REQUEST: - handleTestTareReservoirRequest( message ); - break; - - case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE: - handleTestDrainPumpMeasuredCurrentOverride( message ); - break; - - case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE: - handleTestGenIdlePublishIntervalOverride( message ); - break; - - case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE: - handleTestDGDrainPumpDirectionOverrideRequest( message ); - break; - - case MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE: - handleTestDGConcPumpParkStatusOverrideRequest( message ); - break; - - case MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE: - handleTestDGConcPumpParkFaultStatusOverrideRequest( message ); - break; - - case MSG_ID_DG_CONC_PUMP_PARK_COMMAND: - handleTestDGConcPumpParkCommandRequest( message ); - break; - - case MSG_ID_DG_NV_RECORD_CRC_OVERRIDE: - handleTestDGNVRecordCRCOverride( message ); - break; - - case MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE: - handleTestDGROPumpFeedbackVoltageOverrideRequest( message ); - break; - - case MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE: - handleTestDGFillIntegratedVolumeOverrideRequest( message ); - break; - - case MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE: - handleTestDGFillModeBroadcastOverrideRequest( message ); - break; - - case MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE: - handleTestDGHeatersDutyCycleOverrideRequest( message ); - break; - - case MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE: - handleDGRTCControlReg1StatusOverrideRequest( message ); - break; - - case MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE: - handleDGRTCControlReg3StatusOverrideRequest( message ); - break; - -#ifndef _RELEASE_ - case MSG_ID_DG_NELSON_DISINFECT_SUPPORT: - handleTestDGNelsonDisinfectSupport( message ); - break; -#endif - - case MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS: - handleTestDGSetDialysateMixingRatios( message ); - break; - - case MSG_ID_DG_SET_TEST_CONFIGURATION: - handleTestDGSetTestConfig( message ); - break; - - case MSG_ID_DG_GET_TEST_CONFIGURATION: - handleTestDGGetTestConfig( message ); - break; - - case MSG_ID_DG_RESET_ALL_TEST_CONFIGURATIONS: - handleTestDGResetAllTestConfigs( message ); - break; - - case MSG_ID_DG_DIALIN_CHECK_IN: - handleTestDGDialinCheckIn( message ); - break; - - case MSG_ID_DG_GET_LOAD_CELLS_TARE_VALUES: - handleTestDGGetLoadCellsTareValues( message ); - break; - - case MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES: - handleTestDGSetLoadCellsTareValues( message ); - break; - - case MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE: - handleTestDGSetConductivitySensorCalTable( message ); - break; - - case MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE: - handleTestDGSetRecoverFromFaultModeSignal( message ); - break; - - case MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE: - handleTestDGDrainModeBroadcastOverrideRequest( message ); - break; - - case MSG_ID_DG_DIALIN_RO_ONLY_MODE_STATUS_REQUEST: - handleDGROStatusRequest( message ); - break; - - case MSG_ID_DG_RAM_STATUS_OVERRIDE: - handleTestDGRAMStatusOverrideRequest( message ); - break; - - case MSG_ID_DG_RESERVOIR_BROADCAST_INTERVAL_OVERRIDE: - handleTestDGReservoirOverrideRequest( message ); - break; - - case MSG_ID_DG_CAN_RECEIVE_ACK_MESSAGE_OVERRIDE: - handleTestDGPendingACKOverrideRequest( message ); - break; - - case MSG_ID_DG_STATE_TIMER_82C_OVERRIDE: - handleTestDG82CStateTimerOverride( message ); - break; - - case MSG_ID_DG_STATE_TIMER_77C_OVERRIDE: - handleTestDG77CStateTimerOverride( message ); - break; - - case MSG_ID_DG_CHEM_DISINFECT_ACID_OVERRIDE: - handleTestChemDisinfectAcidOverride( message ); - break; - - case MSG_ID_DG_RUN_MODE_FILL_FOR_CAL_CHECK: - handleTestRunModeFillForCalibrationCheck( message ); - break;*/ - - default: - // TODO - unrecognized message ID received - ignore - break; - } - } + // Handle any messages from other sub-systems + //handleIncomingMessage( message ); } Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 8b8fff67b95805272f37855346d600599aaec03d) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4) @@ -18,7 +18,7 @@ #include "gio.h" #include "lin.h" -#include "AlarmMgmt.h" +#include "Messaging.h" //#include "ConcentratePumps.h" //#include "DrainPump.h" //#include "Fans.h" @@ -30,7 +30,8 @@ //#include "ROPump.h" //#include "RTC.h" //#include "Switches.h" -#include "SystemComm.h" +#include "SystemComm.h" +#include "SystemCommDD.h" //#include "SystemCommMessages.h" #include "TaskGeneral.h" //#include "Thermistors.h"