MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Follow-up the PR #3643(Temperature singleton)

Browse Source 
Follow-up the PR #3643(Temperature singleton)

・Change from fanSpeedSoftPwm[0] to thermalManager.fanSpeedSoftPwm[0] in planner.cpp
It fix compilation error when FAN_SOFT_PWM is enabled.

・Remove declaration of setExtruderAutoFanState() in temperature.h
Because that function was abolished.

・Change from babystepsTodo to thermalManager.babystepsTodo in ultralcd.cpp
It fix compilation errors when BABYSTEPPING is enabled.
This commit is contained in:
esenapaj 2016-05-05 18:01:39 +09:00
parent 4f6120f70f
commit 1a97442d19
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/planner.cpp
View File

@ -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

1
Marlin/temperature.h
View File

@ -313,7 +313,6 @@ class Temperature {
int read_max6675();
#endif
void setExtruderAutoFanState(int pin, bool state);
void checkExtruderAutoFans();
float get_pid_output(int e);

18
Marlin/ultralcd.cpp
View File

@ -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;