From 7b2550a604e33da35b88176381c044a396eb0392 Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Mon, 30 Mar 2015 01:58:46 +0200
Subject: [PATCH] Times can't be negative.
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
---
Marlin/temperature.cpp | 15 +++++++++++++--
Marlin/temperature.h | 18 ++++--------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 18f9d6c004..d0720c5ec2 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -83,6 +83,17 @@ unsigned char soft_pwm_bed;
#ifdef FILAMENT_SENSOR
int current_raw_filwidth = 0; //Holds measured filament diameter - one extruder only
#endif
+#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0
+void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc);
+static int thermal_runaway_state_machine[4]; // = {0,0,0,0};
+static unsigned long thermal_runaway_timer[4]; // = {0,0,0,0};
+static bool thermal_runaway = false;
+#if TEMP_SENSOR_BED != 0
+ static int thermal_runaway_bed_state_machine;
+ static unsigned long thermal_runaway_bed_timer;
+#endif
+#endif
+
//===========================================================================
//=============================private variables============================
//===========================================================================
@@ -1100,8 +1111,8 @@ void disable_heater() {
}
#ifdef HEATER_0_USES_MAX6675
- #define MAX6675_HEAT_INTERVAL 250
- long max6675_previous_millis = MAX6675_HEAT_INTERVAL;
+ #define MAX6675_HEAT_INTERVAL 250u
+ unsigned long max6675_previous_millis = MAX6675_HEAT_INTERVAL;
int max6675_temp = 2000;
static int read_max6675() {
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 853179be52..79146a3556 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -146,16 +146,10 @@ void disable_heater();
void setWatch();
void updatePID();
-#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0
-void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc);
-static int thermal_runaway_state_machine[4]; // = {0,0,0,0};
-static unsigned long thermal_runaway_timer[4]; // = {0,0,0,0};
-static bool thermal_runaway = false;
-#if TEMP_SENSOR_BED != 0
- static int thermal_runaway_bed_state_machine;
- static unsigned long thermal_runaway_bed_timer;
-#endif
-#endif
+void PID_autotune(float temp, int extruder, int ncycles);
+
+void setExtruderAutoFanState(int pin, bool state);
+void checkExtruderAutoFans();
FORCE_INLINE void autotempShutdown() {
#ifdef AUTOTEMP
@@ -167,9 +161,5 @@ FORCE_INLINE void autotempShutdown() {
#endif
}
-void PID_autotune(float temp, int extruder, int ncycles);
-
-void setExtruderAutoFanState(int pin, bool state);
-void checkExtruderAutoFans();
#endif