Merge pull request #3681 from esenapaj/patch-1
Follow-up the PR #3643(Temperature singleton)
This commit is contained in:
commit
0c7beb832c
@ -421,13 +421,13 @@ void Planner::check_axes_activity() {
|
|||||||
|
|
||||||
#if ENABLED(FAN_SOFT_PWM)
|
#if ENABLED(FAN_SOFT_PWM)
|
||||||
#if HAS_FAN0
|
#if HAS_FAN0
|
||||||
fanSpeedSoftPwm[0] = CALC_FAN_SPEED(0);
|
thermalManager.fanSpeedSoftPwm[0] = CALC_FAN_SPEED(0);
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN1
|
#if HAS_FAN1
|
||||||
fanSpeedSoftPwm[1] = CALC_FAN_SPEED(1);
|
thermalManager.fanSpeedSoftPwm[1] = CALC_FAN_SPEED(1);
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN2
|
#if HAS_FAN2
|
||||||
fanSpeedSoftPwm[2] = CALC_FAN_SPEED(2);
|
thermalManager.fanSpeedSoftPwm[2] = CALC_FAN_SPEED(2);
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#if HAS_FAN0
|
#if HAS_FAN0
|
||||||
|
@ -313,7 +313,6 @@ class Temperature {
|
|||||||
int read_max6675();
|
int read_max6675();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void setExtruderAutoFanState(int pin, bool state);
|
|
||||||
void checkExtruderAutoFans();
|
void checkExtruderAutoFans();
|
||||||
|
|
||||||
float get_pid_output(int e);
|
float get_pid_output(int e);
|
||||||
|
@ -562,25 +562,25 @@ void lcd_set_home_offsets() {
|
|||||||
#if ENABLED(BABYSTEP_XY)
|
#if ENABLED(BABYSTEP_XY)
|
||||||
switch(axis) {
|
switch(axis) {
|
||||||
case X_AXIS: // X on CoreXY and CoreXZ
|
case X_AXIS: // X on CoreXY and CoreXZ
|
||||||
babystepsTodo[A_AXIS] += distance * 2;
|
thermalManager.babystepsTodo[A_AXIS] += distance * 2;
|
||||||
babystepsTodo[CORE_AXIS_2] += distance * 2;
|
thermalManager.babystepsTodo[CORE_AXIS_2] += distance * 2;
|
||||||
break;
|
break;
|
||||||
case CORE_AXIS_2: // Y on CoreXY, Z on CoreXZ
|
case CORE_AXIS_2: // Y on CoreXY, Z on CoreXZ
|
||||||
babystepsTodo[A_AXIS] += distance * 2;
|
thermalManager.babystepsTodo[A_AXIS] += distance * 2;
|
||||||
babystepsTodo[CORE_AXIS_2] -= distance * 2;
|
thermalManager.babystepsTodo[CORE_AXIS_2] -= distance * 2;
|
||||||
break;
|
break;
|
||||||
case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ
|
case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ
|
||||||
babystepsTodo[CORE_AXIS_3] += distance;
|
thermalManager.babystepsTodo[CORE_AXIS_3] += distance;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#elif ENABLED(COREXZ)
|
#elif ENABLED(COREXZ)
|
||||||
babystepsTodo[A_AXIS] += distance * 2;
|
thermalManager.babystepsTodo[A_AXIS] += distance * 2;
|
||||||
babystepsTodo[C_AXIS] -= distance * 2;
|
thermalManager.babystepsTodo[C_AXIS] -= distance * 2;
|
||||||
#else
|
#else
|
||||||
babystepsTodo[Z_AXIS] += distance;
|
thermalManager.babystepsTodo[Z_AXIS] += distance;
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
babystepsTodo[axis] += distance;
|
thermalManager.babystepsTodo[axis] += distance;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
babysteps_done += distance;
|
babysteps_done += distance;
|
||||||
|
Loading…
Reference in New Issue
Block a user