josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove code duplication for babystep insertion

This commit is contained in:
Yuri D'Elia 2021-01-29 19:05:32 +01:00
parent 019c818c05
commit 28e9c814fc
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Firmware/temperature.h
View File

@ -99,13 +99,10 @@ extern bool bedPWMDisabled;
float unscalePID_d(float d); float unscalePID_d(float d);
#endif #endif
#ifdef BABYSTEPPING
extern volatile int babystepsTodo[3];
#endif
void resetPID(uint8_t extruder);
#ifdef BABYSTEPPING
extern volatile int babystepsTodo[3];
inline void babystepsTodoZadd(int n) inline void babystepsTodoZadd(int n)
{ {
@ -115,15 +112,9 @@ inline void babystepsTodoZadd(int n)
CRITICAL_SECTION_END CRITICAL_SECTION_END
} }
} }
#endif
inline void babystepsTodoZsubtract(int n) void resetPID(uint8_t extruder);
{
if (n != 0) {
CRITICAL_SECTION_START
babystepsTodo[Z_AXIS] -= n;
CRITICAL_SECTION_END
}
}
//high level conversion routines, for use outside of temperature.cpp //high level conversion routines, for use outside of temperature.cpp
//inline so that there is no performance decrease. //inline so that there is no performance decrease.

7
Firmware/ultralcd.cpp
View File

@ -3113,12 +3113,7 @@ static void lcd_babystep_z()
if (_md->babystepMemZ < Z_BABYSTEP_MIN) _md->babystepMemZ = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm if (_md->babystepMemZ < Z_BABYSTEP_MIN) _md->babystepMemZ = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm
else if (_md->babystepMemZ > Z_BABYSTEP_MAX) _md->babystepMemZ = Z_BABYSTEP_MAX; //0 else if (_md->babystepMemZ > Z_BABYSTEP_MAX) _md->babystepMemZ = Z_BABYSTEP_MAX; //0
else else babystepsTodoZadd(lcd_encoder);
{
CRITICAL_SECTION_START
babystepsTodo[Z_AXIS] += (int)lcd_encoder;
CRITICAL_SECTION_END
}
_md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_unit[Z_AXIS]; _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_unit[Z_AXIS];
_delay(50); _delay(50);