Only set fuel pump on if currently off.

Author: noisymime

speeduino/auxiliaries.h

@@ -40,8 +40,8 @@ void wmiControl(void);
 #define AIRCON_PIN_HIGH()       (digitalWrite(pinAirConComp, HIGH))
 #define AIRCON_FAN_PIN_LOW()    (digitalWrite(pinAirConFan, LOW))
 #define AIRCON_FAN_PIN_HIGH()   (digitalWrite(pinAirConFan, HIGH))
-#define FUEL_PUMP_ON()          (digitalWrite(pinFuelPump, HIGH))
-#define FUEL_PUMP_OFF()         (digitalWrite(pinFuelPump, LOW))
+#define FUEL_PUMP_ON()          { digitalWrite(pinFuelPump, HIGH); currentStatus.fuelPumpOn = true; }
+#define FUEL_PUMP_OFF()         { digitalWrite(pinFuelPump, LOW); currentStatus.fuelPumpOn = false; }
 
 #else
 
@@ -55,8 +55,8 @@ void wmiControl(void);
 #define N2O_STAGE1_PIN_HIGH()   ATOMIC() { *n2o_stage1_pin_port |= (n2o_stage1_pin_mask);   }
 #define N2O_STAGE2_PIN_LOW()    ATOMIC() { *n2o_stage2_pin_port &= ~(n2o_stage2_pin_mask);  }
 #define N2O_STAGE2_PIN_HIGH()   ATOMIC() { *n2o_stage2_pin_port |= (n2o_stage2_pin_mask);   }
-#define FUEL_PUMP_ON()          ATOMIC() { *pump_pin_port |= (pump_pin_mask);     }
-#define FUEL_PUMP_OFF()         ATOMIC() { *pump_pin_port &= ~(pump_pin_mask);    }
+#define FUEL_PUMP_ON()          ATOMIC() { *pump_pin_port |= (pump_pin_mask);  currentStatus.fuelPumpOn = true;    }
+#define FUEL_PUMP_OFF()         ATOMIC() { *pump_pin_port &= ~(pump_pin_mask); currentStatus.fuelPumpOn = false;   }
 
 //Note the below macros cannot use ATOMIC() as they are called from within ternary operators. The ATOMIC is instead placed around the ternary call below
 #define FAN_PIN_LOW()           *fan_pin_port &= ~(fan_pin_mask)

speeduino/init.cpp

@@ -1183,7 +1183,6 @@ void initialiseAll(void)
     if(configPage2.fpPrime > 0)
     {
       FUEL_PUMP_ON();
-      currentStatus.fuelPumpOn = true;
     }
     else { currentStatus.fpPrimed = true; } //If the user has set 0 for the pump priming, immediately mark the priming as being completed
 

speeduino/speeduino.ino

@@ -159,10 +159,9 @@ void __attribute__((always_inline)) loop(void)
       currentStatus.longRPM = getRPM(); //Long RPM is included here
       currentStatus.RPM = currentStatus.longRPM;
       currentStatus.RPMdiv100 = div100(currentStatus.RPM);
-      if(currentStatus.RPM > 0)
+      if( (currentStatus.RPM > 0) && (currentStatus.fuelPumpOn == false) )
       {
         FUEL_PUMP_ON();
-        currentStatus.fuelPumpOn = true;
       }
     }
     else
@@ -184,7 +183,7 @@ void __attribute__((always_inline)) loop(void)
       ignitionCount = 0;
       ignitionChannelsOn = 0;
       fuelChannelsOn = 0;
-      if (currentStatus.fpPrimed == true) { FUEL_PUMP_OFF(); currentStatus.fuelPumpOn = false; } //Turn off the fuel pump, but only if the priming is complete
+      if (currentStatus.fpPrimed == true) { FUEL_PUMP_OFF(); } //Turn off the fuel pump, but only if the priming is complete
       if (configPage6.iacPWMrun == false) { disableIdle(); } //Turn off the idle PWM
       currentStatus.engineIsCranking = false; //Clear cranking bit (Can otherwise get stuck 'on' even with 0 rpm)
       currentStatus.wueIsActive = false; //Same as above except for WUE

speeduino/timers.cpp

@@ -292,8 +292,7 @@ void oneMSInterval(void) //Most ARM chips can simply call a function
         if(currentStatus.RPM == 0)
         {
           //If we reach here then the priming is complete, however only turn off the fuel pump if the engine isn't running
-          digitalWrite(pinFuelPump, LOW);
-          currentStatus.fuelPumpOn = false;
+          FUEL_PUMP_OFF();
         }
       }
     }