From 7d03c52511ed599c494163099966d891e225d666 Mon Sep 17 00:00:00 2001 From: lajos Date: Sat, 15 Jun 2013 18:09:52 -0400 Subject: [PATCH 1/2] fixed compile error in ultralcd.cpp when PIDTEMP undefined --- Marlin/ultralcd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 4a9042116..8ab6ce05f 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1252,16 +1252,20 @@ char *ftostr52(const float &x) // grab the pid i value out of the temp variable; scale it; then update the PID driver void copy_and_scalePID_i() { +#ifdef PIDTEMP Ki = scalePID_i(raw_Ki); updatePID(); +#endif } // Callback for after editing PID d value // grab the pid d value out of the temp variable; scale it; then update the PID driver void copy_and_scalePID_d() { +#ifdef PIDTEMP Kd = scalePID_d(raw_Kd); updatePID(); +#endif } #endif //ULTRA_LCD From b519af4f05a6b1f131dd56496351fc64752d74fa Mon Sep 17 00:00:00 2001 From: lajos Date: Sat, 15 Jun 2013 20:49:18 -0400 Subject: [PATCH 2/2] fixed another !defined(PIDTEMP) compile in ultralcd.cpp --- Marlin/ultralcd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 8ab6ce05f..c08628799 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -505,9 +505,11 @@ static void lcd_control_menu() static void lcd_control_temperature_menu() { +#ifdef PIDTEMP // set up temp variables - undo the default scaling raw_Ki = unscalePID_i(Ki); raw_Kd = unscalePID_d(Kd); +#endif START_MENU(); MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);