Index: firmware/App/Controllers/PermeateTank.c =================================================================== diff -u -r3475e61837973cd54b99c24fce8e6085d340aad2 -rb110edbfea44736075d89212a7529df6df64e521 --- firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision 3475e61837973cd54b99c24fce8e6085d340aad2) +++ firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision b110edbfea44736075d89212a7529df6df64e521) @@ -34,9 +34,9 @@ #define PERMEATE_TANK_PUMP_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) for permeate tank broadcast #define PERMEATE_TANK_PUBLISH_COUNTER_START_COUNT 9 ///< Publishing counter offset -#define PERMEATE_TANK_FILL_SWITCH_MS ( 10 * MS_PER_SECOND ) ///< state switch timeout in fill state ( in ms ) -#define PERMEATE_TANK_FULL_SWITCH_MS ( 1 * MS_PER_SECOND ) ///< state switch timeout in full state (in ms) -#define PERMEATE_TANK_FULL_TIMEOUT_MS ( 60 * MS_PER_SECOND ) ///< timeout being in full state too long ( in ms ) +#define PERMEATE_TANK_FILL_SWITCH_MS ( 10 * MS_PER_SECOND ) ///< State switch timeout in fill state ( in ms ) +#define PERMEATE_TANK_FULL_SWITCH_MS ( 1 * MS_PER_SECOND ) ///< State switch timeout in full state (in ms) +#define PERMEATE_TANK_FULL_TIMEOUT_MS ( 60 * MS_PER_SECOND ) ///< Timeout being in full state too long ( in ms ) #define PERMEATE_TANK_FILL_RO_PUMP_TGT_FLOW_ML 750 ///< Flow target in ml/min for the ro pump during permeate tank fill state. // ********** private data ********** @@ -331,7 +331,6 @@ setValveState( P39_VALV, VALVE_STATE_OPEN ); setValveState( P20_VALV, VALVE_STATE_CLOSED ); setValveState( P43_VALV, VALVE_STATE_CLOSED ); -// setROPumpTargetFlowRateMLPM( PERMEATE_TANK_FILL_RO_PUMP_TGT_FLOW_ML, TRUE ); tankFillDelayTime = getMSTimerCount(); break; @@ -346,7 +345,6 @@ setValveState( P39_VALV, VALVE_STATE_CLOSED ); setValveState( P20_VALV, VALVE_STATE_CLOSED ); setValveState( P43_VALV, VALVE_STATE_CLOSED ); -// setROPumpTargetDutyCycle( getCurrentROPumpDutyCyclePCT(), TRUE ); tankFullDelayTime = getMSTimerCount(); tankFullAlarmTimeout = getMSTimerCount(); break;