Browse Source

Added FAN_PIN -1 checks

Erik van der Zalm 13 years ago
parent
commit
61e09e6be2
2 changed files with 16 additions and 4 deletions
  1. 6
    2
      Marlin/planner.cpp
  2. 10
    2
      Marlin/ultralcd.pde

+ 6
- 2
Marlin/planner.cpp View File

437
     }
437
     }
438
   }
438
   }
439
   else {
439
   else {
440
-    if (FanSpeed != 0) analogWrite(FAN_PIN,FanSpeed); // If buffer is empty use current fan speed
440
+    #if FAN_PIN > -1
441
+      if (FanSpeed != 0) analogWrite(FAN_PIN,FanSpeed); // If buffer is empty use current fan speed
442
+    #endif
441
   }
443
   }
442
   if((DISABLE_X) && (x_active == 0)) disable_x();
444
   if((DISABLE_X) && (x_active == 0)) disable_x();
443
   if((DISABLE_Y) && (y_active == 0)) disable_y();
445
   if((DISABLE_Y) && (y_active == 0)) disable_y();
444
   if((DISABLE_Z) && (z_active == 0)) disable_z();
446
   if((DISABLE_Z) && (z_active == 0)) disable_z();
445
   if((DISABLE_E) && (e_active == 0)) { disable_e0();disable_e1();disable_e2(); }
447
   if((DISABLE_E) && (e_active == 0)) { disable_e0();disable_e1();disable_e2(); }
446
-  if((FanSpeed == 0) && (fan_speed ==0)) analogWrite(FAN_PIN, 0);
448
+  #if FAN_PIN > -1
449
+    if((FanSpeed == 0) && (fan_speed ==0)) analogWrite(FAN_PIN, 0);
450
+  #endif
447
   if (FanSpeed != 0 && tail_fan_speed !=0) { 
451
   if (FanSpeed != 0 && tail_fan_speed !=0) { 
448
     analogWrite(FAN_PIN,tail_fan_speed);
452
     analogWrite(FAN_PIN,tail_fan_speed);
449
   }
453
   }

+ 10
- 2
Marlin/ultralcd.pde View File

505
       MENUITEM(  lcdprintPGM(MSG_SET_ORIGIN)  ,  BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
505
       MENUITEM(  lcdprintPGM(MSG_SET_ORIGIN)  ,  BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
506
       break;
506
       break;
507
     case ItemP_preheat_pla:
507
     case ItemP_preheat_pla:
508
-      MENUITEM(  lcdprintPGM(MSG_PREHEAT_PLA)  ,  BLOCK;setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP);setTargetBed(PLA_PREHEAT_HPB_TEMP);analogWrite(FAN_PIN, PLA_PREHEAT_FAN_SPEED); beepshort(); ) ;
508
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT_PLA)  ,  BLOCK;setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP);setTargetBed(PLA_PREHEAT_HPB_TEMP);
509
+      #if FAN_PIN > -1
510
+        analogWrite(FAN_PIN, PLA_PREHEAT_FAN_SPEED);
511
+      #endif
512
+      beepshort(); );
509
       break;
513
       break;
510
     case ItemP_preheat_abs:
514
     case ItemP_preheat_abs:
511
-      MENUITEM(  lcdprintPGM(MSG_PREHEAT_ABS)  ,  BLOCK;setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP);setTargetBed(ABS_PREHEAT_HPB_TEMP); analogWrite(FAN_PIN, ABS_PREHEAT_FAN_SPEED); beepshort(); ) ;
515
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT_ABS)  ,  BLOCK;setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP);setTargetBed(ABS_PREHEAT_HPB_TEMP); 
516
+      #if FAN_PIN > -1
517
+        analogWrite(FAN_PIN, ABS_PREHEAT_FAN_SPEED);
518
+      #endif
519
+      beepshort(); );
512
       break;
520
       break;
513
     case ItemP_cooldown:
521
     case ItemP_cooldown:
514
       MENUITEM(  lcdprintPGM(MSG_COOLDOWN)  ,  BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ;
522
       MENUITEM(  lcdprintPGM(MSG_COOLDOWN)  ,  BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ;

Loading…
Cancel
Save