Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1 #4278

Merged
merged 4 commits into from
Jul 12, 2016
Merged

Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1 #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11dcbae
Only a single E axis. Can tool-change reseed position[E_AXIS]?
thinkyhead Jul 12, 2016
bf9967c
Apply HOTEND_INDEX in MILLISECONDS_PREHEAT_TIME
thinkyhead Jul 12, 2016
3d78b69
Single PID dataset with HOTENDS == 1
thinkyhead Jul 12, 2016
809da99
Apply HOTEND_INDEX in preheat methods
thinkyhead Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions Marlin/temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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];
}
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
35 changes: 24 additions & 11 deletions Marlin/temperature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,21 @@ 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

static float Kp, Ki, Kd;
#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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -306,9 +319,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
Expand Down