melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Fix freezing and MINTEMP Error with MAX31855 thermocouple
This commit is contained in:
Scott Lahteine 2016-10-17 16:22:20 -05:00 committed by GitHub
commit 6ae5cf17a9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -9737,7 +9737,9 @@ void setup() {
safe_delay(BOOTSCREEN_TIMEOUT); safe_delay(BOOTSCREEN_TIMEOUT);
#elif ENABLED(ULTRA_LCD) #elif ENABLED(ULTRA_LCD)
bootscreen(); bootscreen();
lcd_init(); #if DISABLED(SDSUPPORT)
lcd_init();
#endif
#endif #endif
#endif #endif

13
Marlin/temperature.cpp
View File

@ -1001,14 +1001,11 @@ void Temperature::init() {
#if ENABLED(HEATER_0_USES_MAX6675) #if ENABLED(HEATER_0_USES_MAX6675)
#if DISABLED(SDSUPPORT) OUT_WRITE(SCK_PIN, LOW);
OUT_WRITE(SCK_PIN, LOW); OUT_WRITE(MOSI_PIN, HIGH);
OUT_WRITE(MOSI_PIN, HIGH); SET_INPUT(MISO_PIN);
SET_INPUT(MISO_PIN); WRITE(MISO_PIN, HIGH);
WRITE(MISO_PIN,1); OUT_WRITE(SS_PIN, HIGH);
#else
OUT_WRITE(SS_PIN, HIGH);
#endif
OUT_WRITE(MAX6675_SS, HIGH); OUT_WRITE(MAX6675_SS, HIGH);