Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r549119eae64732f124d22df66de4fc88c56193c0 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 549119eae64732f124d22df66de4fc88c56193c0) @@ -36,11 +36,15 @@ #define START_DG_CMD TRUE ///< Parameter for DG start/stop command function. True = start. #define STOP_DG_CMD FALSE ///< Parameter for DG start/stop command function. False = stop. - + +// TODO remove #define RESERVOIR_SETTLE_TIME_MS 5000 ///< Time (in ms) allotted for reservoir to settle (after fill, before drain). #define MAX_RESERVOIR_VOLUME_ML 1950.0 ///< Maximum reservoir volume. Switch reservoirs if active reservoir exceeds this volume. +#define MAX_RESERVOIR_DEPLETION_TIME_MS ( 30 * SEC_PER_MIN * MS_PER_SECOND ) ///< Maximum allowed depletion time in milliseconds. +// TODO remove + #define SIZE_OF_LARGE_LOAD_CELL_AVG 32 ///< Large load cell moving average has 32 samples. #define DIALYSATE_TEMP_PERSISTENCE_PERIOD ( 3 * MS_PER_SECOND ) ///< Persistence period for dialysate temperature alarm. @@ -50,20 +54,23 @@ #define DIALYSATE_TEMP_HIGH_LIMIT_C 42.0 ///< Dialysate high temperature limit in degree C. #define DIALYSATE_TEMP_LOW_LIMIT_C 33.0 ///< Dialysate low temperature limit in degree C. +// TODO remove /// States of the treatment reservoir management state machine. typedef enum TreatmentReservoirMgmt_States { TREATMENT_RESERVOIR_MGMT_START_STATE = 0, ///< If DG not already in re-circ mode, try to get it there. - TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE, ///< In DG re-circ, wait for lines to flush - then start draining inactive reservoir. + TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE, // TODO remove ///< In DG re-circ, wait for lines to flush - then start draining inactive reservoir. TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE, ///< Wait for drain to complete. TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE, ///< Wait to fill inactive reservoir (if appropriate) - then start filling inactive reservoir. TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE, ///< Wait for fill to complete. TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE, ///< Wait a bit for filled reservoir to settle before getting baseline weight (volume). - TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RES_SWITCH_STATE, ///< Wait for active reservoir to be consumed and switch cmd given - then back to flush DG lines state. + TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RES_SWITCH_STATE, // TODO remove ///< Wait for active reservoir to be consumed and switch cmd given - then back to flush DG lines state. TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE, ///< Wait for inactive reservoir to settle before getting final weight (volume) before starting to drain. NUM_OF_TREATMENT_RESERVOIR_MGMT_STATES ///< Number of treatment reservoir mgmt. states. -} TREATMENT_RESERVOIR_MGMT_STATE_T; +} TREATMENT_RESERVOIR_MGMT_STATE_T; +// TODO remove + // ********** private data ********** // DG status @@ -108,16 +115,38 @@ static U32 dgReservoirFillVolumeTargetSet = 0; ///< Fill-to volume commanded. static U32 dgReservoirDrainVolumeTarget = 0; ///< Latest drain-to volume reported by the DG. static U32 dgReservoirDrainVolumeTargetSet = 0; ///< Drain-to volume commanded. -static U32 resUseTimer = 0; ///< Used to track time pumping from active reservoir (for volume used calculation). -static F32 resUseVolumeMl = 0.0; ///< Accumulated volume used from active reservoir. + + static DG_DISINFECT_UI_STATES_T disinfectsStatus; ///< DG disinfects status. +// TOD remove +// TODO New variables for the reservoir management +// TODO add these to the init function +static U32 timeStartMS = 0; ///< Used to track time pumping from active reservoir (for volume used calculation). +static U32 timeDepletionMS = 0; +static F32 volTotalMl = 0.0; +static F32 volSpentMl = 0.0; ///< Accumulated volume used from active reservoir. + +// TODO set the reservoirs alarms properties +// TODO remove + // DG command response static DG_CMD_RESPONSE_T dgCmdResp[ NUM_OF_DG_COMMANDS ]; ///< Keep the latest DG command response for each command. // ********** private function prototypes ********** -static void checkDGRestart( void ); +static void checkDGRestart( void ); + +// Reservoir management functions +static void checkReservoirDepletionTime( void ); +static void checkReservoirMaxVolume( void ); + +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtStartState( void ); +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtDrainState( void ); +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtWaitToFillState( void ); +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtFillState( void ); +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtWaitForFillSettleState( void ); +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtWaitForSwitchSettleState( void ); /*********************************************************************//** * @brief @@ -201,8 +230,8 @@ { currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_START_STATE; resMgmtTimer = 0; - resUseTimer = getMSTimerCount(); - resUseVolumeMl = 0.0; + timeStartMS = getMSTimerCount(); + volSpentMl = 0.0; } /*********************************************************************//** @@ -215,7 +244,7 @@ *************************************************************************/ void dialysisResumed( void ) { - resUseTimer = getMSTimerCount(); + timeStartMS = getMSTimerCount(); } /*********************************************************************//** @@ -226,19 +255,19 @@ * @details Outputs: DG reservoirs (drains & fills) managed. * @return none *************************************************************************/ -void execTreatmentReservoirMgmt( void ) +void execTreatmentReservoirMgmt( void ) // TODO remove this exec DEBUG_DENALI yes later not now! { DG_OP_MODE_T dgOpMode = getDGOpMode(); U32 dgSubMode = getDGSubMode(); - U32 msSinceLastVolumeCalc = calcTimeSince( resUseTimer ); + U32 msSinceLastVolumeCalc = calcTimeSince( timeStartMS ); F32 flowRateMlPerMs = (F32)getTargetDialInFlowRate() / (F32)( MS_PER_SECOND * SEC_PER_MIN ); // Calculate volume used from active reservoir - do not accumulate if saline bolus in progress if ( SALINE_BOLUS_STATE_IN_PROGRESS != getSalineBolusState() ) { - resUseVolumeMl += ( flowRateMlPerMs * msSinceLastVolumeCalc ); + volSpentMl += ( flowRateMlPerMs * msSinceLastVolumeCalc ); } - resUseTimer = getMSTimerCount(); + timeStartMS = getMSTimerCount(); // TODO this should go to one of the handlers probably wait for reservoir to settle state prior to switching to drain // Alarm if active reservoir is full and inactive reservoir is not yet ready if ( getReservoirWeight( getDGActiveReservoir() ) > MAX_RESERVOIR_VOLUME_ML ) @@ -257,10 +286,10 @@ switch ( currentTrtResMgmtState ) { case TREATMENT_RESERVOIR_MGMT_START_STATE: - currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE; + currentTrtResMgmtState = handleReservoirMgmtStartState(); break; - case TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE: + case TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE: // TODO remove if ( DG_MODE_GENE == dgOpMode ) { if ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) @@ -331,7 +360,7 @@ case TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RES_SWITCH_STATE: // Reservoir switch during treatment should only occur in this state (i.e. when DG is ready). // Switch reservoirs when active reservoir is spent or full (i.e. we have pumped fill volume through dialyzer) and DG ready - if ( ( resUseVolumeMl >= (F32)dgReservoirFillVolumeTargetSet ) || ( getReservoirWeight( getDGActiveReservoir() ) > MAX_RESERVOIR_VOLUME_ML ) ) + if ( ( volSpentMl >= (F32)dgReservoirFillVolumeTargetSet ) || ( getReservoirWeight( getDGActiveReservoir() ) > MAX_RESERVOIR_VOLUME_ML ) ) { DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir(); @@ -341,7 +370,7 @@ cmdSetDGActiveReservoir( inactiveRes ); // Signal dialysis sub-mode to switch reservoirs signalReservoirsSwitched(); - resUseVolumeMl = 0.0; + volSpentMl = 0.0; // Wait for used reservoir to settle resMgmtTimer = getMSTimerCount(); currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE; @@ -363,8 +392,78 @@ currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_START_STATE; break; } -} +} + + +static void checkReservoirDepletionTime( void ) +{ + if ( TRUE == didTimeout( timeStartMS, MAX_RESERVOIR_DEPLETION_TIME_MS ) ) + { + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT, calcTimeSince( timeStartMS ) ) + } +} + + +static void checkReservoirMaxVolume( void ) +{ + DG_RESERVOIR_ID_T active = getDGActiveReservoir(); + + if ( getReservoirWeight( active ) >= MAX_RESERVOIR_VOLUME_ML ) + { + SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, getReservoirWeight( active ) ) + } +} + +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtStartState( void ) +{ + TREATMENT_RESERVOIR_MGMT_STATE_T state = TREATMENT_RESERVOIR_MGMT_START_STATE; + DG_OP_MODE_T dgOpMode = getDGOpMode(); + + if ( DG_MODE_GENE == dgOpMode ) + { + if ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) + { + cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, FALSE, TRUE ); + } + } + else if ( DG_MODE_DRAI == dgOpMode ) + { + state = TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE; + } + + return state; +} +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtDrainState( void ) +{ + TREATMENT_RESERVOIR_MGMT_STATE_T state = TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE; + DG_OP_MODE_T dgOpMode = getDGOpMode(); + + if ( DG_MODE_GENE == dgOpMode ) + { + state = TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE; + } + + return state; +} + +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtWaitToFillState( void ) +{ + +} +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtFillState( void ) +{ + +} +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtWaitForFillSettleState( void ) +{ + +} +static TREATMENT_RESERVOIR_MGMT_STATE_T handleReservoirMgmtWaitForSwitchSettleState( void ) +{ + +} + /*********************************************************************//** * @brief * The getDGOpMode function gets the current DG operating mode. @@ -1094,6 +1193,8 @@ #endif } +// ********** private functions ********** + /*********************************************************************//** * @brief * The checkDGRestart function checks to see if DG has restarted after started