From: Phil Hord <phord@phord.com>
Date: Sun, 26 Feb 2012 23:46:34 +0000 (-0500)
Subject: Add explicit #define for bogus temp override
X-Git-Tag: iwj-success-2012-07-29~83^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=740f0c76902aa6182555b0123b7944b6331604e5;p=marlin.git

Add explicit #define for bogus temp override

The code to ignore the "bad thermistor reading failsafe"
suicide function depends on the existing of the PS_ON pin
feature.  But in some boards this shouldn't be the case
Fix this by adding an explicit definition to make our
intentions more clear and separable.
---

diff --git a/Marlin/pins.h b/Marlin/pins.h
index e950cbe..52aae6b 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -111,6 +111,9 @@
 #endif
 #define PS_ON_PIN 15
 
+// Gen 1.3 and earlier supplied thermistor power via PS_ON
+// Need to ignore the bad thermistor readings on those units
+#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
 //our pin for debugging.
 #define DEBUG_PIN 0
 
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 6efbbd1..069674b 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -851,7 +851,7 @@ ISR(TIMER0_COMPB_vect)
     for(unsigned char e = 0; e < EXTRUDERS; e++) {
        if(current_raw[e] >= maxttemp[e]) {
           target_raw[e] = 0;
-          #if (PS_ON != -1)
+          #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
           {
             max_temp_error(e);
             kill();;
@@ -860,7 +860,7 @@ ISR(TIMER0_COMPB_vect)
        }
        if(current_raw[e] <= minttemp[e]) {
           target_raw[e] = 0;
-          #if (PS_ON != -1)
+          #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
           {
             min_temp_error(e);
             kill();