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

Follow-up the PR #3643(Temperature singleton) #3681

Merged
merged 1 commit into from May 5, 2016
Merged

Follow-up the PR #3643(Temperature singleton) #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Marlin/planner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,13 +421,13 @@ void Planner::check_axes_activity() {

#if ENABLED(FAN_SOFT_PWM)
#if HAS_FAN0
fanSpeedSoftPwm[0] = CALC_FAN_SPEED(0);
thermalManager.fanSpeedSoftPwm[0] = CALC_FAN_SPEED(0);
#endif
#if HAS_FAN1
fanSpeedSoftPwm[1] = CALC_FAN_SPEED(1);
thermalManager.fanSpeedSoftPwm[1] = CALC_FAN_SPEED(1);
#endif
#if HAS_FAN2
fanSpeedSoftPwm[2] = CALC_FAN_SPEED(2);
thermalManager.fanSpeedSoftPwm[2] = CALC_FAN_SPEED(2);
#endif
#else
#if HAS_FAN0
Expand Down
1 change: 0 additions & 1 deletion Marlin/temperature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ class Temperature {
int read_max6675();
#endif

void setExtruderAutoFanState(int pin, bool state);
void checkExtruderAutoFans();

float get_pid_output(int e);
Expand Down
18 changes: 9 additions & 9 deletions Marlin/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,25 +562,25 @@ void lcd_set_home_offsets() {
#if ENABLED(BABYSTEP_XY)
switch(axis) {
case X_AXIS: // X on CoreXY and CoreXZ
babystepsTodo[A_AXIS] += distance * 2;
babystepsTodo[CORE_AXIS_2] += distance * 2;
thermalManager.babystepsTodo[A_AXIS] += distance * 2;
thermalManager.babystepsTodo[CORE_AXIS_2] += distance * 2;
break;
case CORE_AXIS_2: // Y on CoreXY, Z on CoreXZ
babystepsTodo[A_AXIS] += distance * 2;
babystepsTodo[CORE_AXIS_2] -= distance * 2;
thermalManager.babystepsTodo[A_AXIS] += distance * 2;
thermalManager.babystepsTodo[CORE_AXIS_2] -= distance * 2;
break;
case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ
babystepsTodo[CORE_AXIS_3] += distance;
thermalManager.babystepsTodo[CORE_AXIS_3] += distance;
break;
}
#elif ENABLED(COREXZ)
babystepsTodo[A_AXIS] += distance * 2;
babystepsTodo[C_AXIS] -= distance * 2;
thermalManager.babystepsTodo[A_AXIS] += distance * 2;
thermalManager.babystepsTodo[C_AXIS] -= distance * 2;
#else
babystepsTodo[Z_AXIS] += distance;
thermalManager.babystepsTodo[Z_AXIS] += distance;
#endif
#else
babystepsTodo[axis] += distance;
thermalManager.babystepsTodo[axis] += distance;
#endif

babysteps_done += distance;
Expand Down