zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 Fix BACKLASH_COMPENSATION compile (#24072)

Browse source 
Followup to #23826
This commit is contained in:
ellensp 2022-04-23 21:16:15 +12:00 committed by Scott Lahteine
parent cea45d49bc
commit 39863d54b0
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Marlin/src/feature/backlash.cpp
View file

@ -162,32 +162,37 @@ int32_t Backlash::get_applied_steps(const AxisEnum axis) {
} }
class Backlash::StepAdjuster { class Backlash::StepAdjuster {
xyz_long_t applied_steps; private:
public: xyz_long_t applied_steps;
StepAdjuster() { public:
LOOP_LINEAR_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis); StepAdjuster() {
} LOOP_LINEAR_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis);
~StepAdjuster() { }
// after backlash compensation parameter changes, ensure applied step count does not change ~StepAdjuster() {
LOOP_LINEAR_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis]; // after backlash compensation parameter changes, ensure applied step count does not change
} LOOP_LINEAR_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis];
}
}; };
void Backlash::set_correction_uint8(const uint8_t v) { #if ENABLED(BACKLASH_GCODE)
StepAdjuster adjuster;
correction = v;
}
void Backlash::set_distance_mm(const AxisEnum axis, const float v) { void Backlash::set_correction_uint8(const uint8_t v) {
StepAdjuster adjuster;
distance_mm[axis] = v;
}
#ifdef BACKLASH_SMOOTHING_MM
void Backlash::set_smoothing_mm(const float v) {
StepAdjuster adjuster; StepAdjuster adjuster;
smoothing_mm = v; correction = v;
} }
void Backlash::set_distance_mm(const AxisEnum axis, const float v) {
StepAdjuster adjuster;
distance_mm[axis] = v;
}
#ifdef BACKLASH_SMOOTHING_MM
void Backlash::set_smoothing_mm(const float v) {
StepAdjuster adjuster;
smoothing_mm = v;
}
#endif
#endif #endif
#if ENABLED(MEASURE_BACKLASH_WHEN_PROBING) #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)