Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1

2012-02-21 20:17:35 +01:00
parent a0a1f81913 8a8ea50f33
commit 2cc9a89830
42 changed files with 17069 additions and 119 deletions
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -226,11 +226,11 @@ void setup_photpin()
 void setup_powerhold()
 {
 #ifdef SUICIDE_PIN
-    #if (SUICIDE_PIN> -1) 
+   #if (SUICIDE_PIN> -1)
      SET_OUTPUT(SUICIDE_PIN);
      WRITE(SUICIDE_PIN, HIGH);
-    #endif
-  #endif
+   #endif
+ #endif
 }

 void suicide()