zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83 from phord/tempfix

Browse source 
Add explicit #define for bogus temp override
This commit is contained in:
ErikZalm 2012-02-27 08:36:45 -08:00
parent de37b2264a b65ef8d66c
commit 1ebe7d1ab6
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/Configuration.h
View file

@ -19,6 +19,7 @@
// Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics" // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
// Gen7 v1.1, v1.2 = 11 // Gen7 v1.1, v1.2 = 11
// Gen7 v1.3 = 12 // Gen7 v1.3 = 12
// Gen7 v1.4 = 13
// MEGA/RAMPS up to 1.2 = 3 // MEGA/RAMPS up to 1.2 = 3
// RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan) // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
// RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed) // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)

22
Marlin/pins.h
View file

@ -45,13 +45,19 @@
#endif /* 99 */ #endif /* 99 */
/**************************************************************************************** /****************************************************************************************
* Gen7 v1.1, v1.2, v1.3 pin assignment * Gen7 v1.1, v1.2, v1.3, v1.4 pin assignment
* *
****************************************************************************************/ ****************************************************************************************/
#if MOTHERBOARD == 13
#define MOTHERBOARD 11
#define GEN7_VERSION 14 // v1.4
#endif
#if MOTHERBOARD == 12 #if MOTHERBOARD == 12
#define MOTHERBOARD 11 #define MOTHERBOARD 11
#define GEN7_V_1_3 #define GEN7_VERSION 13 // v1.3
#endif #endif
#if MOTHERBOARD == 11 #if MOTHERBOARD == 11
@ -62,6 +68,10 @@
#endif #endif
#ifndef GEN7_VERSION
#define GEN7_VERSION 12 // v1.x
#endif
//x axis pins //x axis pins
#define X_STEP_PIN 19 #define X_STEP_PIN 19
#define X_DIR_PIN 18 #define X_DIR_PIN 18
@ -103,7 +113,7 @@
#define SDSS -1 // SCL pin of I2C header #define SDSS -1 // SCL pin of I2C header
#define LED_PIN -1 #define LED_PIN -1
#ifdef GEN7_V_1_3 #if (GEN7_VERSION >= 13)
// Gen7 v1.3 removed the fan pin // Gen7 v1.3 removed the fan pin
#define FAN_PIN -1 #define FAN_PIN -1
#else #else
@ -111,6 +121,12 @@
#endif #endif
#define PS_ON_PIN 15 #define PS_ON_PIN 15
#if (GEN7_VERSION < 14)
// 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
#endif
//our pin for debugging. //our pin for debugging.
#define DEBUG_PIN 0 #define DEBUG_PIN 0

4
Marlin/temperature.cpp
View file

@ -851,7 +851,7 @@ ISR(TIMER0_COMPB_vect)
for(unsigned char e = 0; e < EXTRUDERS; e++) { for(unsigned char e = 0; e < EXTRUDERS; e++) {
if(current_raw[e] >= maxttemp[e]) { if(current_raw[e] >= maxttemp[e]) {
target_raw[e] = 0; target_raw[e] = 0;
#if (PS_ON != -1) #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
{ {
max_temp_error(e); max_temp_error(e);
kill();; kill();;
@ -860,7 +860,7 @@ ISR(TIMER0_COMPB_vect)
} }
if(current_raw[e] <= minttemp[e]) { if(current_raw[e] <= minttemp[e]) {
target_raw[e] = 0; target_raw[e] = 0;
#if (PS_ON != -1) #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
{ {
min_temp_error(e); min_temp_error(e);
kill(); kill();