Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -r2d7073b01c6f70f5a40cb08ad7ff3216bae36588 -r4e9b962e7cb3c0b477462756a32214118b10fc16 --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 2d7073b01c6f70f5a40cb08ad7ff3216bae36588) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 4e9b962e7cb3c0b477462756a32214118b10fc16) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file ModePostTreat.c * -* @author (last) Dara Navaei -* @date (last) 22-Dec-2022 +* @author (last) Sean Nash +* @date (last) 01-Jun-2023 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -45,36 +45,37 @@ /// Interval (ms/task time) at which the post-treatment state data is published on the CAN bus. #define POST_TREATMENT_DATA_PUB_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) -#define DIP_DRAIN_DG_FLOW_RATE_ML_MIN 60 ///< DG drain inlet pump flow rate in mL/min. -#define DIP_DRAIN_DG_RUNTIME_MS 30000 ///< DG drain inlet pump run time in ms. +#define DIP_DRAIN_DG_FLOW_RATE_ML_MIN 60 ///< DG drain inlet pump flow rate in mL/min. +#define DIP_DRAIN_DG_RUNTIME_MS ( 40 * MS_PER_SECOND ) ///< DG drain inlet pump run time in ms. /// Post-Treatment drain reservoirs state machine. typedef enum Drain_States { - DRAIN_DG_DEPRIME_STATE = 0, ///< Drain DG De-prime dialysate lines of excess fluid state. - DRAIN_RESERVOIR_SWITCH_STATE, ///< Switch reservoir state. - DRAIN_RESERVOIR_START_DRAIN_STATE, ///< Drain reservoir start drain state. - DRAIN_RESERVOIR_DRAIN_STATE, ///< Drain first reservoir state. - DRAIN_RESERVOIR_COMPLETE_STATE, ///< Drain complete state. - NUM_OF_DRAIN_STATES ///< Number of drain states. + DRAIN_DG_DEPRIME_STATE = 0, ///< Drain DG De-prime dialysate lines of excess fluid state. + DRAIN_RESERVOIR_SWITCH_STATE, ///< Switch reservoir state. + DRAIN_RESERVOIR_START_DRAIN_STATE, ///< Drain reservoir start drain state. + DRAIN_RESERVOIR_DRAIN_STATE, ///< Drain first reservoir state. + DRAIN_RESERVOIR_COMPLETE_STATE, ///< Drain complete state. + NUM_OF_DRAIN_STATES ///< Number of drain states. } DRAIN_STATE_T; // ********** private data ********** -static BOOL patientDisconnectionConfirmed; ///< Flag indicates user confirms patient disconnection. -static BOOL disposableRemovalConfirmed; ///< Flag indicates user confirms disposable removal. -static BOOL rinseConcentrateLines; ///< FLag indicates to rinse concentrate lines. -static BOOL isThisFirstDrain; ///< Flag to indicate whether this is the first time the reservoir is drained. -static BOOL drainDGDePrimeActive; ///< FLag to indicate DePrime DG Dialysate lines active -static U32 drainDGDePrimeStarttime; ///< DG DePrime start time -static BOOL dgCommandSent; ///< Flag indicates whether a DG command has been already sent. -static HD_POST_TREATMENT_STATE_T currentPostTreatmentState; ///< Current state of post-treatment mode state machine. -static DRAIN_STATE_T currentDrainReservoirState; ///< Current drain reservoir state. -static U32 postTreatmentPublishTimerCounter; ///< Timer counter used to schedule post-treatment data broadcast. +static BOOL patientDisconnectionConfirmed; ///< Flag indicates user confirms patient disconnection. +static BOOL disposableRemovalConfirmed; ///< Flag indicates user confirms disposable removal. +static BOOL rinseConcentrateLines; ///< FLag indicates to rinse concentrate lines. +static BOOL isThisFirstDrain; ///< Flag to indicate whether this is the first time the reservoir is drained. +static BOOL drainDGDePrimeActive; ///< FLag to indicate DePrime DG Dialysate lines active +static U32 drainDGDePrimeStarttime; ///< DG DePrime start time +static BOOL dgCommandSent; ///< Flag indicates whether a DG command has been already sent. +static HD_POST_TREATMENT_STATE_T currentPostTreatmentState; ///< Current state of post-treatment mode state machine. +static DRAIN_STATE_T currentDrainReservoirState; ///< Current drain reservoir state. +static U32 postTreatmentPublishTimerCounter; ///< Timer counter used to schedule post-treatment data broadcast. + /// Interval (in task intervals) at which to publish post-treatment mode data to CAN bus. static OVERRIDE_U32_T postTreatmentModePublishInterval = { POST_TREATMENT_DATA_PUB_INTERVAL, POST_TREATMENT_DATA_PUB_INTERVAL, POST_TREATMENT_DATA_PUB_INTERVAL, 0 }; -static TREATMENT_LOG_DATA_PAYLOAD_T treatmentLogData; ///< Treatment parameters record for logging. +static TREATMENT_LOG_DATA_PAYLOAD_T treatmentLogData; ///< Treatment parameters record for logging. // ********** private function prototypes ********** @@ -138,7 +139,7 @@ setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE ); - doorClosedRequired( FALSE, FALSE ); + doorClosedRequired( TRUE, TRUE ); cmdStopDGTrimmerHeater(); @@ -152,11 +153,13 @@ signalBloodPumpHardStop(); signalDialOutPumpHardStop(); signalDialInPumpHardStop(); - + setCurrentSubState( currentPostTreatmentState ); collectTreatmentLogData(); exitBloodLeakNormalState(); + setVenousBubbleDetectionEnabled( FALSE ); + return currentPostTreatmentState; } @@ -170,6 +173,7 @@ U32 execPostTreatmentMode( void ) { BOOL stop = isStopButtonPressed(); + HD_POST_TREATMENT_STATE_T priorSubState = currentPostTreatmentState; switch ( currentPostTreatmentState ) { @@ -194,14 +198,19 @@ break; } + if ( priorSubState != currentPostTreatmentState ) + { + SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubState, currentPostTreatmentState ); + } + if ( ++postTreatmentPublishTimerCounter >= getU32OverrideValue( &postTreatmentModePublishInterval ) ) { POST_TREATMENT_STATE_DATA_T data; data.currentPostTreatmentState = (U32)currentPostTreatmentState; data.currentPostTxDrainState = (U32)currentDrainReservoirState; - broadcastData( MSG_ID_HD_POST_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( POST_TREATMENT_STATE_DATA_T ) ); + broadcastData( MSG_ID_HD_POST_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( POST_TREATMENT_STATE_DATA_T ) ); postTreatmentPublishTimerCounter = 0; } @@ -360,7 +369,8 @@ { // Done with draining the reservoirs state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE; - doorClosedRequired( TRUE, TRUE ); + doorClosedRequired( FALSE, FALSE ); + setCurrentSubState( NO_SUB_STATE ); } return state; @@ -376,10 +386,6 @@ *************************************************************************/ static HD_POST_TREATMENT_STATE_T handlePostTreatmentPatientDisconnectionState( void ) { - VALVE_T valve; - - F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ); - F32 hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE ); HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE; OPN_CLS_STATE_T frontDoor = getSwitchStatus( FRONT_DOOR ); OPN_CLS_STATE_T pumpTrack = getSwitchStatus( PUMP_TRACK_SWITCH ); @@ -397,22 +403,6 @@ { patientDisconnectionConfirmed = FALSE; state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE; - - for ( valve = VDI; valve < NUM_OF_VALVES; valve++ ) - { - setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT ); - } - - homeBloodPump(); - homeDialInPump(); - homeDialOutPump(); - - doorClosedRequired( FALSE, FALSE ); - - if ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ) - { - retractSyringePump(); - } } } @@ -457,8 +447,6 @@ *************************************************************************/ static HD_POST_TREATMENT_STATE_T handlePostTreatmentVerifyState( void ) { - // Assuming the cartridge door is removed already. - // This is used when the disable cartridge removal step software configuration is enabled BOOL isCartridgeRemoved = TRUE; #ifndef _RELEASE_ @@ -470,11 +458,11 @@ if ( FALSE == isCartridgeRemoved ) { - activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE ); + activateAlarmNoData( ALARM_ID_HD_CARTRIDGE_REMOVAL_FAILURE ); } else { - clearAlarmCondition( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE ); + clearAlarmCondition( ALARM_ID_HD_CARTRIDGE_REMOVAL_FAILURE ); } if ( TRUE == isSyringeDetected() ) @@ -511,6 +499,8 @@ *************************************************************************/ static void execDrainReservoirs( void ) { + DRAIN_STATE_T priorSubState = currentDrainReservoirState; + switch ( currentDrainReservoirState ) { case DRAIN_DG_DEPRIME_STATE: @@ -530,28 +520,36 @@ break; case DRAIN_RESERVOIR_COMPLETE_STATE: + // Nothing to be done in this state (terminal state). break; default: currentDrainReservoirState = DRAIN_RESERVOIR_SWITCH_STATE; SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_POST_TREATMENT_RESERVOIR_MGMT_INVALID_STATE, currentDrainReservoirState ); break; } + + if ( priorSubState != currentDrainReservoirState ) + { + setCurrentSubState( (U32)currentDrainReservoirState ); + SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrainReservoirState ); + } } /*********************************************************************//** * @brief - * The handleDrainDePrimeDGDialysateLinesState function waits for DG to complete - * reservoir switch. - * @details Inputs: - * @details Outputs: + * The handleDrainDePrimeDGDialysateLinesState function de-primes the return + * dialysate line so that it will not leak when user disconnects the line + * from the DG. + * @details Inputs: drainDGDePrimeActive + * @details Outputs: drainDGDePrimeActive * @return next state *************************************************************************/ static DRAIN_STATE_T handleDrainDePrimeDGDialysateLinesState( void ) { DRAIN_STATE_T state = DRAIN_DG_DEPRIME_STATE; - if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) ) + if ( ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) ) || ( DG_MODE_FAUL == getDGOpMode() ) ) { if ( FALSE == drainDGDePrimeActive ) { @@ -566,9 +564,31 @@ // Thereafter, check for time elapsed if ( TRUE == didTimeout( drainDGDePrimeStarttime, DIP_DRAIN_DG_RUNTIME_MS ) ) { + VALVE_T valve; + drainDGDePrimeActive = FALSE; signalDialInPumpHardStop( ); - state = DRAIN_RESERVOIR_SWITCH_STATE; + if ( getDGOpMode() != DG_MODE_FAUL ) + { + state = DRAIN_RESERVOIR_SWITCH_STATE; + } + else + { + state = DRAIN_RESERVOIR_COMPLETE_STATE; + } + // home valves and pumps while front door is still closed. + homeBloodPump(); + homeDialInPump(); + homeDialOutPump(); + for ( valve = VDI; valve < NUM_OF_VALVES; valve++ ) + { + setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT ); + } + if ( ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ) > 0.0 ) || + ( getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE ) > 0.0 ) ) + { + retractSyringePump(); + } } }