Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

2014-04-06 19:15:29 +01:00
parent 89f78b0b80 fe4930212c
commit 73b380d8d2
7 changed files with 48 additions and 33 deletions
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -502,7 +502,7 @@
  #endif

  #if MOTHERBOARD == 35
-    #define CONTROLLERFAN_PIN  10 //Pin used for the fan to cool controller
+    #define CONTROLLERFAN_PIN  -1 //Pin used for the fan to cool controller
  #endif

  #define PS_ON_PIN          12