Skip to content

Commit

Permalink
Merge pull request #4291 from esenapaj/Follow-up-the-PR-#4278
Browse files Browse the repository at this point in the history
Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1)
  • Loading branch information
thinkyhead authored Jul 13, 2016
2 parents f23689d + c2c8ab4 commit ed89c71
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Marlin/configuration_store.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ void Config_ResetDefault() {
#endif

#if ENABLED(PIDTEMP)
#if ENABLED(PID_PARAMS_PER_HOTEND)
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
HOTEND_LOOP()
#else
int e = 0; UNUSED(e); // only need to write once
Expand Down
2 changes: 1 addition & 1 deletion Marlin/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ unsigned char Temperature::soft_pwm_bed;
#endif

#if ENABLED(PIDTEMP)
#if ENABLED(PID_PARAMS_PER_HOTEND)
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp),
Temperature::Ki[HOTENDS] = ARRAY_BY_HOTENDS1((DEFAULT_Ki) * (PID_dT)),
Temperature::Kd[HOTENDS] = ARRAY_BY_HOTENDS1((DEFAULT_Kd) / (PID_dT));
Expand Down

0 comments on commit ed89c71

Please sign in to comment.