Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -r8c5ca1982c53f4702c6f019ce9bcfedb9e513548 -rbf55b31e342873e3d6047b09749628f5fe275d8d --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 8c5ca1982c53f4702c6f019ce9bcfedb9e513548) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision bf55b31e342873e3d6047b09749628f5fe275d8d) @@ -20,6 +20,7 @@ #include "Conductivity.h" #include "DialysatePumps.h" #include "FpgaDD.h" +#include "Heaters.h" #include "Level.h" #include "ModeGenDialysate.h" #include "ModeStandby.h" @@ -39,23 +40,22 @@ // ********** private definitions ********** #define FRESH_DIAL_PUMP_INITIAL_RPM 2500 ///< Nominal RPM target for fresh dialysate pump to maintain required pressure. -#define SPENT_DIAL_PUMP_INITIAL_RPM 2500 ///< Nominal RPM target for spent dialysate pump to maintain required pressure. +#define SPENT_DIAL_PUMP_INITIAL_RPM 2000 ///< Nominal RPM target for spent dialysate pump to maintain required pressure. #define HYD_CHAMBER_FLUID_TEMP_C_MIN 35.0F ///< Minimum hydraulics fluid temperature in deg celcius #define HYD_CHAMBER_PRES_CHECK_TIME_OUT ( 1 * SEC_PER_MIN * MS_PER_SECOND ) ///< Time out period when hydraulics chamber pressure check initiated #define SPENT_DIAL_PRES_CHECK_TIME_OUT ( 1 * SEC_PER_MIN * MS_PER_SECOND ) ///< Time out period when spent dialysate pressure check initiated -#define HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI (-11.7877F) ///< Hydraulics chamber minimum negative pressure(D9/PHo) in psi. -#define HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI (-12.2789F) ///< Hydraulics chamber maximum negative pressure(D9/PHo) in psi. -#define HYD_CHAMBER_TARGET_POS_PRESS_MIN_PSI ( 23.0F ) ///< Hydraulics chamber or fresh dialysate minimum positive pressure(D18/PDf) in psi. -#define HYD_CHAMBER_TARGET_POS_PRESS_MAX_PSI ( 25.0F ) ///< Hydraulics chamber or fresh dialysate maximum positive pressure(D18/PDf) in psi. -#define SPENT_DIAL_TARGET_POS_PRESS_MIN_PSI ( 29.0F ) ///< Spent dialysate minimum positive pressure(D51/PDs) in psi. -#define SPENT_DIAL_TARGET_POS_PRESS_MAX_PSI ( 30.0F ) ///< Spent dialysate maximum positive pressure(D18/PDs) in psi. +//TODO : Needs further finetuning. currently max negative pressure reaches around 11.5 psi +/- 5% values defined for now +//#define HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI (-11.7877F) ///< Hydraulics chamber minimum negative pressure(D9/PHo) in psi. +//#define HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI (-12.2789F) ///< Hydraulics chamber maximum negative pressure(D9/PHo) in psi. +#define HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI (-10.925F) ///< Hydraulics chamber minimum negative pressure(D9/PHo) in psi. +#define HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI (-12.075F) ///< Hydraulics chamber maximum negative pressure(D9/PHo) in psi. #define GEN_DIALYSATE_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the gen dialysate mode data published. // ********** private data ********** static DD_GEND_MODE_STATE_T genDialysateState = DD_GEND_STATE_START; ///< Currently active gen dialysate state. -//static OVERRIDE_F32_T targetHydChamberFluidTemp; ///< Target hydraulics chamber fluid temperature. -//static BOOL isHydChamberTempinRange = FALSE; ///< Flag indicating hydraulics chamber water temperature is in range. +static OVERRIDE_F32_T targetHydChamberFluidTemp; ///< Target hydraulics chamber fluid temperature. +static BOOL isHydChamberTempinRange; ///< Flag indicating hydraulics chamber water temperature is in range. static U32 hydChamberPressureCheckStartTimeMS; ///< Current time when hydraulics chamber pressure check satrted in milliseconds. static U32 spentDialPressureCheckStartTimeMS; ///< Current time when spent dialysate pressure check started in milliseconds. static OVERRIDE_U32_T isDialDeliveryInProgress; ///< To indicate dialysate started delivering to dialyzer for treatment (overrideable) @@ -74,6 +74,7 @@ static DD_GEND_MODE_STATE_T handleGenDProduceDialysateState( void ); static DD_GEND_MODE_STATE_T handleGenDDialysateDeliveryState( void ); static DD_GEND_MODE_STATE_T handleGenDDialysateDeliveryPauseState( void ); +static F32 getGenDilaysateTargetTemperature( void ); static void publishGenDialysateModeData( void ); /*********************************************************************//** @@ -85,11 +86,11 @@ *************************************************************************/ void initGenDialysateMode( void ) { -// targetHydChamberFluidTemp.data = HYD_CHAMBER_FLUID_TEMP_C_MIN; -// targetHydChamberFluidTemp.ovInitData = HYD_CHAMBER_FLUID_TEMP_C_MIN; -// targetHydChamberFluidTemp.ovData = HYD_CHAMBER_FLUID_TEMP_C_MIN; -// targetHydChamberFluidTemp.override = OVERRIDE_RESET; -// isHydChamberTempinRange = FALSE; + targetHydChamberFluidTemp.data = HYD_CHAMBER_FLUID_TEMP_C_MIN; + targetHydChamberFluidTemp.ovInitData = HYD_CHAMBER_FLUID_TEMP_C_MIN; + targetHydChamberFluidTemp.ovData = HYD_CHAMBER_FLUID_TEMP_C_MIN; + targetHydChamberFluidTemp.override = OVERRIDE_RESET; + isHydChamberTempinRange = FALSE; genDialysateState = DD_GEND_STATE_START; isDialysateGoodtoDeliver.data = FALSE; isDialysateGoodtoDeliver.ovData = FALSE; @@ -176,8 +177,10 @@ setHydValvesStatetoClosedState(); setUFValvesStatetoClosedState(); + setValveState( VWI, VALVE_STATE_OPEN ); //M4 + // Get the target temperature from TD - //targetHydChamberFluidTemp.data = HYD_CHAMBER_FLUID_TEMP_C_MIN; + targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature(); break; case DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE: @@ -199,8 +202,21 @@ spentDialPressureCheckStartTimeMS = getMSTimerCount(); // Open all balancing chamber valves for free flow - valveControlForBCOpenState(); + //valveControlForBCOpenState(); + // Open fresh balancing chamber valves D19,D20,D21,D22 + setValveState( BCV2, VALVE_STATE_OPEN ); + setValveState( BCV6, VALVE_STATE_OPEN ); + setValveState( BCV4, VALVE_STATE_OPEN ); + setValveState( BCV8, VALVE_STATE_OPEN ); + + // Close spent side valves D23,D24,D25,D26 + setValveState( BCV1, VALVE_STATE_CLOSED ); + setValveState( BCV3, VALVE_STATE_CLOSED ); + setValveState( BCV5, VALVE_STATE_CLOSED ); + setValveState( BCV7, VALVE_STATE_CLOSED ); + + // Make sure valves are in correct position setValveState( VDR, VALVE_STATE_OPEN ); // Drain valve : D53 setValveState( VDI, VALVE_STATE_CLOSED ); @@ -212,7 +228,10 @@ break; case DD_GEND_PRODUCE_DIALYSATE_STATE: - // Enable bypass valve + //Close previously opened BC valves + valveControlForBCClosedState(); + + // Make sure bypass valve open condition setValveState( VDI, VALVE_STATE_CLOSED ); setValveState( VDO, VALVE_STATE_CLOSED ); setValveState( VDB2, VALVE_STATE_OPEN ); @@ -324,37 +343,39 @@ { // Read floater switch BOOL result = FALSE; - LEVEL_STATE_T floaterLevel1 = getLevelStatus( FLOATER_LEVEL ); - //LEVEL_STATE_T floaterLevel2 = getLevelStatus( FLOATER_2 ); - //F32 hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); + LEVEL_STATE_T floaterLevel = getLevelStatus( FLOATER_LEVEL ); + //LEVEL_STATE_T spentDialLevel = getLevelStatus( SPENT_DIALYSATE_LEVEL ); + F32 hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); // High level is met - if ( LEVEL_STATE_HIGH == floaterLevel1 ) + if ( LEVEL_STATE_HIGH == floaterLevel ) { + // Get the target dialysate temperature + F32 targetTemperature = getGenDilaysateTargetTemperature(); + //turn off inlet water valve setValveState( VHI, VALVE_STATE_CLOSED ); -// // read latest fluid temperature -// hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); -// -// if ( hydChamberTemperature < HYD_CHAMBER_FLUID_TEMP_C_MIN ) -// { -// //if fluid temp is lesser, turn on heater -// setHeaterTargetTemperature( DD_PRIMARY_HEATER, targetHydChamberFluidTemp ); -// startHeater( DD_PRIMARY_HEATER ); -// } -// else -// { -// //Turn heater off -// if ( TRUE == isHeaterOn( DD_PRIMARY_HEATER ) ) -// { -// stopHeater( DD_PRIMARY_HEATER ); -// } -// } + // read latest fluid temperature + hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); - // For now, lets not wait for temperature to reach target, as soon as water level is high - // enough, update results to true. - result = TRUE; + if ( hydChamberTemperature < targetTemperature ) + { + //if fluid temp is lesser, turn on heater + setHeaterTargetTemperature( DD_PRIMARY_HEATER, targetTemperature ); + startHeater( DD_PRIMARY_HEATER ); + } + else + { + //Turn heater off + if ( TRUE == isHeaterOn( DD_PRIMARY_HEATER ) ) + { + stopHeater( DD_PRIMARY_HEATER ); + } + + // Temperature reached to the target setting. + result = TRUE; + } } else { @@ -402,7 +423,7 @@ F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); // Hydraulics chamber negative pressure is in range ( -24 to -25 inHg ) - if ( ( hydPressure >= HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI ) && ( hydPressure <= HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI ) ) + if ( ( hydPressure <= HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI ) && ( hydPressure >= HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI ) ) { // Proceed to next state setModeGenDStateTransition( DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE ); @@ -432,8 +453,8 @@ DD_GEND_MODE_STATE_T state = DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE; F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - // Hydraulics chamber postive pressure is in range ( 23 to 25 psi ) - if ( ( hydPressure >= HYD_CHAMBER_TARGET_POS_PRESS_MIN_PSI ) && ( hydPressure <= HYD_CHAMBER_TARGET_POS_PRESS_MAX_PSI ) ) + // Hydraulics chamber postive pressure is in range + if ( ( hydPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( hydPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) { // Proceed to next state setModeGenDStateTransition( DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE ); @@ -463,8 +484,8 @@ DD_GEND_MODE_STATE_T state = DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE; F32 spentdialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); - // Spent dialysate pressure is in range ( 29 to 30 psi ) - if ( ( spentdialPressure >= SPENT_DIAL_TARGET_POS_PRESS_MIN_PSI ) && ( spentdialPressure <= SPENT_DIAL_TARGET_POS_PRESS_MAX_PSI ) ) + // Spent dialysate pressure is in range + if ( ( spentdialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentdialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) { // Proceed to next state transitionToBalChamberFill(); @@ -627,6 +648,26 @@ /*********************************************************************//** * @brief + * The getGenDilaysateTargetTemperature function gets the target dialysate + * temperature. + * @details \b Inputs: getGenDilaysateTargetTemperature + * @details \b Outputs: none + * @return the target dialysate temperature for the treatment. + *************************************************************************/ +static F32 getGenDilaysateTargetTemperature( void ) +{ + F32 result = targetHydChamberFluidTemp.data; + + if ( OVERRIDE_KEY == targetHydChamberFluidTemp.override ) + { + result = targetHydChamberFluidTemp.ovData; + } + + return result; +} + +/*********************************************************************//** + * @brief * The publishGenDialysateModeData function broadcasts the generate dialysate * mode data at defined interval. * @details \b Inputs: genDialysateDataPublicationTimerCounter