noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved fan on/off logic

This commit is contained in:
Josh Stewart 2016-10-27 07:03:42 +11:00
parent 0d4994f884
commit 8b95fe891a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
auxiliaries.ino
View File

@ -10,15 +10,22 @@ Fan control
*/ */
void initialiseFan() void initialiseFan()
{ {
if(configPage4.fanInv == 1) {fanHIGH = LOW, fanLOW = HIGH; } if(configPage4.fanInv) { fanHIGH = LOW, fanLOW = HIGH; }
else {fanHIGH = HIGH, fanLOW = LOW;} else { fanHIGH = HIGH, fanLOW = LOW; }
digitalWrite(pinFan, fanLOW); //Initiallise program with the fan in the off state digitalWrite(pinFan, fanLOW); //Initiallise program with the fan in the off state
currentStatus.fanOn = false;
} }
void fanControl() void fanControl()
{ {
if (currentStatus.coolant >= (configPage4.fanSP - CALIBRATION_TEMPERATURE_OFFSET)) { digitalWrite(pinFan,fanHIGH); } if(configPage4.fanEnable)
else if (currentStatus.coolant <= (configPage4.fanSP - configPage4.fanHyster)) { digitalWrite(pinFan, fanLOW); } {
int onTemp = (int)configPage4.fanSP - CALIBRATION_TEMPERATURE_OFFSET;
int offTemp = onTemp - configPage4.fanHyster;
if (!currentStatus.fanOn && currentStatus.coolant >= onTemp) { digitalWrite(pinFan,fanHIGH); currentStatus.fanOn = true; }
if (currentStatus.fanOn && currentStatus.coolant <= offTemp) { digitalWrite(pinFan, fanLOW); currentStatus.fanOn = false; }
}
} }
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)

1
globals.h
View File

@ -139,6 +139,7 @@ struct statuses {
byte launchCorrection; //The amount of correction being applied if launch control is active byte launchCorrection; //The amount of correction being applied if launch control is active
byte afrTarget; byte afrTarget;
byte idleDuty; byte idleDuty;
bool fanOn; //Whether or not the fan is turned on
byte flex; //Ethanol reading (if enabled). 0 = No ethanol, 100 = pure ethanol. Eg E85 = 85. byte flex; //Ethanol reading (if enabled). 0 = No ethanol, 100 = pure ethanol. Eg E85 = 85.
unsigned long TAEEndTime; //The target end time used whenever TAE is turned on unsigned long TAEEndTime; //The target end time used whenever TAE is turned on
volatile byte squirt; volatile byte squirt;