Browse Source

Merge branch 'Development' into delta_auto_bed_level

maverikou 10 years ago
parent
commit
53abc5e2f1
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      Marlin/Marlin_main.cpp

+ 6
- 6
Marlin/Marlin_main.cpp View File

@@ -5375,18 +5375,18 @@ void controllerFan()
5375 5375
   if ((millis() - lastMotorCheck) >= 2500) //Not a time critical function, so we only check every 2500ms
5376 5376
   {
5377 5377
     lastMotorCheck = millis();
5378
-
5379
-    if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0)
5378
+	
5379
+    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)
5380 5380
     #if EXTRUDERS > 2
5381
-       || !READ(E2_ENABLE_PIN)
5381
+       || (READ(E2_ENABLE_PIN) == (E_ENABLE_ON))
5382 5382
     #endif
5383 5383
     #if EXTRUDER > 1
5384 5384
       #if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
5385
-       || !READ(X2_ENABLE_PIN)
5385
+       || (READ(X2_ENABLE_PIN) == (X_ENABLE_ON))
5386 5386
       #endif
5387
-       || !READ(E1_ENABLE_PIN)
5387
+       || (READ(E1_ENABLE_PIN) == (E_ENABLE_ON))
5388 5388
     #endif
5389
-       || !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled...
5389
+       || (READ(E0_ENABLE_PIN) == (E_ENABLE_ON))) //If any of the drivers are enabled...
5390 5390
     {
5391 5391
       lastMotor = millis(); //... set time to NOW so the fan will turn on
5392 5392
     }

Loading…
Cancel
Save