Index: firmware/App/Controllers/BloodLeak.c =================================================================== diff -u -r9324981b9eeeb2735a379019acc8f7184023460b -r437ac340cfe0bd90bc016372113bae3d594b7526 --- firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision 9324981b9eeeb2735a379019acc8f7184023460b) +++ firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision 437ac340cfe0bd90bc016372113bae3d594b7526) @@ -1268,7 +1268,7 @@ data.bloodLeakStatus = (U32)getBloodLeakStatus(); data.bloodLeakState = (U32)bloodLeakState; - data.bloodLeakPersitentCounter = bloodLeakPersistenceCtr; + data.bloodLeakPersistentCounter = bloodLeakPersistenceCtr; bloodLeakDataPublicationCounter = 0; broadcastData( MSG_ID_HD_BLOOD_LEAK_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( BLOOD_LEAK_DATA_T ) ); Index: firmware/App/Controllers/BloodLeak.h =================================================================== diff -u -r41a41275952290677df1fb0d27db3f354be26dd8 -r437ac340cfe0bd90bc016372113bae3d594b7526 --- firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision 41a41275952290677df1fb0d27db3f354be26dd8) +++ firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision 437ac340cfe0bd90bc016372113bae3d594b7526) @@ -46,7 +46,7 @@ { U32 bloodLeakStatus; ///< Blood leak detector status U32 bloodLeakState; ///< Blood leak detector state - U32 bloodLeakPersitentCounter; ///< Blood leak detector persistent counter + U32 bloodLeakPersistentCounter; ///< Blood leak detector persistent counter } BLOOD_LEAK_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r41a41275952290677df1fb0d27db3f354be26dd8 -r437ac340cfe0bd90bc016372113bae3d594b7526 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 41a41275952290677df1fb0d27db3f354be26dd8) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 437ac340cfe0bd90bc016372113bae3d594b7526) @@ -1108,6 +1108,7 @@ void cmdStartDGROPermeateSampleMode( void ) { BOOL start = TRUE; + dgCmdResp[ DG_CMD_START_RO_PERMEATE_SAMPLE ].commandID = DG_CMD_NONE; sendDGStartStopDGROPermeateSampleModeCommand( start ); } @@ -1123,6 +1124,7 @@ void cmdStopDGROPermeateSampleMode( void ) { BOOL start = FALSE; + dgCmdResp[ DG_CMD_STOP_RO_PERMEATE_SAMPLE ].commandID = DG_CMD_NONE; sendDGStartStopDGROPermeateSampleModeCommand( start ); } Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -re5167d0700038c1faf8b689b844a905f20c0d3c6 -r437ac340cfe0bd90bc016372113bae3d594b7526 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision e5167d0700038c1faf8b689b844a905f20c0d3c6) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 437ac340cfe0bd90bc016372113bae3d594b7526) @@ -155,6 +155,7 @@ if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) ) && ( TRUE == hasRecoverFromFaultModeBeenSet() ) ) { HD_OP_MODE_T prevMode = getPreviousOperationMode(); + requestNewOperationMode( prevMode ); } break; Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r03b863f7759f90d9d92e408224c9f48bd8608efd -r437ac340cfe0bd90bc016372113bae3d594b7526 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 03b863f7759f90d9d92e408224c9f48bd8608efd) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 437ac340cfe0bd90bc016372113bae3d594b7526) @@ -262,8 +262,8 @@ /*********************************************************************//** * @brief * The execPreTreatmentMode function executes the Pre-Treatment Mode state machine. - * @details Inputs: none - * @details Outputs: none + * @details Inputs: currentPreTreatmentState, signalTestConfigRsrvrMgmtUse + * @details Outputs: currentPreTreatmentState * @return current state (sub-mode) *************************************************************************/ U32 execPreTreatmentMode( void ) @@ -315,7 +315,7 @@ break; } - if ( ( getTestConfigStatus( TEST_CONFIG_EXPEDITE_PRE_TREATMENT ) != TRUE ) && ( FALSE == signalTestConfigRsrvrMgmtUse ) ) + if ( ( getTestConfigStatus( TEST_CONFIG_EXPEDITE_PRE_TREATMENT ) != TRUE ) && ( signalTestConfigRsrvrMgmtUse != TRUE ) ) { // Execute reservoir management for pre-treatment mode execPreTreatmentReservoirMgmt(); @@ -690,7 +690,9 @@ * The transitionToPatientConnection function prepares actuators before * transition to pre-treatment patient connection state. * @details Inputs: none - * @details Outputs: Stopped pumps + * @details Outputs: setUFVolStatus, doorOpened, patientConnectionConfirm, + * treatmentStartRequested, signalTestConfigRsrvrMgmtUse, + * currentReservoirMgmtState * @return none *************************************************************************/ static void transitionToPatientConnection( void ) Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r43949bb09b178239911c2e46c6555bc31289090f -r437ac340cfe0bd90bc016372113bae3d594b7526 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 43949bb09b178239911c2e46c6555bc31289090f) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 437ac340cfe0bd90bc016372113bae3d594b7526) @@ -100,7 +100,7 @@ * The initStandbyMode function initializes the Standby Mode module. * @details Inputs: none * @details Outputs: currentStandbyState, treatStartReqReceived, - * homingInitiated + * disinfectCancelReqID, homingInitiated * @return none *************************************************************************/ void initStandbyMode( void ) @@ -354,7 +354,7 @@ * The signalUserInitiateFlushMode function handles user initiation of flush * mode. * @details Inputs: currentStandbyState - * @details Outputs: flushStartReqReceived + * @details Outputs: flushStartReqReceived, currentStandbyState * @return TRUE if signal accepted, FALSE if not *************************************************************************/ BOOL signalUserInitiateFlushMode( void ) @@ -854,8 +854,9 @@ * @brief * The handleDisinfectCancel function handles * DG disinfect cancel UI interaction. - * @details Inputs: none - * @details Outputs: none + * @details Inputs: disinfectCancelReqID, currentDGCleaningMode, + * currentStandbyState + * @details Outputs: disinfectCancelReqID * @param stop button status * @return none *************************************************************************/