From c610471b0c8b2dc8c14ec84a25387ea15d6c4cd5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 20 Feb 2015 00:00:19 -0800
Subject: [PATCH] Add PID_PARAMS_PER_EXTRUDER conditional
---
Marlin/ultralcd.cpp | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index dd758724d8..99108fee38 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -806,6 +806,7 @@ static void lcd_control_menu()
}
#ifdef PIDTEMP
+
// Helpers for editing PID Ki & Kd values
// grab the PID value out of the temp variable; scale it; then update the PID driver
void copy_and_scalePID_i(int e) {
@@ -818,19 +819,22 @@ static void lcd_control_menu()
}
void copy_and_scalePID_i_E1() { copy_and_scalePID_i(0); }
void copy_and_scalePID_d_E1() { copy_and_scalePID_d(0); }
- #if EXTRUDERS > 1
- void copy_and_scalePID_i_E2() { copy_and_scalePID_i(1); }
- void copy_and_scalePID_d_E2() { copy_and_scalePID_d(1); }
- #if EXTRUDERS > 2
- void copy_and_scalePID_i_E3() { copy_and_scalePID_i(2); }
- void copy_and_scalePID_d_E3() { copy_and_scalePID_d(2); }
- #if EXTRUDERS > 3
- void copy_and_scalePID_i_E4() { copy_and_scalePID_i(3); }
- void copy_and_scalePID_d_E5() { copy_and_scalePID_d(3); }
- #endif
- #endif
- #endif
-#endif
+ #ifdef PID_PARAMS_PER_EXTRUDER
+ #if EXTRUDERS > 1
+ void copy_and_scalePID_i_E2() { copy_and_scalePID_i(1); }
+ void copy_and_scalePID_d_E2() { copy_and_scalePID_d(1); }
+ #if EXTRUDERS > 2
+ void copy_and_scalePID_i_E3() { copy_and_scalePID_i(2); }
+ void copy_and_scalePID_d_E3() { copy_and_scalePID_d(2); }
+ #if EXTRUDERS > 3
+ void copy_and_scalePID_i_E4() { copy_and_scalePID_i(3); }
+ void copy_and_scalePID_d_E5() { copy_and_scalePID_d(3); }
+ #endif //EXTRUDERS > 3
+ #endif //EXTRUDERS > 2
+ #endif //EXTRUDERS > 1
+ #endif //PID_PARAMS_PER_EXTRUDER
+
+#endif //PIDTEMP
static void lcd_control_temperature_menu()
{
--
GitLab