Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r229341f9eb23fec730cdf9b1f8f3960de2daf384 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241) @@ -199,12 +199,6 @@ { commandedBCValveStates |= ( getValveState( i ) == ENERGIZED ? 0x01 << ( i - FIRST_BC_VALVE ) : 0 ); } - - // flag Ultrafiltration valves that are currently commanded to be energized - for ( i = FIRST_UF_VALVE; i <= LAST_UF_VALVE; i++ ) - { - commandedUFValveStates |= ( getValveState( i ) == ENERGIZED ? 0x01 << ( i - FIRST_UF_VALVE ) : 0 ); - } } /*********************************************************************//** @@ -228,10 +222,9 @@ case VALVE_STATE_CLOSED: if ( ( D53_VALV == valveID ) || ( D52_VALV == valveID ) || ( D8_VALV == valveID ) || ( D54_VALV == valveID ) || ( D14_VALV == valveID ) || ( D65_VALV == valveID ) || ( D64_VALV == valveID ) || ( D31_VALV == valveID ) || ( D34_VALV == valveID ) || ( D35_VALV == valveID ) || - ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID ) || ( DD_M4_VALV == valveID ) || ( D23_VALV == valveID ) || + ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID ) || ( M4_VALV == valveID ) || ( D23_VALV == valveID ) || ( D19_VALV == valveID ) || ( D25_VALV == valveID ) || ( D21_VALV == valveID ) || ( D24_VALV == valveID ) || ( D20_VALV == valveID ) || - ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D69_VALV == valveID ) || ( D70_VALV == valveID ) || ( D71_VALV == valveID ) || - ( D72_VALV == valveID ) ) + ( D26_VALV == valveID ) || ( D22_VALV == valveID ) ) { result = TRUE; } @@ -423,25 +416,6 @@ /*********************************************************************//** * @brief - * The setUFValvesStatetoClosedState function sets all UF valves - * to close state. - * @details \b Inputs: none - * @details \b Outputs: valve states - * @return none. - *************************************************************************/ -void setUFValvesStatetoClosedState( void ) -{ - DD_VALVES_T valve; - - // Set all UF valves to closed state - for ( valve = FIRST_UF_VALVE; valve <= LAST_UF_VALVE; valve++ ) - { - setValveState( valve, VALVE_STATE_CLOSED ); - } -} - -/*********************************************************************//** - * @brief * The publishValvesStates function publishes DD valves states at the set interval. * @details \b Inputs: valvesStatesPublicationTimerCounter * @details \b Outputs: valvesStatesPublicationTimerCounter @@ -458,9 +432,8 @@ data.valvesStatus = getFPGAValveStates(); data.valvesBCStatus = getFPGAValveBCStates(); - data.valvesUFStatus = getFPGAValveUFStates(); - for ( i = 0; i < DD_NUM_OF_VALVES; i++ ) + for ( i = 0; i < LAST_DD_VALVE; i++ ) { data.valvesSensedState[ i ] = (U08)getValveStateName( (DD_VALVES_T)i ); } Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241) @@ -63,7 +63,6 @@ BOOL setValveStateDelayed( DD_VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs ); VALVE_STATE_NAMES_T getValveStateName( DD_VALVES_T valveID ); void setHydValvesStatetoClosedState( void ); -void setUFValvesStatetoClosedState( void ); BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message ); BOOL testValveStateOverride( MESSAGE_T *message ); Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241) @@ -188,20 +188,14 @@ setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( DD_M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); // De-energize Balancing chamber and Ultrafiltration valves for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ ) { setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); } - // TODO: To be removed once HDD clean up is done - for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ ) - { - setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - } - requestConcentratePumpOff( D11_PUMP, parkPumps ); requestConcentratePumpOff( D10_PUMP, parkPumps ); requestConcentratePumpOff( D76_PUMP, parkPumps ); @@ -245,21 +239,14 @@ setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( DD_M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); // De-energize portion of balancing chamber valves. setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D20_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D21_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( D22_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - // TODO: To be removed once HDD clean up is done - // De-energize Ultrafiltration valves - for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ ) - { - setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - } - requestConcentratePumpOff( D11_PUMP, parkPumps ); requestConcentratePumpOff( D10_PUMP, parkPumps ); requestConcentratePumpOff( D76_PUMP, parkPumps ); Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -ra711f7995e555b503ed8c295f98fbe7bb9e5abf5 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision a711f7995e555b503ed8c295f98fbe7bb9e5abf5) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241) @@ -206,7 +206,7 @@ break; case DD_GEND_DIALYSATE_BYPASS_STATE: - setValveState( DD_M4_VALV, VALVE_STATE_OPEN ); + setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D14_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D35_VALV, VALVE_STATE_CLOSED ); // VDI @@ -238,7 +238,7 @@ //Previous state setValveState( D47_VALV, VALVE_STATE_CLOSED ); // spent chamber purge valve setValveState( D64_VALV, VALVE_STATE_CLOSED ); - setValveState( DD_M4_VALV, VALVE_STATE_OPEN ); + setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D14_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve @@ -264,7 +264,7 @@ setValveState( D35_VALV, VALVE_STATE_CLOSED ); // VDI setValveState( D40_VALV, VALVE_STATE_CLOSED ); // VDO - setValveState( DD_M4_VALV, VALVE_STATE_OPEN ); + setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D14_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve @@ -300,7 +300,7 @@ setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve - setValveState( DD_M4_VALV, VALVE_STATE_OPEN ); + setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D64_VALV, VALVE_STATE_OPEN ); // Bicarb chamber purge valve bicarbFillStartTimeMS = getMSTimerCount(); @@ -437,7 +437,7 @@ LEVEL_STATE_T floaterLevel = getLevelStatus( D6_LEVL ); //Make sure Water Inlet Valve is open - setValveState( DD_M4_VALV, VALVE_STATE_OPEN ); + setValveState( M4_VALV, VALVE_STATE_OPEN ); // High level is met if ( LEVEL_STATE_HIGH == floaterLevel ) Index: firmware/App/Modes/ModePreGenDialysate.c =================================================================== diff -u -r67731d57db9a620418b3b848d8f75ff204902c36 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 --- firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 67731d57db9a620418b3b848d8f75ff204902c36) +++ firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241) @@ -269,7 +269,7 @@ case DD_WET_SELF_TEST_NEGATIVE_DEAERATION_PRES_CHECK: //Make sure Water Inlet Valve is open - setValveState( DD_M4_VALV, VALVE_STATE_OPEN ); + setValveState( M4_VALV, VALVE_STATE_OPEN ); // Start timer for hyd chamber negative pressure check state hydChamberPressureCheckStartTimeMS = getMSTimerCount();