瀏覽代碼

Fix Planner::unskew parity with skew

Scott Lahteine 6 年之前
父節點
當前提交
368c124de8
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3
    3
      Marlin/src/module/planner.h

+ 3
- 3
Marlin/src/module/planner.h 查看文件

@@ -353,8 +353,8 @@ class Planner {
353 353
 
354 354
       FORCE_INLINE static void skew(float &cx, float &cy, const float &cz) {
355 355
         if (WITHIN(cx, X_MIN_POS + 1, X_MAX_POS) && WITHIN(cy, Y_MIN_POS + 1, Y_MAX_POS)) {
356
-          const float sx = cx - (cy * xy_skew_factor) - (cz * (xz_skew_factor - (xy_skew_factor * yz_skew_factor))),
357
-                      sy = cy - (cz * yz_skew_factor);
356
+          const float sx = cx - cy * xy_skew_factor - cz * (xz_skew_factor - (xy_skew_factor * yz_skew_factor)),
357
+                      sy = cy - cz * yz_skew_factor;
358 358
           if (WITHIN(sx, X_MIN_POS, X_MAX_POS) && WITHIN(sy, Y_MIN_POS, Y_MAX_POS)) {
359 359
             cx = sx; cy = sy;
360 360
           }
@@ -363,7 +363,7 @@ class Planner {
363 363
 
364 364
       FORCE_INLINE static void unskew(float &cx, float &cy, const float &cz) {
365 365
         if (WITHIN(cx, X_MIN_POS, X_MAX_POS) && WITHIN(cy, Y_MIN_POS, Y_MAX_POS)) {
366
-          const float sx = cx + cy * xy_skew_factor + cz * xz_skew_factor,
366
+          const float sx = cx + cy * xy_skew_factor + cz * (xz_skew_factor - (xy_skew_factor * yz_skew_factor)),
367 367
                       sy = cy + cz * yz_skew_factor;
368 368
           if (WITHIN(sx, X_MIN_POS, X_MAX_POS) && WITHIN(sy, Y_MIN_POS, Y_MAX_POS)) {
369 369
             cx = sx; cy = sy;

Loading…
取消
儲存