Index: firmware/App/Modes/FPModes/ModeGenPermeate.c =================================================================== diff -u -r7f41fd21bfcfa660c343116fbb8efbbf98d31a9d -r708e22d3862fe0efb7e864697d10b5c5d023780e --- firmware/App/Modes/FPModes/ModeGenPermeate.c (.../ModeGenPermeate.c) (revision 7f41fd21bfcfa660c343116fbb8efbbf98d31a9d) +++ firmware/App/Modes/FPModes/ModeGenPermeate.c (.../ModeGenPermeate.c) (revision 708e22d3862fe0efb7e864697d10b5c5d023780e) @@ -176,11 +176,11 @@ SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_GENP_CHANGE, prevState, genPermeateState ) } - checkInletPressures(); + //checkInletPressures(); - checkPermeateHighFlow(); + //checkPermeateHighFlow(); - checkPermeateLowFlow(); + //checkPermeateLowFlow(); checkInletTemperatures(); @@ -339,12 +339,12 @@ FP_GENP_MODE_STATE_T state = FP_GENP_TANK_FILL_STATE; PERMEATE_TANK_STATE_T permemeateTankState = getPermeateTankState(); - checkROInletPressure(); + //checkROInletPressure(); - if ( TRUE == didTimeout( tankFillAlarmTimer, getTankFillAlarmTimeout() ) ) - { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT, permemeateTankState ) - } +// if ( TRUE == didTimeout( tankFillAlarmTimer, getTankFillAlarmTimeout() ) ) +// { +// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FP_GEN_PERMEATE_TANK_FILL_TIMEOUT, permemeateTankState ) +// } // Wait for set timeout before transition to closed loop control if ( TRUE == didTimeout( timeInState, PUMP_REST_TIMEOUT_MS ) && stateTransitioned == TRUE ) { @@ -354,7 +354,7 @@ // Wait for RO rejection to stabilize after transition from full to fill + RO Rejection moving average duration if ( TRUE == didTimeout( timeInState, RO_REJECTION_WAIT_TIME_MS ) ) { - checkRORejectionRatio(); + //checkRORejectionRatio(); } if ( permemeateTankState == PERMEATE_TANK_FULL_STATE ) { @@ -378,7 +378,6 @@ if ( TRUE == didTimeout( tankFullAlarmTimer, getTankFullAlarmTimeout() ) ) { - //TODO : Commented for July demo //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT, permemeateTankState ) }