Permalink
Browse files

clean up and changes from testing

  • Loading branch information...
1 parent eb06a88 commit d197f8504b2bd8ff2872f4b562b8b2465b296090 @markfinn committed Sep 18, 2012
Showing with 8 additions and 5 deletions.
  1. +3 −4 Marlin/Marlin.pde
  2. +5 −1 Marlin/temperature.cpp
View
@@ -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;
View
@@ -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)

0 comments on commit d197f85

Please sign in to comment.