CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be consistent in setting of the fan PWM.

Browse Source 
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
This commit is contained in:
Kevin O'Connor 2012-12-09 22:28:09 -05:00
parent 14e1d495ef
commit 3f2f94ef28
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/planner.cpp
View File

@ -438,8 +438,7 @@ void check_axes_activity()
unsigned char y_active = 0; unsigned char y_active = 0;
unsigned char z_active = 0; unsigned char z_active = 0;
unsigned char e_active = 0; unsigned char e_active = 0;
unsigned char fan_speed = 0; unsigned char tail_fan_speed = fanSpeed;
unsigned char tail_fan_speed = 0;
block_t *block; block_t *block;
if(block_buffer_tail != block_buffer_head) if(block_buffer_tail != block_buffer_head)
@ -453,20 +452,9 @@ void check_axes_activity()
if(block->steps_y != 0) y_active++; if(block->steps_y != 0) y_active++;
if(block->steps_z != 0) z_active++; if(block->steps_z != 0) z_active++;
if(block->steps_e != 0) e_active++; if(block->steps_e != 0) e_active++;
if(block->fan_speed != 0) fan_speed++;
block_index = (block_index+1) & (BLOCK_BUFFER_SIZE - 1); block_index = (block_index+1) & (BLOCK_BUFFER_SIZE - 1);
} }
} }
else
{
#if FAN_PIN > -1
#ifndef FAN_SOFT_PWM
if (fanSpeed != 0){
analogWrite(FAN_PIN,fanSpeed); // If buffer is empty use current fan speed
}
#endif
#endif
}
if((DISABLE_X) && (x_active == 0)) disable_x(); if((DISABLE_X) && (x_active == 0)) disable_x();
if((DISABLE_Y) && (y_active == 0)) disable_y(); if((DISABLE_Y) && (y_active == 0)) disable_y();
if((DISABLE_Z) && (z_active == 0)) disable_z(); if((DISABLE_Z) && (z_active == 0)) disable_z();
@ -478,15 +466,7 @@ void check_axes_activity()
} }
#if FAN_PIN > -1 #if FAN_PIN > -1
#ifndef FAN_SOFT_PWM #ifndef FAN_SOFT_PWM
if((fanSpeed == 0) && (fan_speed ==0)) analogWrite(FAN_PIN,tail_fan_speed);
{
analogWrite(FAN_PIN, 0);
}
if (fanSpeed != 0 && tail_fan_speed !=0)
{
analogWrite(FAN_PIN,tail_fan_speed);
}
#endif #endif
#endif #endif
#ifdef AUTOTEMP #ifdef AUTOTEMP

6
Marlin/ultralcd.cpp
View File

@ -221,10 +221,7 @@ void lcd_preheat_pla()
setTargetHotend1(plaPreheatHotendTemp); setTargetHotend1(plaPreheatHotendTemp);
setTargetHotend2(plaPreheatHotendTemp); setTargetHotend2(plaPreheatHotendTemp);
setTargetBed(plaPreheatHPBTemp); setTargetBed(plaPreheatHPBTemp);
#if FAN_PIN > -1
fanSpeed = plaPreheatFanSpeed; fanSpeed = plaPreheatFanSpeed;
analogWrite(FAN_PIN, fanSpeed);
#endif
lcd_return_to_status(); lcd_return_to_status();
} }
@ -234,10 +231,7 @@ void lcd_preheat_abs()
setTargetHotend1(absPreheatHotendTemp); setTargetHotend1(absPreheatHotendTemp);
setTargetHotend2(absPreheatHotendTemp); setTargetHotend2(absPreheatHotendTemp);
setTargetBed(absPreheatHPBTemp); setTargetBed(absPreheatHPBTemp);
#if FAN_PIN > -1
fanSpeed = absPreheatFanSpeed; fanSpeed = absPreheatFanSpeed;
analogWrite(FAN_PIN, fanSpeed);
#endif
lcd_return_to_status(); lcd_return_to_status();
} }