Index: firmware/App/Controllers/BalancingChamber.c =================================================================== diff -u -rfcd31ba31379396ba18db1a7e13b9f26d7837958 -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision fcd31ba31379396ba18db1a7e13b9f26d7837958) +++ firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -1619,6 +1619,19 @@ /*********************************************************************//** * @brief + * The getBalancingChamberStatus function gets the balancing chamber switching + * status. + * @details \b Inputs: isBalChamberSwitchingActive + * @details \b Outputs: none + * @return balancing chamber switching status + *************************************************************************/ +BOOL getBalancingChamberStatus( void ) +{ + return isBalChamberSwitchingActive; +} + +/*********************************************************************//** + * @brief * The getBalChamberFreshSideValvesClosedStatus function returns whether the * fresh-side balancing chamber valves are closed for the current switch state. * @details \b Inputs: isFreshSideValvesClosed Index: firmware/App/Controllers/BalancingChamber.h =================================================================== diff -u -rfcd31ba31379396ba18db1a7e13b9f26d7837958 -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Controllers/BalancingChamber.h (.../BalancingChamber.h) (revision fcd31ba31379396ba18db1a7e13b9f26d7837958) +++ firmware/App/Controllers/BalancingChamber.h (.../BalancingChamber.h) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -85,6 +85,7 @@ F32 getAcidDoseVol( void ); // Get acid dose volume BOOL isBalChamberSwitchImminent( void ); // Get the balancing chamber is within the valve-close window (50 ms) before switching. BOOL getBalChamberFreshSideValvesClosedStatus( void ); // Get the balancing chamber fresh side valve close status +BOOL getBalancingChamberStatus( void ); // Get Balancing Chamber Switching Status BOOL testDDBalChamberDataPublishIntervalOverride( MESSAGE_T *message ); // To override the balancing chamber data publish interval BOOL testBalChamberSwFreqOverride( MESSAGE_T *message ); // To override the balancing chamber switching frequency Index: firmware/App/Controllers/MixingControl.c =================================================================== diff -u -rfcd31ba31379396ba18db1a7e13b9f26d7837958 -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Controllers/MixingControl.c (.../MixingControl.c) (revision fcd31ba31379396ba18db1a7e13b9f26d7837958) +++ firmware/App/Controllers/MixingControl.c (.../MixingControl.c) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -130,7 +130,8 @@ #define TOTAL_CONDUCTIVITY ( ACID_CONDUCTIVITY_POST + BICARB_CONDUCTIVITY_POST ) ///< Theoretical Dialysate conductivity - +#define FLOW_SETTING_FOR_STATIC_CONTROL_INTERVAL_UPDATE 100 +#define STATIC_CONTROL_INTERVAL 2 /// Enumeration of dialysate Mixing id. typedef enum DialysateMixingID { @@ -452,8 +453,13 @@ // For acid control period, we are using 3 cycles of balancing chamber switching period (for ex: At Qd = 600, switching period = 3sec, so acid control interval = 3*3 = 9sec // For bicarb control period, we are using 5 cycles of balancing chamber switching period (for ex: At Qd = 600, switching period = 3sec, so bicarb control interval = 3*5 = 15sec - if ( balChamberSwitchingPeriod > 0) + if ( ( balChamberSwitchingPeriod > 0 ) && ( tdDialysateFlowRate <= FLOW_SETTING_FOR_STATIC_CONTROL_INTERVAL_UPDATE ) ) { + mixingControlAcidControlInterval.data = STATIC_CONTROL_INTERVAL * balChamberSwitchingPeriod; + mixingControlBicarbControlInterval.data = STATIC_CONTROL_INTERVAL * balChamberSwitchingPeriod; + } + else if ( tdDialysateFlowRate > FLOW_SETTING_FOR_STATIC_CONTROL_INTERVAL_UPDATE ) + { mixingControlAcidControlInterval.data = ACID_MIX_CONTROL_INTERVAL_MULTIPLIER * balChamberSwitchingPeriod; mixingControlBicarbControlInterval.data = BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER * balChamberSwitchingPeriod; } 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 Index: firmware/App/Services/Messaging.c =================================================================== diff -u -rff0edadf0c6f161a0a092ddaf94d1940d64f7d5e -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision ff0edadf0c6f161a0a092ddaf94d1940d64f7d5e) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -315,6 +315,7 @@ { MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST, &testHandleConductivitySensorCalRequest }, { MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testMixingControlDataPublishIntervalOverride }, { MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST, &testDryBiCartDepressurizeRequestOverride }, + { MSG_ID_DD_TD_PRIME_REQUEST_DATA, &handlePrimeDataRequestMsg }, }; /// Calculation for number of entries in the incoming message function handler look-up table. Index: firmware/App/Services/TDInterface.c =================================================================== diff -u -rbd522c8ffdf75130571e5b6a79d1b1d6acd78b1c -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Services/TDInterface.c (.../TDInterface.c) (revision bd522c8ffdf75130571e5b6a79d1b1d6acd78b1c) +++ firmware/App/Services/TDInterface.c (.../TDInterface.c) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -95,6 +95,8 @@ static U32 tdSubMode; ///< Current state (sub-mode) of current TD operation mode. static BOOL tdDialyzerBypass; ///< TD dialyzer bypass static BOOL tdOpModeDataFreshFlag = FALSE; ///< Flag to signal/process fresh TD op mode data +static BOOL chamberHValveOpen; ///< Chamber H vent valve open status +static BOOL primeFluidDiscardStart; ///< Priming fluid discard start status static OVERRIDE_F32_T tdDialysateFlowrate; ///< TD Dialysate flow rate static OVERRIDE_F32_T tdUFRate; ///< TD ultrafiltration rate @@ -238,6 +240,34 @@ /*********************************************************************//** * @brief + * The setChamberHValveStatus function sets the requested Chamber H vent + * valve open state, used to open chamber H valve to depressurize. + * @details \b Inputs: none + * @details \b Outputs: chamberHValveOpen + * @param flag TRUE to request the Chamber H vent valve open, FALSE to close it + * @return none + *************************************************************************/ +void setChamberHValveStatus( BOOL flag ) +{ + chamberHValveOpen = flag; +} + +/*********************************************************************//** + * @brief + * The setprimeFluidDiscardStatus function sets the requested priming fluid + * discard state, used to discard priming fluid. + * @details \b Inputs: none + * @details \b Outputs: primeFluidDiscardStart + * @param flag TRUE to request priming fluid discard start, FALSE to stop it + * @return none + *************************************************************************/ +void setprimeFluidDiscardStatus( BOOL flag ) +{ + primeFluidDiscardStart = flag; +} + +/*********************************************************************//** + * @brief * The setTDOpMode function sets the latest TD operating mode reported by * the TD (called by TD published message handler). * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if reported TD mode is invalid. @@ -364,6 +394,32 @@ /*********************************************************************//** * @brief + * The getChamberHValveStatus function returns the current Chamber H vent + * valve open request status. + * @details \b Inputs: chamberHValveOpen + * @details \b Outputs: none + * @return TRUE if Chamber H vent valve open is requested, FALSE if not + *************************************************************************/ +BOOL getChamberHValveStatus( void ) +{ + return chamberHValveOpen; +} + +/*********************************************************************//** + * @brief + * The getprimeFluidDiscardStatus function returns the current priming fluid + * discard request status. + * @details \b Inputs: primeFluidDiscardStart + * @details \b Outputs: none + * @return TRUE if priming fluid discard is requested, FALSE if not + *************************************************************************/ +BOOL getprimeFluidDiscardStatus( void ) +{ + return primeFluidDiscardStart; +} + +/*********************************************************************//** + * @brief * The getTDTargetDialysateTemperature function gets the latest TD * target dialysate temperature rate. * @details \b Inputs: tdDialysateTemp @@ -609,7 +665,35 @@ return result; } +/*********************************************************************//** + * @brief + * The handlePrimeDataRequestMsg function handles a prime data request + * from TD, updates Chamber H vent valve and priming fluid discard requests. + * @details \b Inputs: none + * @details \b Outputs: message handled + * @param message a pointer to the message to handle + * @return TRUE if message is sucessfully parsed, FALSE if not. + *************************************************************************/ +BOOL handlePrimeDataRequestMsg( MESSAGE_T *message ) +{ + BOOL result = FALSE; + if ( message->hdr.payloadLen == sizeof( MSG_ID_DD_TD_PRIME_REQUEST_DATA ) ) + { + PRIME_DATA_REQ_PAYLOAD_T payload; + + memcpy( &payload, message->payload, sizeof( PRIME_DATA_REQ_PAYLOAD_T ) ); + + setChamberHValveStatus( payload.chamberHValveOpen ); + setprimeFluidDiscardStatus( payload.primeFluidDiscardStart ); + } + + sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DD_2_TD, result ); + + return result; +} + + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ Index: firmware/App/Services/TDInterface.h =================================================================== diff -u -rc992ffdef2060d3d534abd2538bfb31dd25b9fbc -r5075786897d42d24a93ae5485936b5d50c307f65 --- firmware/App/Services/TDInterface.h (.../TDInterface.h) (revision c992ffdef2060d3d534abd2538bfb31dd25b9fbc) +++ firmware/App/Services/TDInterface.h (.../TDInterface.h) (revision 5075786897d42d24a93ae5485936b5d50c307f65) @@ -56,8 +56,12 @@ F32 getTDBicarbConversionFactor( void ); U32 getTDSodiumConcentration( void ); U32 getTDBicarbonateConcentration( void ); - +BOOL getChamberHValveStatus( void ); +BOOL getprimeFluidDiscardStatus( void ); +void setChamberHValveStatus( BOOL flag ); +void setprimeFluidDiscardStatus( BOOL flag ); TD_OP_MODE_T getTDOpMode( void ); +BOOL handlePrimeDataRequestMsg( MESSAGE_T *message ); BOOL testTDTreatmentParamsOverride( MESSAGE_T *message );