Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -rfcd31ba31379396ba18db1a7e13b9f26d7837958 -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision fcd31ba31379396ba18db1a7e13b9f26d7837958) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -59,17 +59,21 @@ #define DIALYSATE_TEMP_LOWER_SAFETY_LIMIT_C 33.0F ///< Dialysate lower bound safety temperature limit in C. #define DIALYSATE_TEMP_CLEAR_TIMEOUT_MS ( 10 * MS_PER_SECOND ) ///< Dialysate temperature clear persistence timeout. #define ZERO_DIAL_FLOW_RATE 0.0F ///< Zero dialysate flow rate -#define SPENT_CHAMBER_FILL_MAX_COUNT 10 ///< Total number of spent chamber fill allowed. +#define SPENT_CHAMBER_FILL_MAX_COUNT 12 ///< Total number of spent chamber fill allowed. #define BICARB_CHAMBER_FILL_TIMEOUT ( 1 * MS_PER_SECOND ) ///< Bicarb chamber fill timeout. - #define PUMP_SPEED_SLOPE_FACTOR_DIENER_2000 1.24F ///< D48 Diener 2000 pump speed slope (y = 1.24x + 30). #define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000 30.0F ///< D48 Diener 2000 pump speed intercept. #define PUMP_SPEED_SLOPE_FACTOR_DIENER_1000 2.869F ///< D48 Diener 1000 pump speed slope (y = 2.869x + 25.956). #define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_1000 25.956F ///< D48 Diener 1000 pump speed intercept. #define BICARB_CHAMBER_FILL_TIMEOUT ( 1 * MS_PER_SECOND ) ///< Bicarb chamber fill timeout. +#define SPENT_CHAMBER_FILL_WAIT_COUNT 3 ///< Number of totalSpentChamberFill increments to wait after level HIGH before transitioning. +// ********** private data ********** + //Testing #define DELAY_BC_SWITCHING_AT_START_UP ( 10 * MS_PER_SECOND ) ///< Provide a balancing chamber switching start up delay to stabilize pump speed etc., +#define MAX_UF_RATE 150 + /// Payload record structure for Gen dialysate execution state set request typedef struct { @@ -110,6 +114,7 @@ static void monitorChamberLevelStatus( void ); static void publishGenDialysateModeData( void ); static U32 getFreshDialPumpInitialRpm( void ); +static DD_GEND_MODE_STATE_T handleGenDPrimeFluidDiscardState( void ); /*********************************************************************//** * @brief @@ -464,10 +469,12 @@ setValveState( D65_VALV, VALVE_STATE_CLOSED ); setValveState( D81_VALV, VALVE_STATE_CLOSED ); setValveState( D8_VALV, VALVE_STATE_CLOSED ); + setValveState( D88_79_VALV, VALVE_STATE_CLOSED ); + setValveState( D34_VALV, VALVE_STATE_CLOSED ); //Close all balancing chamber valves valveControlForBCClosedState(); - setValveState( D34_VALV, VALVE_STATE_OPEN ); + setValveState( D91_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) @@ -483,6 +490,33 @@ //TODO : define actuators states break; + case DD_GEND_PRIME_FLUID_DISCARD_STATE: + // Deactivate Balancing Chamber Switching + //requestBalChamberSwitching( FALSE ); + // Turn off fresh & spent pumps + signalDialysatePumpHardStop( D12_PUMP ); + signalDialysatePumpHardStop( D48_PUMP ); + + setValveState( D40_VALV, VALVE_STATE_CLOSED ); + setValveState( D35_VALV, VALVE_STATE_CLOSED ); + setValveState( D100_VALV, VALVE_STATE_OPEN ); + setValveState( D34_VALV, VALVE_STATE_CLOSED ); + setValveState( D91_VALV, VALVE_STATE_CLOSED ); + setValveState( D47_VALV, VALVE_STATE_CLOSED ); + setValveState( D52_VALV, VALVE_STATE_CLOSED ); + setValveState( D14_VALV, VALVE_STATE_CLOSED ); + setValveState( D65_VALV, VALVE_STATE_CLOSED ); + //Close all balancing chamber valves + valveControlForBCClosedState(); + + //UF pump on + setConcentratePumpTargetSpeed( D76_PUMP, MAX_UF_RATE, DOSING_CONT_VOLUME ); + requestConcentratePumpOn( D76_PUMP ); + + //Rinse pump On + setRinsePumpState( RINSE_PUMP_STATE_ON ); + break; + default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_GEND_MODE_INVALID_EXEC_STATE1, state ) break; @@ -559,6 +593,10 @@ genDialysateState = handleGenDIsolatedUFState(); break; + case DD_GEND_PRIME_FLUID_DISCARD_STATE: + genDialysateState = handleGenDPrimeFluidDiscardState(); + break; + default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_GEND_MODE_INVALID_EXEC_STATE, genDialysateState ) genDialysateState = DD_GEND_STATE_START; @@ -796,6 +834,21 @@ state = DD_GEND_DIALYSATE_DELIVERY_STATE; } + if ( TRUE == getprimeFluidDiscardStatus() ) + { + // Deactivate Balancing Chamber Switching + requestBalChamberSwitching( FALSE ); + + // Wait for the Balancing Chamber to complete the current cycle before transition into spent chamber fill state + if ( getBalancingChamberStatus() == FALSE ) + { + setModeGenDStateTransition( DD_GEND_PRIME_FLUID_DISCARD_STATE ); + isDialDeliveryInProgress.data = FALSE; + state = DD_GEND_PRIME_FLUID_DISCARD_STATE; + } + + } + return state; } @@ -927,6 +980,30 @@ /*********************************************************************//** * @brief + * The handleGenDPrimeFluidDiscardState function performs discarding the + * priming fluid from disposable tube set. Runs the ultrafiltration pump (D76) + * to discard the priming fluid. + * @details \b Inputs: none + * @details \b Outputs: none + * @return next gen dialysate mode state + *************************************************************************/ +static DD_GEND_MODE_STATE_T handleGenDPrimeFluidDiscardState( void ) +{ + DD_GEND_MODE_STATE_T state = DD_GEND_PRIME_FLUID_DISCARD_STATE; + + if ( FALSE == getprimeFluidDiscardStatus() ) + { + requestConcentratePumpOff( D76_PUMP, FALSE ); + setValveState( D100_VALV, VALVE_STATE_CLOSED ); + setModeGenDStateTransition( DD_GEND_DIALYSATE_BYPASS_STATE ); + state = DD_GEND_DIALYSATE_BYPASS_STATE; + } + + return state; +} + +/*********************************************************************//** + * @brief * The requestDDGenDialyasteStop function handles an TD request to stop * generation dialysis mode. * @details \b Inputs: Generation dialysate mode / state