The two pump sections together should look like this (not tested):
//************************************* PUMP 1
//if the switch is 'not enabled' we can proceed with autmatic operation
if (switch1Flag == !ENABLED)
{
//is it time to toggle the pump relay ?
if (millis() - pump1Millis >= pump1_interval)
{
//restart the TIMER
pump1Millis = millis();
//is pump1 now OFF ?
if (pump1State == PUMPoff)
{
digitalWrite(pump1Relay, PUMPon);
pump1State = PUMPon;
pump1_interval = pump1_ON_time;
}
else
{
digitalWrite(pump1Relay, PUMPoff);
pump1State = PUMPoff;
pump1_interval = pump1_OFF_time;
}
}
} //END of if (switch1Flag == !ENABLED)
//************************************* PUMP 2
//if the switch is 'not enabled' we can proceed with autmatic operation
if (switch2Flag == !ENABLED)
{
//is it time to toggle the pump relay ?
if (millis() - pump2Millis >= pump2_interval)
{
//restart the TIMER
pump2Millis = millis();
//is pump2 now OFF ?
if (pump2State == PUMPoff)
{
digitalWrite(pump2Relay, PUMPon);
pump2State = PUMPon;
pump2_interval = pump2_ON_time;
}
else
{
digitalWrite(pump2Relay, PUMPoff);
pump2State = PUMPoff;
pump2_interval = pump2_OFF_time;
}
}
} //END of if (switch2Flag == !ENABLED)