Browse Source

Merge pull request #5033 from esenapaj/Fix-freezing-with-MAX31855

Fix freezing and MINTEMP Error with MAX31855 thermocouple
Scott Lahteine 8 years ago
parent
commit
6ae5cf17a9
2 changed files with 8 additions and 9 deletions
  1. 3
    1
      Marlin/Marlin_main.cpp
  2. 5
    8
      Marlin/temperature.cpp

+ 3
- 1
Marlin/Marlin_main.cpp View File

9737
       safe_delay(BOOTSCREEN_TIMEOUT);
9737
       safe_delay(BOOTSCREEN_TIMEOUT);
9738
     #elif ENABLED(ULTRA_LCD)
9738
     #elif ENABLED(ULTRA_LCD)
9739
       bootscreen();
9739
       bootscreen();
9740
-      lcd_init();
9740
+      #if DISABLED(SDSUPPORT)
9741
+        lcd_init();
9742
+      #endif
9741
     #endif
9743
     #endif
9742
   #endif
9744
   #endif
9743
 
9745
 

+ 5
- 8
Marlin/temperature.cpp View File

1001
 
1001
 
1002
   #if ENABLED(HEATER_0_USES_MAX6675)
1002
   #if ENABLED(HEATER_0_USES_MAX6675)
1003
 
1003
 
1004
-    #if DISABLED(SDSUPPORT)
1005
-      OUT_WRITE(SCK_PIN, LOW);
1006
-      OUT_WRITE(MOSI_PIN, HIGH);
1007
-      SET_INPUT(MISO_PIN);
1008
-      WRITE(MISO_PIN,1);
1009
-    #else
1010
-      OUT_WRITE(SS_PIN, HIGH);
1011
-    #endif
1004
+    OUT_WRITE(SCK_PIN, LOW);
1005
+    OUT_WRITE(MOSI_PIN, HIGH);
1006
+    SET_INPUT(MISO_PIN);
1007
+    WRITE(MISO_PIN, HIGH);
1008
+    OUT_WRITE(SS_PIN, HIGH);
1012
 
1009
 
1013
     OUT_WRITE(MAX6675_SS, HIGH);
1010
     OUT_WRITE(MAX6675_SS, HIGH);
1014
 
1011
 

Loading…
Cancel
Save