|
@@ -658,12 +658,11 @@ void Planner::check_axes_activity() {
|
658
|
658
|
rx = dx + X_TILT_FULCRUM;
|
659
|
659
|
ry = dy + Y_TILT_FULCRUM;
|
660
|
660
|
|
661
|
|
- #else
|
|
661
|
+ #elif HAS_MESH
|
662
|
662
|
|
663
|
663
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
664
|
664
|
const float fade_scaling_factor = fade_scaling_factor_for_z(rz);
|
665
|
|
- if (!fade_scaling_factor) return;
|
666
|
|
- #elif HAS_MESH
|
|
665
|
+ #else
|
667
|
666
|
constexpr float fade_scaling_factor = 1.0;
|
668
|
667
|
#endif
|
669
|
668
|
|
|
@@ -672,18 +671,16 @@ void Planner::check_axes_activity() {
|
672
|
671
|
#endif
|
673
|
672
|
|
674
|
673
|
rz += (
|
675
|
|
- #if ENABLED(AUTO_BED_LEVELING_UBL)
|
676
|
|
- ubl.get_z_correction(rx, ry) * fade_scaling_factor
|
677
|
|
- #elif ENABLED(MESH_BED_LEVELING)
|
|
674
|
+ #if ENABLED(MESH_BED_LEVELING)
|
678
|
675
|
mbl.get_z(rx, ry
|
679
|
676
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
680
|
677
|
, fade_scaling_factor
|
681
|
678
|
#endif
|
682
|
679
|
)
|
|
680
|
+ #elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
681
|
+ fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(rx, ry) : 0.0
|
683
|
682
|
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
684
|
|
- bilinear_z_offset(raw) * fade_scaling_factor
|
685
|
|
- #else
|
686
|
|
- 0
|
|
683
|
+ fade_scaling_factor ? fade_scaling_factor * bilinear_z_offset(raw) : 0.0
|
687
|
684
|
#endif
|
688
|
685
|
);
|
689
|
686
|
|
|
@@ -692,13 +689,7 @@ void Planner::check_axes_activity() {
|
692
|
689
|
|
693
|
690
|
void Planner::unapply_leveling(float raw[XYZ]) {
|
694
|
691
|
|
695
|
|
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
696
|
|
- const float fade_scaling_factor = fade_scaling_factor_for_z(raw[Z_AXIS]);
|
697
|
|
- #else
|
698
|
|
- constexpr float fade_scaling_factor = 1.0;
|
699
|
|
- #endif
|
700
|
|
-
|
701
|
|
- if (leveling_active && fade_scaling_factor) {
|
|
692
|
+ if (leveling_active) {
|
702
|
693
|
|
703
|
694
|
#if ABL_PLANAR
|
704
|
695
|
|
|
@@ -712,25 +703,29 @@ void Planner::check_axes_activity() {
|
712
|
703
|
raw[X_AXIS] = dx + X_TILT_FULCRUM;
|
713
|
704
|
raw[Y_AXIS] = dy + Y_TILT_FULCRUM;
|
714
|
705
|
|
715
|
|
- #else // !ABL_PLANAR
|
|
706
|
+ #elif HAS_MESH
|
|
707
|
+
|
|
708
|
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
709
|
+ const float fade_scaling_factor = fade_scaling_factor_for_z(raw[Z_AXIS]);
|
|
710
|
+ #else
|
|
711
|
+ constexpr float fade_scaling_factor = 1.0;
|
|
712
|
+ #endif
|
716
|
713
|
|
717
|
714
|
raw[Z_AXIS] -= (
|
718
|
|
- #if ENABLED(AUTO_BED_LEVELING_UBL)
|
719
|
|
- ubl.get_z_correction(raw[X_AXIS], raw[Y_AXIS]) * fade_scaling_factor
|
720
|
|
- #elif ENABLED(MESH_BED_LEVELING)
|
|
715
|
+ #if ENABLED(MESH_BED_LEVELING)
|
721
|
716
|
mbl.get_z(raw[X_AXIS], raw[Y_AXIS]
|
722
|
717
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
723
|
718
|
, fade_scaling_factor
|
724
|
719
|
#endif
|
725
|
720
|
)
|
|
721
|
+ #elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
722
|
+ fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw[X_AXIS], raw[Y_AXIS]) : 0.0
|
726
|
723
|
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
727
|
|
- bilinear_z_offset(raw) * fade_scaling_factor
|
728
|
|
- #else
|
729
|
|
- 0
|
|
724
|
+ fade_scaling_factor ? fade_scaling_factor * bilinear_z_offset(raw) : 0.0
|
730
|
725
|
#endif
|
731
|
726
|
);
|
732
|
727
|
|
733
|
|
- #endif // !ABL_PLANAR
|
|
728
|
+ #endif
|
734
|
729
|
}
|
735
|
730
|
|
736
|
731
|
#if ENABLED(SKEW_CORRECTION)
|