Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -rf3d625e2593ced120c4a98b9ed7e28b132445642 -r40aa3e7fba95c1e968f8ad37e5badbae1940b819 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision f3d625e2593ced120c4a98b9ed7e28b132445642) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 40aa3e7fba95c1e968f8ad37e5badbae1940b819) @@ -426,31 +426,6 @@ /*********************************************************************//** * @brief - * The getSetValvePosition function returns the commanded position of a - * given valve. - * @details Inputs: none - * @details Outputs: valvesStatus - * @param valve Valve to get the commanded position of - * @return returns the current commanded position of the given valve - *************************************************************************/ -VALVE_POSITION_T getSetValvePosition( VALVE_T valve ) -{ - VALVE_POSITION_T position = VALVE_POSITION_NOT_IN_POSITION; - - if ( valve < NUM_OF_VALVES ) - { - position = valvesStatus[ valve ].commandedPosition; - } - else - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED4, (U32)valve ); - } - - return position; -} - -/*********************************************************************//** - * @brief * The getValveCurrent function returns the current of a valve. * @details Inputs: valvesStatus * @details Outputs: valvesStatus Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -rf3d625e2593ced120c4a98b9ed7e28b132445642 -r40aa3e7fba95c1e968f8ad37e5badbae1940b819 --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision f3d625e2593ced120c4a98b9ed7e28b132445642) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision 40aa3e7fba95c1e968f8ad37e5badbae1940b819) @@ -100,7 +100,6 @@ BOOL setValvePosition( VALVE_T valve, VALVE_POSITION_T position ); VALVE_POSITION_T getValvePosition( VALVE_T valve ); -VALVE_POSITION_T getSetValvePosition( VALVE_T valve ); F32 getValveCurrent( VALVE_T valve ); Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -rbe52d03bb19fb71b2f90ae4c134204aefb93da4c -r40aa3e7fba95c1e968f8ad37e5badbae1940b819 --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision be52d03bb19fb71b2f90ae4c134204aefb93da4c) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 40aa3e7fba95c1e968f8ad37e5badbae1940b819) @@ -1061,9 +1061,9 @@ result &= ( ( nvInstRcrd->minVenPressWideLimitWindowMMHG <= INSTIT_MAX_MIN_VEN_PRES_WIDE_LIMIT_MMHG ) && ( nvInstRcrd->minVenPressWideLimitWindowMMHG >= INSTIT_MIN_MIN_VEN_PRES_WIDE_LIMIT_MMHG ) ? TRUE : FALSE ); // NOTE: the treatment end blood flow rate in mL/min can be either 0 or 100 <= blood flow mL/min <= 500. - result &= ( ( ( nvInstRcrd->txEndBloodFlowMLPM == 0 ) || - ( nvInstRcrd->txEndBloodFlowMLPM >= TREAT_PARAMS_PROPERTIES[ TREATMENT_PARAM_BLOOD_FLOW ].min.uInt ) ) && - ( nvInstRcrd->txEndBloodFlowMLPM <= TREAT_PARAMS_PROPERTIES[ TREATMENT_PARAM_BLOOD_FLOW ].max.uInt ) ? TRUE : FALSE ); + result &= ( ( nvInstRcrd->txEndBloodFlowMLPM == 0 ) || + ( ( nvInstRcrd->txEndBloodFlowMLPM >= TREAT_PARAMS_PROPERTIES[ TREATMENT_PARAM_BLOOD_FLOW ].min.uInt ) && + ( nvInstRcrd->txEndBloodFlowMLPM <= TREAT_PARAMS_PROPERTIES[ TREATMENT_PARAM_BLOOD_FLOW ].max.uInt ) ) ? TRUE : FALSE ); return result; }