From d197f8504b2bd8ff2872f4b562b8b2465b296090 Mon Sep 17 00:00:00 2001
From: Mark Finn <mark@mfinn.net>
Date: Mon, 17 Sep 2012 19:18:09 -0500
Subject: [PATCH] clean up and changes from testing

---
 Marlin/Marlin.pde      | 7 +++----
 Marlin/temperature.cpp | 6 +++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 7c5849913..d0ce597dc 100644
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -1000,14 +1000,13 @@ void process_commands()
         SERIAL_ERROR_START;
         SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);
       #endif
-      #ifdef PIDTEMP
+
         SERIAL_PROTOCOLPGM(" @:");
         SERIAL_PROTOCOL(getHeaterPower(tmp_extruder));  
-      #endif
-      #ifdef PIDTEMPBED
+
         SERIAL_PROTOCOLPGM(" B@:");
         SERIAL_PROTOCOL(getHeaterPower(-1));  
-      #endif
+
         SERIAL_PROTOCOLLN("");
       return;
       break;
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 63c681330..66293c7f5 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -99,6 +99,8 @@ static volatile bool temp_meas_ready = false;
   static float pid_error_bed;
   static float temp_iState_min_bed;
   static float temp_iState_max_bed;
+#else //PIDTEMPBED
+	static unsigned long  previous_millis_bed_heater;
 #endif //PIDTEMPBED
   static unsigned char soft_pwm[EXTRUDERS];
   static unsigned char soft_pwm_bed;
@@ -640,9 +642,11 @@ void tp_init()
 #ifdef PIDTEMP
     temp_iState_min[e] = 0.0;
     temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;
+#endif //PIDTEMP
+#ifdef PIDTEMPBED
     temp_iState_min_bed = 0.0;
     temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
-#endif //PIDTEMP
+#endif //PIDTEMPBED
   }
 
   #if (HEATER_0_PIN > -1)