From 11dcbae7a2954acc2add6448eda66e848d665fff Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 11 Jul 2016 22:06:44 -0700
Subject: [PATCH 1/4] Only a single E axis. Can tool-change reseed
position[E_AXIS]?
---
Marlin/temperature.cpp | 26 ++++++++++++++------------
Marlin/temperature.h | 2 +-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 1aff9b37e510..aa0ff790953a 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -128,7 +128,7 @@ volatile bool Temperature::temp_meas_ready = false;
#if ENABLED(PID_ADD_EXTRUSION_RATE)
float Temperature::cTerm[HOTENDS];
- long Temperature::last_position[HOTENDS];
+ long Temperature::last_e_position;
long Temperature::lpq[LPQ_MAX_LEN];
int Temperature::lpq_ptr = 0;
#endif
@@ -444,11 +444,11 @@ Temperature::Temperature() { }
void Temperature::updatePID() {
#if ENABLED(PIDTEMP)
+ #if ENABLED(PID_ADD_EXTRUSION_RATE)
+ last_e_position = 0;
+ #endif
HOTEND_LOOP() {
temp_iState_max[e] = (PID_INTEGRAL_DRIVE_MAX) / PID_PARAM(Ki, e);
- #if ENABLED(PID_ADD_EXTRUSION_RATE)
- last_position[e] = 0;
- #endif
}
#endif
#if ENABLED(PIDTEMPBED)
@@ -531,10 +531,8 @@ float Temperature::get_pid_output(int e) {
#if HOTENDS == 1
UNUSED(e);
#define _HOTEND_TEST true
- #define _HOTEND_EXTRUDER active_extruder
#else
#define _HOTEND_TEST e == active_extruder
- #define _HOTEND_EXTRUDER e
#endif
float pid_output;
#if ENABLED(PIDTEMP)
@@ -566,14 +564,14 @@ float Temperature::get_pid_output(int e) {
cTerm[HOTEND_INDEX] = 0;
if (_HOTEND_TEST) {
long e_position = stepper.position(E_AXIS);
- if (e_position > last_position[_HOTEND_EXTRUDER]) {
- lpq[lpq_ptr++] = e_position - last_position[_HOTEND_EXTRUDER];
- last_position[_HOTEND_EXTRUDER] = e_position;
+ if (e_position > last_e_position) {
+ lpq[lpq_ptr] = e_position - last_e_position;
+ last_e_position = e_position;
}
else {
- lpq[lpq_ptr++] = 0;
+ lpq[lpq_ptr] = 0;
}
- if (lpq_ptr >= lpq_len) lpq_ptr = 0;
+ if (++lpq_ptr >= lpq_len) lpq_ptr = 0;
cTerm[HOTEND_INDEX] = (lpq[lpq_ptr] / planner.axis_steps_per_mm[E_AXIS]) * PID_PARAM(Kc, HOTEND_INDEX);
pid_output += cTerm[HOTEND_INDEX];
}
@@ -952,7 +950,7 @@ void Temperature::init() {
temp_iState_min[e] = 0.0;
temp_iState_max[e] = (PID_INTEGRAL_DRIVE_MAX) / PID_PARAM(Ki, e);
#if ENABLED(PID_ADD_EXTRUSION_RATE)
- last_position[e] = 0;
+ last_e_position = 0;
#endif
#endif //PIDTEMP
#if ENABLED(PIDTEMPBED)
@@ -961,6 +959,10 @@ void Temperature::init() {
#endif //PIDTEMPBED
}
+ #if ENABLED(PIDTEMP) && ENABLED(PID_ADD_EXTRUSION_RATE)
+ last_e_position = 0;
+ #endif
+
#if HAS_HEATER_0
SET_OUTPUT(HEATER_0_PIN);
#endif
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index dbb434362710..6c2c3e582fb2 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -150,7 +150,7 @@ class Temperature {
#if ENABLED(PID_ADD_EXTRUSION_RATE)
static float cTerm[HOTENDS];
- static long last_position[HOTENDS];
+ static long last_e_position;
static long lpq[LPQ_MAX_LEN];
static int lpq_ptr;
#endif
From bf9967c65d21a354d0bdbfff76f942beb13037c3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 11 Jul 2016 22:07:43 -0700
Subject: [PATCH 2/4] Apply HOTEND_INDEX in MILLISECONDS_PREHEAT_TIME
---
Marlin/temperature.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 6c2c3e582fb2..6e4419acacf4 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -306,9 +306,9 @@ class Temperature {
#endif
#ifdef MILLISECONDS_PREHEAT_TIME
if (celsius == 0.0f)
- reset_preheat_time(hotend);
- else if (target_temperature[hotend] == 0.0f)
- start_preheat_time(hotend);
+ reset_preheat_time(HOTEND_INDEX);
+ else if (target_temperature[HOTEND_INDEX] == 0.0f)
+ start_preheat_time(HOTEND_INDEX);
#endif
target_temperature[HOTEND_INDEX] = celsius;
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
From 3d78b690e56bcbc31639297cf3a175c5d50caece Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 11 Jul 2016 22:08:14 -0700
Subject: [PATCH 3/4] Single PID dataset with HOTENDS == 1
---
Marlin/temperature.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 6e4419acacf4..6fa7821f2828 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -76,13 +76,13 @@ class Temperature {
#if ENABLED(PIDTEMP)
- #if ENABLED(PID_PARAMS_PER_HOTEND)
+ #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
static float Kp[HOTENDS], Ki[HOTENDS], Kd[HOTENDS];
#if ENABLED(PID_ADD_EXTRUSION_RATE)
static float Kc[HOTENDS];
#endif
- #define PID_PARAM(param, e) Temperature::param[e]
+ #define PID_PARAM(param, h) Temperature::param[h]
#else
@@ -90,7 +90,7 @@ class Temperature {
#if ENABLED(PID_ADD_EXTRUSION_RATE)
static float Kc;
#endif
- #define PID_PARAM(param, e) Temperature::param
+ #define PID_PARAM(param, h) Temperature::param
#endif // PID_PARAMS_PER_HOTEND
From 809da999dcf16ce54354b420e7828e522dd9339d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 11 Jul 2016 22:08:47 -0700
Subject: [PATCH 4/4] Apply HOTEND_INDEX in preheat methods
---
Marlin/temperature.h | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 6fa7821f2828..fd737bc6a9c7 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -247,11 +247,24 @@ class Temperature {
* Preheating hotends
*/
#ifdef MILLISECONDS_PREHEAT_TIME
- static bool is_preheating(uint8_t hotend) {
- return preheat_end_time[hotend] && PENDING(millis(), preheat_end_time[hotend]);
+ static bool is_preheating(uint8_t e) {
+ #if HOTENDS == 1
+ UNUSED(e);
+ #endif
+ return preheat_end_time[HOTEND_INDEX] && PENDING(millis(), preheat_end_time[HOTEND_INDEX]);
+ }
+ static void start_preheat_time(uint8_t e) {
+ #if HOTENDS == 1
+ UNUSED(e);
+ #endif
+ preheat_end_time[HOTEND_INDEX] = millis() + MILLISECONDS_PREHEAT_TIME;
+ }
+ static void reset_preheat_time(uint8_t e) {
+ #if HOTENDS == 1
+ UNUSED(e);
+ #endif
+ preheat_end_time[HOTEND_INDEX] = 0;
}
- static void start_preheat_time(uint8_t hotend) { preheat_end_time[hotend] = millis() + MILLISECONDS_PREHEAT_TIME; }
- static void reset_preheat_time(uint8_t hotend) { preheat_end_time[hotend] = 0; }
#else
#define is_preheating(n) (false)
#endif