SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3681 from esenapaj/patch-1

Browse source 
Follow-up the PR #3643(Temperature singleton)
This commit is contained in:
Scott Lahteine 2016-05-05 12:47:06 -07:00
commit 0c7beb832c
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 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

1
Marlin/temperature.h
View file

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

18
Marlin/ultralcd.cpp
View file

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