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

Merge branch 'master' into master

This commit is contained in:
Afroboltski 2022-04-24 23:50:31 +12:00 committed by GitHub
parent 91e6e33ece 97f8ef795a
commit 73badbce8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
speeduino/auxiliaries.ino
View File

@ -323,6 +323,70 @@ void fanControl()
BIT_CLEAR(currentStatus.status4, BIT_STATUS4_FAN);
}
#if defined(PWM_FAN_AVAILABLE)
if(currentStatus.fanDuty == 0)
{
//Make sure fan has 0% duty)
FAN_OFF();
BIT_CLEAR(currentStatus.status4, BIT_STATUS4_FAN);
DISABLE_FAN_TIMER();
}
else if (currentStatus.fanDuty == 200)
{
//Make sure fan has 100% duty
FAN_ON();
BIT_SET(currentStatus.status4, BIT_STATUS4_FAN);
DISABLE_FAN_TIMER();
}
#else //Just in case if user still has selected PWM fan in TS, even though it warns that it doesn't work on mega.
if(currentStatus.fanDuty == 0)
{
//Make sure fan has 0% duty)
FAN_OFF();
BIT_CLEAR(currentStatus.status4, BIT_STATUS4_FAN);
}
else if (currentStatus.fanDuty > 0)
{
//Make sure fan has 100% duty
FAN_ON();
BIT_SET(currentStatus.status4, BIT_STATUS4_FAN);
}
#endif
}
else if( configPage2.fanEnable == 2 )// PWM Fan control
{
bool fanPermit = false;
if ( configPage2.fanWhenOff == true) { fanPermit = true; }
else { fanPermit = BIT_CHECK(currentStatus.engine, BIT_ENGINE_RUN); }
if (fanPermit == true)
{
if(BIT_CHECK(currentStatus.engine, BIT_ENGINE_CRANK) && (configPage2.fanWhenCranking == 0))
{
currentStatus.fanDuty = 0; //If the user has elected to disable the fan during cranking, make sure it's off
BIT_CLEAR(currentStatus.status4, BIT_STATUS4_FAN);
#if defined(PWM_FAN_AVAILABLE)//PWM fan not available on Arduino MEGA
DISABLE_FAN_TIMER();
#endif
}
else
{
currentStatus.fanDuty = table2D_getValue(&fanPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //In normal situation read PWM duty from the table
#if defined(PWM_FAN_AVAILABLE)
fan_pwm_value = halfPercentage(currentStatus.fanDuty, fan_pwm_max_count); //update FAN PWM value last
if (currentStatus.fanDuty > 0)
{
ENABLE_FAN_TIMER();
BIT_SET(currentStatus.status4, BIT_STATUS4_FAN);
}
#endif
}
}
else if (!fanPermit)
{
currentStatus.fanDuty = 0; ////If the user has elected to disable the fan when engine is not running, make sure it's off
BIT_CLEAR(currentStatus.status4, BIT_STATUS4_FAN);
}
#if defined(PWM_FAN_AVAILABLE)
if(currentStatus.fanDuty == 0)
{

1
speeduino/logger.h
View File

@ -245,6 +245,7 @@ const char* const header_table[] PROGMEM = { header_0,\
header_86,\
header_87,\
header_88,\
/*
header_89,\
/*
header_90,\