Index: firmware/App/Modes/BalancingChamber.c =================================================================== diff -u -rda2f672aa60ddf3a2ad40068313cfaac0b58bc5e -r015acf2ae3ec46adbdd2f1028f01831418f1733d --- firmware/App/Modes/BalancingChamber.c (.../BalancingChamber.c) (revision da2f672aa60ddf3a2ad40068313cfaac0b58bc5e) +++ firmware/App/Modes/BalancingChamber.c (.../BalancingChamber.c) (revision 015acf2ae3ec46adbdd2f1028f01831418f1733d) @@ -19,11 +19,14 @@ #include "Conductivity.h" #include "ConcentratePumps.h" #include "FpgaDD.h" +#include "ModeStandby.h" +#include "Messaging.h" #include "OperationModes.h" #include "Pressure.h" -#include "Temperature.h" -#include "TDInterface.h" #include "TaskGeneral.h" +#include "TDInterface.h" +#include "Temperature.h" +#include "TestSupport.h" #include "Valves.h" /** @@ -38,6 +41,13 @@ #define TEST_ACID_VOLUME_ML 0.67F ///< Acid concentrate volume in ml. #define TEST_BICARB_VOLUME_ML 1.15F ///< Bicarb concentrate volume in ml. +/// Payload record structure for balancing chamber switch only request +typedef struct +{ + U32 startStop; ///< balancing chamber switching only start:1 and stop: 0 + F32 flowrate; ///< dialysate flowrate in ml/min +} BC_SWITCHING_ONLY_START_CMD_PAYLOAD_T; + // ********** private data ********** static BAL_CHAMBER_EXEC_STATE_T balChamberExecState; ///< Current balancing chamber executive state. @@ -50,6 +60,7 @@ static BAL_CHAMBER_SW_STATE_T balChamberSWState; ///< Current balancing chamber switching state ( state 1 or state 2). static U32 balChamberDataPublicationTimerCounter; ///< Used to schedule balancing chamber data publication to CAN bus. static OVERRIDE_U32_T balChamberDataPublishInterval; ///< Balancing chamber data publish interval. +static BOOL balanceChamberSwitchingOnly; ///< Balancing chamber switching without any pressure check and dosing delivery. // ********** private function prototypes ********** @@ -80,6 +91,7 @@ balChamberDataPublishInterval.ovData = BAL_CHAMBER_DATA_PUBLISH_INTERVAL; balChamberDataPublishInterval.ovInitData = 0; balChamberDataPublishInterval.override = OVERRIDE_RESET; + balanceChamberSwitchingOnly = FALSE; balChamberSwitchingPeriod = 0; balChamberValveClosePeriod = 0; isBalChamberFillInProgress = FALSE; @@ -327,11 +339,12 @@ F32 freshDialPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); F32 spentDialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); - // Check fresh and spent dialysate pressure in range + // Check fresh and spent dialysate pressure in range or BC switch only flag set //TODO : comment the pressure check if ( 1 ) - // if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) && - // ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ) + //if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) && + // ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) || + // ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) { //Valve control for state 1 fill valveControlForBCState1FillStart(); @@ -362,11 +375,15 @@ { BAL_CHAMBER_EXEC_STATE_T state; - // start acid and bicarb pump with the expected quantity - setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONCENTRATE_PUMP_MAX_SPEED, TEST_ACID_VOLUME_ML ); - setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED, TEST_BICARB_VOLUME_ML ); - requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); - requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); + // Deliver dosing during generate dialysate mode + if ( FALSE == getBalChamberSwitchingOnlyStatus() ) + { + // start acid and bicarb pump with the expected quantity + setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONCENTRATE_PUMP_MAX_SPEED, TEST_ACID_VOLUME_ML ); + setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED, TEST_BICARB_VOLUME_ML ); + requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); + requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); + } // On triggering of dosing, transition to next state based on the current switching state if ( BAL_CHAMBER_SW_STATE1 == balChamberSWState ) @@ -409,7 +426,7 @@ // isPressureStalbilizedDuringFill = FALSE; } - // Swithcing time met or pressure in range, close valves + // Switching time met or pressure in range, close valves if ( ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod ) || ( TRUE == isPressureStalbilizedDuringFill ) ) { @@ -424,7 +441,8 @@ // On completion of cycle time, transition to next state if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod ) { - if ( TRUE != isPressureStalbilizedDuringFill ) + if ( ( TRUE != isPressureStalbilizedDuringFill ) && + ( FALSE == getBalChamberSwitchingOnlyStatus() ) ) { // Alarm when switching time expired, but still pressure not in range, SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure ); @@ -466,7 +484,8 @@ //TODO : comment the pressure check if ( 1 ) //if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) && - // ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ) + // ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) || + // ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) { // Valve control for state 2 fill valveControlForBCState2FillStart(); @@ -527,7 +546,8 @@ // On completion of cycle time, transition to next state if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod ) { - if ( TRUE != isPressureStalbilizedDuringFill ) + if ( ( TRUE != isPressureStalbilizedDuringFill ) && + ( FALSE == getBalChamberSwitchingOnlyStatus() ) ) { // Alarm when switching time expired, but still pressure not in range, SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure ); @@ -594,6 +614,33 @@ /*********************************************************************//** * @brief + * The setBalChamberSwitchingOnlyStatus function sets the balancing chamber + * switching only On/Off status. + * @details \b Inputs: balanceChamberSwitchingOnly + * @details \b Outputs: none + * @return none + *************************************************************************/ +void setBalChamberSwitchingOnlyStatus( BOOL OnOff ) +{ + balanceChamberSwitchingOnly = OnOff; +} + +/*********************************************************************//** + * @brief + * The getBalChamberSwitchingOnlyStatus function gets the balancing chamber + * switching only status. + * @details \b Inputs: balanceChamberSwitchingOnly + * @details \b Outputs: none + * @return balancing chamber switching only without any pressure validation + * and dosing delivery + *************************************************************************/ +BOOL getBalChamberSwitchingOnlyStatus( void ) +{ + return balanceChamberSwitchingOnly; +} + +/*********************************************************************//** + * @brief * The getBalChamberDataPublishInterval function gets the balancing chamber * data publish interval. * @details \b Inputs: balChamberDataPublishInterval @@ -635,6 +682,7 @@ data.isBalChamberFillInProgress = isBalChamberFillInProgress; data.currentBalChamberSwitchingCounter = currentBalChamberSwitchingCounter; data.isPressureStalbilizedDuringFill = isPressureStalbilizedDuringFill; + data.balChamberSWOnlyState = balanceChamberSwitchingOnly; broadcastData( MSG_ID_DD_BAL_CHAMBER_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( BAL_CHAMBER_DATA_T ) ); @@ -682,4 +730,56 @@ return result; } +/*********************************************************************//** + * @brief + * The testBCSwitchOnlyStartStopOverride function starts/stops balancing + * chamber switching only without dosing delivery and pressure check condition. + * @details \b Inputs: tester logged in + * @details \b Outputs: tdDialysateFlowrate,balanceChamberSwitchingOnly + * pendingBalanceChamberSwOnlyRequest + * @param message set message from Dialin which includes the balancing chamber + * to start/stop switching and update switching rate based on the flow rate. + * @return TRUE if set request is successful, FALSE if not + *************************************************************************/ +BOOL testBCSwitchOnlyStartStopOverride( MESSAGE_T *message ) +{ + BOOL result = FALSE; + + // Verify tester has logged in with TD + if ( TRUE == isTestingActivated() ) + { + // Verify payload length is valid + if ( sizeof( BC_SWITCHING_ONLY_START_CMD_PAYLOAD_T ) == message->hdr.payloadLen ) + { + BC_SWITCHING_ONLY_START_CMD_PAYLOAD_T payload; + + memcpy( &payload, message->payload, sizeof(BC_SWITCHING_ONLY_START_CMD_PAYLOAD_T) ); + + // Handle start command + if ( ( TRUE == payload.startStop ) && + ( ( payload.flowrate >= MIN_DIALYSIS_FLOW_RATE ) && ( payload.flowrate <= MAX_DIALYSIS_FLOW_RATE ) ) ) + { + // First set BC switching frequency based on the dialysate flow rate + setTDDialysateFlowrate( payload.flowrate ); + // then set BC switching only flag to ignore pressure check and dosing. + setBalChamberSwitchingOnlyStatus( TRUE ); + // Now, if the current operating mode is standby mode idle state, execute the balancing chamber switching only control + result = requestBCSwitchingOnlyStart(); + } + + //Handle stop command + if ( FALSE == payload.startStop ) + { + //Reset the flag + setBalChamberSwitchingOnlyStatus( FALSE ); + //Stop the BC switching execution only control + requestBCSwitchingOnlyStop(); + result = TRUE; + } + } + } + + return result; +} + /**@}*/