Browse Source

Merge pull request #525 from lajos/ultralcd_pid

ultralcd.cpp compile errors when !defined(PIDTEMP)
ErikZalm 12 years ago
parent
commit
171719f18c
1 changed files with 6 additions and 0 deletions
  1. 6
    0
      Marlin/ultralcd.cpp

+ 6
- 0
Marlin/ultralcd.cpp View File

505
 
505
 
506
 static void lcd_control_temperature_menu()
506
 static void lcd_control_temperature_menu()
507
 {
507
 {
508
+#ifdef PIDTEMP
508
     // set up temp variables - undo the default scaling
509
     // set up temp variables - undo the default scaling
509
     raw_Ki = unscalePID_i(Ki);
510
     raw_Ki = unscalePID_i(Ki);
510
     raw_Kd = unscalePID_d(Kd);
511
     raw_Kd = unscalePID_d(Kd);
512
+#endif
511
 
513
 
512
     START_MENU();
514
     START_MENU();
513
     MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
515
     MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
1252
 // grab the pid i value out of the temp variable; scale it; then update the PID driver
1254
 // grab the pid i value out of the temp variable; scale it; then update the PID driver
1253
 void copy_and_scalePID_i()
1255
 void copy_and_scalePID_i()
1254
 {
1256
 {
1257
+#ifdef PIDTEMP
1255
   Ki = scalePID_i(raw_Ki);
1258
   Ki = scalePID_i(raw_Ki);
1256
   updatePID();
1259
   updatePID();
1260
+#endif
1257
 }
1261
 }
1258
 
1262
 
1259
 // Callback for after editing PID d value
1263
 // Callback for after editing PID d value
1260
 // grab the pid d value out of the temp variable; scale it; then update the PID driver
1264
 // grab the pid d value out of the temp variable; scale it; then update the PID driver
1261
 void copy_and_scalePID_d()
1265
 void copy_and_scalePID_d()
1262
 {
1266
 {
1267
+#ifdef PIDTEMP
1263
   Kd = scalePID_d(raw_Kd);
1268
   Kd = scalePID_d(raw_Kd);
1264
   updatePID();
1269
   updatePID();
1270
+#endif
1265
 }
1271
 }
1266
 
1272
 
1267
 #endif //ULTRA_LCD
1273
 #endif //ULTRA_LCD

Loading…
Cancel
Save