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

Merge pull request #1 from MarlinFirmware/Development

Browse Source 
update
This commit is contained in:
Mehmet Sutas 2015-03-09 11:05:49 +02:00
commit 956fb2d278
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -5100,18 +5100,18 @@ void controllerFan()
if ((millis() - lastMotorCheck) >= 2500) //Not a time critical function, so we only check every 2500ms if ((millis() - lastMotorCheck) >= 2500) //Not a time critical function, so we only check every 2500ms
{ {
lastMotorCheck = millis(); lastMotorCheck = millis();
if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0) if((READ(X_ENABLE_PIN) == (X_ENABLE_ON)) || (READ(Y_ENABLE_PIN) == (Y_ENABLE_ON)) || (READ(Z_ENABLE_PIN) == (Z_ENABLE_ON)) || (soft_pwm_bed > 0)
#if EXTRUDERS > 2 #if EXTRUDERS > 2
|| !READ(E2_ENABLE_PIN) || (READ(E2_ENABLE_PIN) == (E_ENABLE_ON))
#endif #endif
#if EXTRUDER > 1 #if EXTRUDER > 1
#if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1 #if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
|| !READ(X2_ENABLE_PIN) || (READ(X2_ENABLE_PIN) == (X_ENABLE_ON))
#endif #endif
|| !READ(E1_ENABLE_PIN) || (READ(E1_ENABLE_PIN) == (E_ENABLE_ON))
#endif #endif
|| !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled... || (READ(E0_ENABLE_PIN) == (E_ENABLE_ON))) //If any of the drivers are enabled...
{ {
lastMotor = millis(); //... set time to NOW so the fan will turn on lastMotor = millis(); //... set time to NOW so the fan will turn on
} }

2
Marlin/example_configurations/delta/Configuration.h
View File

@ -1,4 +1,4 @@
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define CONFIGURATION_H #define CONFIGURATION_H
#include "boards.h" #include "boards.h"