SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #525 from lajos/ultralcd_pid

Browse source 
ultralcd.cpp compile errors when !defined(PIDTEMP)
This commit is contained in:
ErikZalm 2013-06-16 00:02:54 -07:00
commit 171719f18c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/ultralcd.cpp
View file

@ -505,9 +505,11 @@ static void lcd_control_menu()
static void lcd_control_temperature_menu() static void lcd_control_temperature_menu()
{ {
#ifdef PIDTEMP
// set up temp variables - undo the default scaling // set up temp variables - undo the default scaling
raw_Ki = unscalePID_i(Ki); raw_Ki = unscalePID_i(Ki);
raw_Kd = unscalePID_d(Kd); raw_Kd = unscalePID_d(Kd);
#endif
START_MENU(); START_MENU();
MENU_ITEM(back, MSG_CONTROL, lcd_control_menu); MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
@ -1252,16 +1254,20 @@ char *ftostr52(const float &x)
// grab the pid i value out of the temp variable; scale it; then update the PID driver // grab the pid i value out of the temp variable; scale it; then update the PID driver
void copy_and_scalePID_i() void copy_and_scalePID_i()
{ {
#ifdef PIDTEMP
Ki = scalePID_i(raw_Ki); Ki = scalePID_i(raw_Ki);
updatePID(); updatePID();
#endif
} }
// Callback for after editing PID d value // Callback for after editing PID d value
// grab the pid d value out of the temp variable; scale it; then update the PID driver // grab the pid d value out of the temp variable; scale it; then update the PID driver
void copy_and_scalePID_d() void copy_and_scalePID_d()
{ {
#ifdef PIDTEMP
Kd = scalePID_d(raw_Kd); Kd = scalePID_d(raw_Kd);
updatePID(); updatePID();
#endif
} }
#endif //ULTRA_LCD #endif //ULTRA_LCD