Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -r9102c5da21a15bdaf4bb3bc38795ceb064e3c443 -r8c5ca1982c53f4702c6f019ce9bcfedb9e513548 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 9102c5da21a15bdaf4bb3bc38795ceb064e3c443) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 8c5ca1982c53f4702c6f019ce9bcfedb9e513548) @@ -324,12 +324,12 @@ { // Read floater switch BOOL result = FALSE; - LEVEL_STATE_T floaterLevel1 = getLevelStatus( FLOATER_1 ); + LEVEL_STATE_T floaterLevel1 = getLevelStatus( FLOATER_LEVEL ); //LEVEL_STATE_T floaterLevel2 = getLevelStatus( FLOATER_2 ); //F32 hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); // High level is met - if ( STATE_HIGH == floaterLevel1 ) + if ( LEVEL_STATE_HIGH == floaterLevel1 ) { //turn off inlet water valve setValveState( VHI, VALVE_STATE_CLOSED ); @@ -362,12 +362,6 @@ setValveState( VHI, VALVE_STATE_OPEN ); } - // Invalid levels -// if ( ( STATE_LOW == floaterLevel1 ) && ( STATE_HIGH == floaterLevel2 ) ) -// { -// //TODO : check for invalid levels and trigger alarm -// } - return result; } @@ -649,8 +643,7 @@ data.genDialysateExecState = (U32)getCurrentGenDialysateState(); data.isDialDelInProgress = (BOOL)getDialDeliveryProgressStatus(); - data.floaterLevel1 = (U32)getLevelStatus( FLOATER_1 ); - data.floaterLevel2 = (U32)getLevelStatus( FLOATER_2 ); + data.floaterLevel = (U32)getLevelStatus( FLOATER_LEVEL ); data.BiCarbLevel = (U32)getLevelStatus( BICARB_LEVEL ); data.SpentChamberLevel = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL ); data.hydNegativePressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET );