Browse Source

BEZIER_JERK_CONTROL => S_CURVE_ACCELERATION

Scott Lahteine 6 years ago
parent
commit
aaaf09bda2
74 changed files with 159 additions and 225 deletions
  1. 1
    1
      .travis.yml
  2. 2
    3
      Marlin/Configuration.h
  3. 2
    3
      Marlin/src/config/default/Configuration.h
  4. 2
    3
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  5. 2
    3
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  6. 2
    3
      Marlin/src/config/examples/Anet/A6/Configuration.h
  7. 2
    3
      Marlin/src/config/examples/Anet/A8/Configuration.h
  8. 2
    3
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  9. 2
    3
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  10. 2
    3
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  11. 2
    3
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  12. 2
    3
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  13. 2
    3
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  14. 2
    3
      Marlin/src/config/examples/Cartesio/Configuration.h
  15. 2
    3
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  16. 2
    3
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  17. 2
    3
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  18. 2
    3
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  19. 2
    3
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  20. 2
    3
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  21. 2
    3
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  22. 2
    3
      Marlin/src/config/examples/Felix/Configuration.h
  23. 2
    3
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  24. 2
    3
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  25. 2
    3
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  26. 2
    3
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  27. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  28. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  29. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  30. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  31. 2
    3
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  32. 2
    3
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  33. 2
    3
      Marlin/src/config/examples/MakerParts/Configuration.h
  34. 2
    3
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  35. 2
    3
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  36. 2
    3
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  37. 2
    3
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  38. 2
    3
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  39. 2
    3
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  40. 2
    3
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  41. 2
    3
      Marlin/src/config/examples/RigidBot/Configuration.h
  42. 2
    3
      Marlin/src/config/examples/SCARA/Configuration.h
  43. 2
    3
      Marlin/src/config/examples/STM32F10/Configuration.h
  44. 2
    3
      Marlin/src/config/examples/STM32F4/Configuration.h
  45. 2
    3
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  46. 2
    3
      Marlin/src/config/examples/TheBorg/Configuration.h
  47. 2
    3
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  48. 2
    3
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  49. 2
    3
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  50. 2
    3
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  51. 2
    3
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  52. 2
    3
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  53. 2
    3
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  54. 2
    3
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  55. 2
    3
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  56. 2
    3
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  57. 2
    3
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  58. 2
    3
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  59. 2
    3
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  60. 2
    3
      Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
  61. 2
    3
      Marlin/src/config/examples/delta/generic/Configuration.h
  62. 2
    3
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  63. 2
    3
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  64. 2
    3
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  65. 2
    3
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  66. 2
    3
      Marlin/src/config/examples/makibox/Configuration.h
  67. 2
    3
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  68. 2
    3
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  69. 2
    3
      Marlin/src/config/examples/wt150/Configuration.h
  70. 2
    0
      Marlin/src/inc/SanityCheck.h
  71. 7
    7
      Marlin/src/module/planner.cpp
  72. 2
    2
      Marlin/src/module/planner.h
  73. 8
    8
      Marlin/src/module/stepper.cpp
  74. 3
    3
      Marlin/src/module/stepper.h

+ 1
- 1
.travis.yml View File

@@ -453,7 +453,7 @@ script:
453 453
   - export TEST_PLATFORM="-e DUE"
454 454
   - restore_configs
455 455
   - opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
456
-  - opt_set BEZIER_JERK_CONTROL
456
+  - opt_set S_CURVE_ACCELERATION
457 457
   - cp Marlin/Configuration.h Marlin/src/config/default/Configuration.h
458 458
   - cp Marlin/Configuration_adv.h Marlin/src/config/default/Configuration_adv.h
459 459
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}

+ 2
- 3
Marlin/Configuration.h View File

@@ -639,15 +639,14 @@
639 639
 #define DEFAULT_EJERK                  5.0
640 640
 
641 641
 /**
642
- * Realtime Jerk Control
642
+ * S-Curve Acceleration
643 643
  *
644 644
  * This option eliminates vibration during printing by fitting a Bézier
645 645
  * curve to move acceleration, producing much smoother direction changes.
646
- * Because this is computationally-intensive, a 32-bit MCU is required.
647 646
  *
648 647
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
649 648
  */
650
-//#define BEZIER_JERK_CONTROL
649
+//#define S_CURVE_ACCELERATION
651 650
 
652 651
 //===========================================================================
653 652
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/default/Configuration.h View File

@@ -639,15 +639,14 @@
639 639
 #define DEFAULT_EJERK                  5.0
640 640
 
641 641
 /**
642
- * Realtime Jerk Control
642
+ * S-Curve Acceleration
643 643
  *
644 644
  * This option eliminates vibration during printing by fitting a Bézier
645 645
  * curve to move acceleration, producing much smoother direction changes.
646
- * Because this is computationally-intensive, a 32-bit MCU is required.
647 646
  *
648 647
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
649 648
  */
650
-//#define BEZIER_JERK_CONTROL
649
+//#define S_CURVE_ACCELERATION
651 650
 
652 651
 //===========================================================================
653 652
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

@@ -658,15 +658,14 @@
658 658
 #define DEFAULT_EJERK                 10.0
659 659
 
660 660
 /**
661
- * Realtime Jerk Control
661
+ * S-Curve Acceleration
662 662
  *
663 663
  * This option eliminates vibration during printing by fitting a Bézier
664 664
  * curve to move acceleration, producing much smoother direction changes.
665
- * Because this is computationally-intensive, a 32-bit MCU is required.
666 665
  *
667 666
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
668 667
  */
669
-//#define BEZIER_JERK_CONTROL
668
+//#define S_CURVE_ACCELERATION
670 669
 
671 670
 //===========================================================================
672 671
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Anet/A6/Configuration.h View File

@@ -686,15 +686,14 @@
686 686
 #define DEFAULT_EJERK                  5.0
687 687
 
688 688
 /**
689
- * Realtime Jerk Control
689
+ * S-Curve Acceleration
690 690
  *
691 691
  * This option eliminates vibration during printing by fitting a Bézier
692 692
  * curve to move acceleration, producing much smoother direction changes.
693
- * Because this is computationally-intensive, a 32-bit MCU is required.
694 693
  *
695 694
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
696 695
  */
697
-//#define BEZIER_JERK_CONTROL
696
+//#define S_CURVE_ACCELERATION
698 697
 
699 698
 //===========================================================================
700 699
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Anet/A8/Configuration.h View File

@@ -645,15 +645,14 @@
645 645
 #define DEFAULT_EJERK                  5.0
646 646
 
647 647
 /**
648
- * Realtime Jerk Control
648
+ * S-Curve Acceleration
649 649
  *
650 650
  * This option eliminates vibration during printing by fitting a Bézier
651 651
  * curve to move acceleration, producing much smoother direction changes.
652
- * Because this is computationally-intensive, a 32-bit MCU is required.
653 652
  *
654 653
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
655 654
  */
656
-//#define BEZIER_JERK_CONTROL
655
+//#define S_CURVE_ACCELERATION
657 656
 
658 657
 //===========================================================================
659 658
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

@@ -626,15 +626,14 @@
626 626
 #define DEFAULT_EJERK                  5.0
627 627
 
628 628
 /**
629
- * Realtime Jerk Control
629
+ * S-Curve Acceleration
630 630
  *
631 631
  * This option eliminates vibration during printing by fitting a Bézier
632 632
  * curve to move acceleration, producing much smoother direction changes.
633
- * Because this is computationally-intensive, a 32-bit MCU is required.
634 633
  *
635 634
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
636 635
  */
637
-//#define BEZIER_JERK_CONTROL
636
+//#define S_CURVE_ACCELERATION
638 637
 
639 638
 //===========================================================================
640 639
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

@@ -639,15 +639,14 @@
639 639
 #define DEFAULT_EJERK                  1.0
640 640
 
641 641
 /**
642
- * Realtime Jerk Control
642
+ * S-Curve Acceleration
643 643
  *
644 644
  * This option eliminates vibration during printing by fitting a Bézier
645 645
  * curve to move acceleration, producing much smoother direction changes.
646
- * Because this is computationally-intensive, a 32-bit MCU is required.
647 646
  *
648 647
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
649 648
  */
650
-//#define BEZIER_JERK_CONTROL
649
+//#define S_CURVE_ACCELERATION
651 650
 
652 651
 //===========================================================================
653 652
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

@@ -626,15 +626,14 @@
626 626
 #define DEFAULT_EJERK                  5.0
627 627
 
628 628
 /**
629
- * Realtime Jerk Control
629
+ * S-Curve Acceleration
630 630
  *
631 631
  * This option eliminates vibration during printing by fitting a Bézier
632 632
  * curve to move acceleration, producing much smoother direction changes.
633
- * Because this is computationally-intensive, a 32-bit MCU is required.
634 633
  *
635 634
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
636 635
  */
637
-//#define BEZIER_JERK_CONTROL
636
+//#define S_CURVE_ACCELERATION
638 637
 
639 638
 //===========================================================================
640 639
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Cartesio/Configuration.h View File

@@ -637,15 +637,14 @@
637 637
 #define DEFAULT_EJERK                  5.0
638 638
 
639 639
 /**
640
- * Realtime Jerk Control
640
+ * S-Curve Acceleration
641 641
  *
642 642
  * This option eliminates vibration during printing by fitting a Bézier
643 643
  * curve to move acceleration, producing much smoother direction changes.
644
- * Because this is computationally-intensive, a 32-bit MCU is required.
645 644
  *
646 645
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
647 646
  */
648
-//#define BEZIER_JERK_CONTROL
647
+//#define S_CURVE_ACCELERATION
649 648
 
650 649
 //===========================================================================
651 650
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

@@ -648,15 +648,14 @@
648 648
 #define DEFAULT_EJERK                  5.0
649 649
 
650 650
 /**
651
- * Realtime Jerk Control
651
+ * S-Curve Acceleration
652 652
  *
653 653
  * This option eliminates vibration during printing by fitting a Bézier
654 654
  * curve to move acceleration, producing much smoother direction changes.
655
- * Because this is computationally-intensive, a 32-bit MCU is required.
656 655
  *
657 656
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
658 657
  */
659
-//#define BEZIER_JERK_CONTROL
658
+//#define S_CURVE_ACCELERATION
660 659
 
661 660
 //===========================================================================
662 661
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/CR-10S/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h View File

@@ -657,15 +657,14 @@
657 657
 #define DEFAULT_EJERK                  5.0
658 658
 
659 659
 /**
660
- * Realtime Jerk Control
660
+ * S-Curve Acceleration
661 661
  *
662 662
  * This option eliminates vibration during printing by fitting a Bézier
663 663
  * curve to move acceleration, producing much smoother direction changes.
664
- * Because this is computationally-intensive, a 32-bit MCU is required.
665 664
  *
666 665
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
667 666
  */
668
-//#define BEZIER_JERK_CONTROL
667
+//#define S_CURVE_ACCELERATION
669 668
 
670 669
 //===========================================================================
671 670
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/CR-8/Configuration.h View File

@@ -648,15 +648,14 @@
648 648
 #define DEFAULT_EJERK                  5.0
649 649
 
650 650
 /**
651
- * Realtime Jerk Control
651
+ * S-Curve Acceleration
652 652
  *
653 653
  * This option eliminates vibration during printing by fitting a Bézier
654 654
  * curve to move acceleration, producing much smoother direction changes.
655
- * Because this is computationally-intensive, a 32-bit MCU is required.
656 655
  *
657 656
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
658 657
  */
659
-//#define BEZIER_JERK_CONTROL
658
+//#define S_CURVE_ACCELERATION
660 659
 
661 660
 //===========================================================================
662 661
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/Ender-2/Configuration.h View File

@@ -642,15 +642,14 @@
642 642
 #define DEFAULT_EJERK                  5.0
643 643
 
644 644
 /**
645
- * Realtime Jerk Control
645
+ * S-Curve Acceleration
646 646
  *
647 647
  * This option eliminates vibration during printing by fitting a Bézier
648 648
  * curve to move acceleration, producing much smoother direction changes.
649
- * Because this is computationally-intensive, a 32-bit MCU is required.
650 649
  *
651 650
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
652 651
  */
653
-//#define BEZIER_JERK_CONTROL
652
+//#define S_CURVE_ACCELERATION
654 653
 
655 654
 //===========================================================================
656 655
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/Ender-3/Configuration.h View File

@@ -642,15 +642,14 @@
642 642
 #define DEFAULT_EJERK                  5.0
643 643
 
644 644
 /**
645
- * Realtime Jerk Control
645
+ * S-Curve Acceleration
646 646
  *
647 647
  * This option eliminates vibration during printing by fitting a Bézier
648 648
  * curve to move acceleration, producing much smoother direction changes.
649
- * Because this is computationally-intensive, a 32-bit MCU is required.
650 649
  *
651 650
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
652 651
  */
653
-//#define BEZIER_JERK_CONTROL
652
+//#define S_CURVE_ACCELERATION
654 653
 
655 654
 //===========================================================================
656 655
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Creality/Ender-4/Configuration.h View File

@@ -648,15 +648,14 @@
648 648
 #define DEFAULT_EJERK                  5.0
649 649
 
650 650
 /**
651
- * Realtime Jerk Control
651
+ * S-Curve Acceleration
652 652
  *
653 653
  * This option eliminates vibration during printing by fitting a Bézier
654 654
  * curve to move acceleration, producing much smoother direction changes.
655
- * Because this is computationally-intensive, a 32-bit MCU is required.
656 655
  *
657 656
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
658 657
  */
659
-//#define BEZIER_JERK_CONTROL
658
+//#define S_CURVE_ACCELERATION
660 659
 
661 660
 //===========================================================================
662 661
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Felix/Configuration.h View File

@@ -620,15 +620,14 @@
620 620
 #define DEFAULT_EJERK                  5.0
621 621
 
622 622
 /**
623
- * Realtime Jerk Control
623
+ * S-Curve Acceleration
624 624
  *
625 625
  * This option eliminates vibration during printing by fitting a Bézier
626 626
  * curve to move acceleration, producing much smoother direction changes.
627
- * Because this is computationally-intensive, a 32-bit MCU is required.
628 627
  *
629 628
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
630 629
  */
631
-//#define BEZIER_JERK_CONTROL
630
+//#define S_CURVE_ACCELERATION
632 631
 
633 632
 //===========================================================================
634 633
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

@@ -620,15 +620,14 @@
620 620
 #define DEFAULT_EJERK                  5.0
621 621
 
622 622
 /**
623
- * Realtime Jerk Control
623
+ * S-Curve Acceleration
624 624
  *
625 625
  * This option eliminates vibration during printing by fitting a Bézier
626 626
  * curve to move acceleration, producing much smoother direction changes.
627
- * Because this is computationally-intensive, a 32-bit MCU is required.
628 627
  *
629 628
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
630 629
  */
631
-//#define BEZIER_JERK_CONTROL
630
+//#define S_CURVE_ACCELERATION
632 631
 
633 632
 //===========================================================================
634 633
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h View File

@@ -644,15 +644,14 @@
644 644
 #define DEFAULT_EJERK                  4.0
645 645
 
646 646
 /**
647
- * Realtime Jerk Control
647
+ * S-Curve Acceleration
648 648
  *
649 649
  * This option eliminates vibration during printing by fitting a Bézier
650 650
  * curve to move acceleration, producing much smoother direction changes.
651
- * Because this is computationally-intensive, a 32-bit MCU is required.
652 651
  *
653 652
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
654 653
  */
655
-//#define BEZIER_JERK_CONTROL
654
+//#define S_CURVE_ACCELERATION
656 655
 
657 656
 //===========================================================================
658 657
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

@@ -653,15 +653,14 @@
653 653
 #define DEFAULT_EJERK                  5.0
654 654
 
655 655
 /**
656
- * Realtime Jerk Control
656
+ * S-Curve Acceleration
657 657
  *
658 658
  * This option eliminates vibration during printing by fitting a Bézier
659 659
  * curve to move acceleration, producing much smoother direction changes.
660
- * Because this is computationally-intensive, a 32-bit MCU is required.
661 660
  *
662 661
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
663 662
  */
664
-//#define BEZIER_JERK_CONTROL
663
+//#define S_CURVE_ACCELERATION
665 664
 
666 665
 //===========================================================================
667 666
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  4.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h View File

@@ -653,15 +653,14 @@
653 653
 #define DEFAULT_EJERK                  5.0
654 654
 
655 655
 /**
656
- * Realtime Jerk Control
656
+ * S-Curve Acceleration
657 657
  *
658 658
  * This option eliminates vibration during printing by fitting a Bézier
659 659
  * curve to move acceleration, producing much smoother direction changes.
660
- * Because this is computationally-intensive, a 32-bit MCU is required.
661 660
  *
662 661
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
663 662
  */
664
-//#define BEZIER_JERK_CONTROL
663
+//#define S_CURVE_ACCELERATION
665 664
 
666 665
 //===========================================================================
667 666
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h View File

@@ -653,15 +653,14 @@
653 653
 #define DEFAULT_EJERK                  5.0
654 654
 
655 655
 /**
656
- * Realtime Jerk Control
656
+ * S-Curve Acceleration
657 657
  *
658 658
  * This option eliminates vibration during printing by fitting a Bézier
659 659
  * curve to move acceleration, producing much smoother direction changes.
660
- * Because this is computationally-intensive, a 32-bit MCU is required.
661 660
  *
662 661
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
663 662
  */
664
-//#define BEZIER_JERK_CONTROL
663
+//#define S_CURVE_ACCELERATION
665 664
 
666 665
 //===========================================================================
667 666
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

@@ -642,15 +642,14 @@
642 642
 #define DEFAULT_EJERK                  5.0
643 643
 
644 644
 /**
645
- * Realtime Jerk Control
645
+ * S-Curve Acceleration
646 646
  *
647 647
  * This option eliminates vibration during printing by fitting a Bézier
648 648
  * curve to move acceleration, producing much smoother direction changes.
649
- * Because this is computationally-intensive, a 32-bit MCU is required.
650 649
  *
651 650
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
652 651
  */
653
-//#define BEZIER_JERK_CONTROL
652
+//#define S_CURVE_ACCELERATION
654 653
 
655 654
 //===========================================================================
656 655
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/JGAurora/A5/Configuration.h View File

@@ -650,15 +650,14 @@
650 650
 #define DEFAULT_EJERK                  5.0
651 651
 
652 652
 /**
653
- * Realtime Jerk Control
653
+ * S-Curve Acceleration
654 654
  *
655 655
  * This option eliminates vibration during printing by fitting a Bézier
656 656
  * curve to move acceleration, producing much smoother direction changes.
657
- * Because this is computationally-intensive, a 32-bit MCU is required.
658 657
  *
659 658
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
660 659
  */
661
-//#define BEZIER_JERK_CONTROL
660
+//#define S_CURVE_ACCELERATION
662 661
 
663 662
 //===========================================================================
664 663
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/MakerParts/Configuration.h View File

@@ -658,15 +658,14 @@
658 658
 #define DEFAULT_EJERK                  8.0
659 659
 
660 660
 /**
661
- * Realtime Jerk Control
661
+ * S-Curve Acceleration
662 662
  *
663 663
  * This option eliminates vibration during printing by fitting a Bézier
664 664
  * curve to move acceleration, producing much smoother direction changes.
665
- * Because this is computationally-intensive, a 32-bit MCU is required.
666 665
  *
667 666
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
668 667
  */
669
-//#define BEZIER_JERK_CONTROL
668
+//#define S_CURVE_ACCELERATION
670 669
 
671 670
 //===========================================================================
672 671
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

@@ -658,15 +658,14 @@
658 658
 #define DEFAULT_EJERK                  5.0
659 659
 
660 660
 /**
661
- * Realtime Jerk Control
661
+ * S-Curve Acceleration
662 662
  *
663 663
  * This option eliminates vibration during printing by fitting a Bézier
664 664
  * curve to move acceleration, producing much smoother direction changes.
665
- * Because this is computationally-intensive, a 32-bit MCU is required.
666 665
  *
667 666
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
668 667
  */
669
-//#define BEZIER_JERK_CONTROL
668
+//#define S_CURVE_ACCELERATION
670 669
 
671 670
 //===========================================================================
672 671
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Malyan/M200/Configuration.h View File

@@ -637,15 +637,14 @@
637 637
 #define DEFAULT_EJERK                  5.0
638 638
 
639 639
 /**
640
- * Realtime Jerk Control
640
+ * S-Curve Acceleration
641 641
  *
642 642
  * This option eliminates vibration during printing by fitting a Bézier
643 643
  * curve to move acceleration, producing much smoother direction changes.
644
- * Because this is computationally-intensive, a 32-bit MCU is required.
645 644
  *
646 645
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
647 646
  */
648
-//#define BEZIER_JERK_CONTROL
647
+//#define S_CURVE_ACCELERATION
649 648
 
650 649
 //===========================================================================
651 650
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

@@ -642,15 +642,14 @@
642 642
 #define DEFAULT_EJERK                  5.0
643 643
 
644 644
 /**
645
- * Realtime Jerk Control
645
+ * S-Curve Acceleration
646 646
  *
647 647
  * This option eliminates vibration during printing by fitting a Bézier
648 648
  * curve to move acceleration, producing much smoother direction changes.
649
- * Because this is computationally-intensive, a 32-bit MCU is required.
650 649
  *
651 650
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
652 651
  */
653
-//#define BEZIER_JERK_CONTROL
652
+//#define S_CURVE_ACCELERATION
654 653
 
655 654
 //===========================================================================
656 655
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

@@ -642,15 +642,14 @@
642 642
 #define DEFAULT_EJERK                  5.0
643 643
 
644 644
 /**
645
- * Realtime Jerk Control
645
+ * S-Curve Acceleration
646 646
  *
647 647
  * This option eliminates vibration during printing by fitting a Bézier
648 648
  * curve to move acceleration, producing much smoother direction changes.
649
- * Because this is computationally-intensive, a 32-bit MCU is required.
650 649
  *
651 650
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
652 651
  */
653
-//#define BEZIER_JERK_CONTROL
652
+//#define S_CURVE_ACCELERATION
654 653
 
655 654
 //===========================================================================
656 655
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h View File

@@ -678,15 +678,14 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
678 678
 #define DEFAULT_EJERK                  5.0
679 679
 
680 680
 /**
681
- * Realtime Jerk Control
681
+ * S-Curve Acceleration
682 682
  *
683 683
  * This option eliminates vibration during printing by fitting a Bézier
684 684
  * curve to move acceleration, producing much smoother direction changes.
685
- * Because this is computationally-intensive, a 32-bit MCU is required.
686 685
  *
687 686
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
688 687
  */
689
-//#define BEZIER_JERK_CONTROL
688
+//#define S_CURVE_ACCELERATION
690 689
 
691 690
 //===========================================================================
692 691
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/RigidBot/Configuration.h View File

@@ -636,15 +636,14 @@
636 636
 #define DEFAULT_EJERK                  5.0
637 637
 
638 638
 /**
639
- * Realtime Jerk Control
639
+ * S-Curve Acceleration
640 640
  *
641 641
  * This option eliminates vibration during printing by fitting a Bézier
642 642
  * curve to move acceleration, producing much smoother direction changes.
643
- * Because this is computationally-intensive, a 32-bit MCU is required.
644 643
  *
645 644
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
646 645
  */
647
-//#define BEZIER_JERK_CONTROL
646
+//#define S_CURVE_ACCELERATION
648 647
 
649 648
 //===========================================================================
650 649
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/SCARA/Configuration.h View File

@@ -651,15 +651,14 @@
651 651
 #define DEFAULT_EJERK                  3.0
652 652
 
653 653
 /**
654
- * Realtime Jerk Control
654
+ * S-Curve Acceleration
655 655
  *
656 656
  * This option eliminates vibration during printing by fitting a Bézier
657 657
  * curve to move acceleration, producing much smoother direction changes.
658
- * Because this is computationally-intensive, a 32-bit MCU is required.
659 658
  *
660 659
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
661 660
  */
662
-//#define BEZIER_JERK_CONTROL
661
+//#define S_CURVE_ACCELERATION
663 662
 
664 663
 //===========================================================================
665 664
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/STM32F10/Configuration.h View File

@@ -640,15 +640,14 @@
640 640
 #define DEFAULT_EJERK                  5.0
641 641
 
642 642
 /**
643
- * Realtime Jerk Control
643
+ * S-Curve Acceleration
644 644
  *
645 645
  * This option eliminates vibration during printing by fitting a Bézier
646 646
  * curve to move acceleration, producing much smoother direction changes.
647
- * Because this is computationally-intensive, a 32-bit MCU is required.
648 647
  *
649 648
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
650 649
  */
651
-//#define BEZIER_JERK_CONTROL
650
+//#define S_CURVE_ACCELERATION
652 651
 
653 652
 //===========================================================================
654 653
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/STM32F4/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

@@ -669,15 +669,14 @@
669 669
 #define DEFAULT_EJERK                  5.0
670 670
 
671 671
 /**
672
- * Realtime Jerk Control
672
+ * S-Curve Acceleration
673 673
  *
674 674
  * This option eliminates vibration during printing by fitting a Bézier
675 675
  * curve to move acceleration, producing much smoother direction changes.
676
- * Because this is computationally-intensive, a 32-bit MCU is required.
677 676
  *
678 677
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
679 678
  */
680
-//#define BEZIER_JERK_CONTROL
679
+//#define S_CURVE_ACCELERATION
681 680
 
682 681
 //===========================================================================
683 682
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/TheBorg/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

@@ -689,15 +689,14 @@
689 689
 #define DEFAULT_EJERK                  5.0
690 690
 
691 691
 /**
692
- * Realtime Jerk Control
692
+ * S-Curve Acceleration
693 693
  *
694 694
  * This option eliminates vibration during printing by fitting a Bézier
695 695
  * curve to move acceleration, producing much smoother direction changes.
696
- * Because this is computationally-intensive, a 32-bit MCU is required.
697 696
  *
698 697
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
699 698
  */
700
-//#define BEZIER_JERK_CONTROL
699
+//#define S_CURVE_ACCELERATION
701 700
 
702 701
 //===========================================================================
703 702
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Tronxy/X1/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Tronxy/X5S/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Tronxy/XY100/Configuration.h View File

@@ -649,15 +649,14 @@
649 649
 #define DEFAULT_EJERK                  5.0
650 650
 
651 651
 /**
652
- * Realtime Jerk Control
652
+ * S-Curve Acceleration
653 653
  *
654 654
  * This option eliminates vibration during printing by fitting a Bézier
655 655
  * curve to move acceleration, producing much smoother direction changes.
656
- * Because this is computationally-intensive, a 32-bit MCU is required.
657 656
  *
658 657
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
659 658
  */
660
-//#define BEZIER_JERK_CONTROL
659
+//#define S_CURVE_ACCELERATION
661 660
 
662 661
 //===========================================================================
663 662
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

@@ -667,15 +667,14 @@
667 667
 #define DEFAULT_EJERK                  5.0
668 668
 
669 669
 /**
670
- * Realtime Jerk Control
670
+ * S-Curve Acceleration
671 671
  *
672 672
  * This option eliminates vibration during printing by fitting a Bézier
673 673
  * curve to move acceleration, producing much smoother direction changes.
674
- * Because this is computationally-intensive, a 32-bit MCU is required.
675 674
  *
676 675
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
677 676
  */
678
-//#define BEZIER_JERK_CONTROL
677
+//#define S_CURVE_ACCELERATION
679 678
 
680 679
 //===========================================================================
681 680
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                 20.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                 20.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h View File

@@ -648,15 +648,14 @@
648 648
 #define DEFAULT_EJERK                  1.0
649 649
 
650 650
 /**
651
- * Realtime Jerk Control
651
+ * S-Curve Acceleration
652 652
  *
653 653
  * This option eliminates vibration during printing by fitting a Bézier
654 654
  * curve to move acceleration, producing much smoother direction changes.
655
- * Because this is computationally-intensive, a 32-bit MCU is required.
656 655
  *
657 656
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
658 657
  */
659
-//#define BEZIER_JERK_CONTROL
658
+//#define S_CURVE_ACCELERATION
660 659
 
661 660
 //===========================================================================
662 661
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

@@ -638,15 +638,14 @@
638 638
 #define DEFAULT_EJERK                  5.0
639 639
 
640 640
 /**
641
- * Realtime Jerk Control
641
+ * S-Curve Acceleration
642 642
  *
643 643
  * This option eliminates vibration during printing by fitting a Bézier
644 644
  * curve to move acceleration, producing much smoother direction changes.
645
- * Because this is computationally-intensive, a 32-bit MCU is required.
646 645
  *
647 646
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
648 647
  */
649
-//#define BEZIER_JERK_CONTROL
648
+//#define S_CURVE_ACCELERATION
650 649
 
651 650
 //===========================================================================
652 651
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

@@ -720,15 +720,14 @@
720 720
 #define DEFAULT_EJERK                  5.0
721 721
 
722 722
 /**
723
- * Realtime Jerk Control
723
+ * S-Curve Acceleration
724 724
  *
725 725
  * This option eliminates vibration during printing by fitting a Bézier
726 726
  * curve to move acceleration, producing much smoother direction changes.
727
- * Because this is computationally-intensive, a 32-bit MCU is required.
728 727
  *
729 728
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
730 729
  */
731
-//#define BEZIER_JERK_CONTROL
730
+//#define S_CURVE_ACCELERATION
732 731
 
733 732
 //===========================================================================
734 733
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h View File

@@ -720,15 +720,14 @@
720 720
 #define DEFAULT_EJERK                  5.0
721 721
 
722 722
 /**
723
- * Realtime Jerk Control
723
+ * S-Curve Acceleration
724 724
  *
725 725
  * This option eliminates vibration during printing by fitting a Bézier
726 726
  * curve to move acceleration, producing much smoother direction changes.
727
- * Because this is computationally-intensive, a 32-bit MCU is required.
728 727
  *
729 728
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
730 729
  */
731
-//#define BEZIER_JERK_CONTROL
730
+//#define S_CURVE_ACCELERATION
732 731
 
733 732
 //===========================================================================
734 733
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

@@ -720,15 +720,14 @@
720 720
 #define DEFAULT_EJERK                  5.0
721 721
 
722 722
 /**
723
- * Realtime Jerk Control
723
+ * S-Curve Acceleration
724 724
  *
725 725
  * This option eliminates vibration during printing by fitting a Bézier
726 726
  * curve to move acceleration, producing much smoother direction changes.
727
- * Because this is computationally-intensive, a 32-bit MCU is required.
728 727
  *
729 728
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
730 729
  */
731
-//#define BEZIER_JERK_CONTROL
730
+//#define S_CURVE_ACCELERATION
732 731
 
733 732
 //===========================================================================
734 733
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h View File

@@ -725,15 +725,14 @@
725 725
 #define DEFAULT_EJERK                  5.0
726 726
 
727 727
 /**
728
- * Realtime Jerk Control
728
+ * S-Curve Acceleration
729 729
  *
730 730
  * This option eliminates vibration during printing by fitting a Bézier
731 731
  * curve to move acceleration, producing much smoother direction changes.
732
- * Because this is computationally-intensive, a 32-bit MCU is required.
733 732
  *
734 733
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
735 734
  */
736
-//#define BEZIER_JERK_CONTROL
735
+//#define S_CURVE_ACCELERATION
737 736
 
738 737
 //===========================================================================
739 738
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/generic/Configuration.h View File

@@ -710,15 +710,14 @@
710 710
 #define DEFAULT_EJERK                  5.0
711 711
 
712 712
 /**
713
- * Realtime Jerk Control
713
+ * S-Curve Acceleration
714 714
  *
715 715
  * This option eliminates vibration during printing by fitting a Bézier
716 716
  * curve to move acceleration, producing much smoother direction changes.
717
- * Because this is computationally-intensive, a 32-bit MCU is required.
718 717
  *
719 718
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
720 719
  */
721
-//#define BEZIER_JERK_CONTROL
720
+//#define S_CURVE_ACCELERATION
722 721
 
723 722
 //===========================================================================
724 723
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

@@ -710,15 +710,14 @@
710 710
 #define DEFAULT_EJERK                  5.0
711 711
 
712 712
 /**
713
- * Realtime Jerk Control
713
+ * S-Curve Acceleration
714 714
  *
715 715
  * This option eliminates vibration during printing by fitting a Bézier
716 716
  * curve to move acceleration, producing much smoother direction changes.
717
- * Because this is computationally-intensive, a 32-bit MCU is required.
718 717
  *
719 718
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
720 719
  */
721
-//#define BEZIER_JERK_CONTROL
720
+//#define S_CURVE_ACCELERATION
722 721
 
723 722
 //===========================================================================
724 723
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

@@ -703,15 +703,14 @@
703 703
 #define DEFAULT_EJERK                  5.0
704 704
 
705 705
 /**
706
- * Realtime Jerk Control
706
+ * S-Curve Acceleration
707 707
  *
708 708
  * This option eliminates vibration during printing by fitting a Bézier
709 709
  * curve to move acceleration, producing much smoother direction changes.
710
- * Because this is computationally-intensive, a 32-bit MCU is required.
711 710
  *
712 711
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
713 712
  */
714
-//#define BEZIER_JERK_CONTROL
713
+//#define S_CURVE_ACCELERATION
715 714
 
716 715
 //===========================================================================
717 716
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

@@ -713,15 +713,14 @@
713 713
 #define DEFAULT_EJERK                 20.0
714 714
 
715 715
 /**
716
- * Realtime Jerk Control
716
+ * S-Curve Acceleration
717 717
  *
718 718
  * This option eliminates vibration during printing by fitting a Bézier
719 719
  * curve to move acceleration, producing much smoother direction changes.
720
- * Because this is computationally-intensive, a 32-bit MCU is required.
721 720
  *
722 721
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
723 722
  */
724
-//#define BEZIER_JERK_CONTROL
723
+//#define S_CURVE_ACCELERATION
725 724
 
726 725
 //===========================================================================
727 726
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

@@ -651,15 +651,14 @@
651 651
 #define DEFAULT_EJERK                  4.0
652 652
 
653 653
 /**
654
- * Realtime Jerk Control
654
+ * S-Curve Acceleration
655 655
  *
656 656
  * This option eliminates vibration during printing by fitting a Bézier
657 657
  * curve to move acceleration, producing much smoother direction changes.
658
- * Because this is computationally-intensive, a 32-bit MCU is required.
659 658
  *
660 659
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
661 660
  */
662
-//#define BEZIER_JERK_CONTROL
661
+//#define S_CURVE_ACCELERATION
663 662
 
664 663
 //===========================================================================
665 664
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/makibox/Configuration.h View File

@@ -641,15 +641,14 @@
641 641
 #define DEFAULT_EJERK                  5.0
642 642
 
643 643
 /**
644
- * Realtime Jerk Control
644
+ * S-Curve Acceleration
645 645
  *
646 646
  * This option eliminates vibration during printing by fitting a Bézier
647 647
  * curve to move acceleration, producing much smoother direction changes.
648
- * Because this is computationally-intensive, a 32-bit MCU is required.
649 648
  *
650 649
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
651 650
  */
652
-//#define BEZIER_JERK_CONTROL
651
+//#define S_CURVE_ACCELERATION
653 652
 
654 653
 //===========================================================================
655 654
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/stm32f103ret6/Configuration.h View File

@@ -640,15 +640,14 @@
640 640
 #define DEFAULT_EJERK                  5.0
641 641
 
642 642
 /**
643
- * Realtime Jerk Control
643
+ * S-Curve Acceleration
644 644
  *
645 645
  * This option eliminates vibration during printing by fitting a Bézier
646 646
  * curve to move acceleration, producing much smoother direction changes.
647
- * Because this is computationally-intensive, a 32-bit MCU is required.
648 647
  *
649 648
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
650 649
  */
651
-//#define BEZIER_JERK_CONTROL
650
+//#define S_CURVE_ACCELERATION
652 651
 
653 652
 //===========================================================================
654 653
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

@@ -633,15 +633,14 @@
633 633
 #define DEFAULT_EJERK                  5.0
634 634
 
635 635
 /**
636
- * Realtime Jerk Control
636
+ * S-Curve Acceleration
637 637
  *
638 638
  * This option eliminates vibration during printing by fitting a Bézier
639 639
  * curve to move acceleration, producing much smoother direction changes.
640
- * Because this is computationally-intensive, a 32-bit MCU is required.
641 640
  *
642 641
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
643 642
  */
644
-//#define BEZIER_JERK_CONTROL
643
+//#define S_CURVE_ACCELERATION
645 644
 
646 645
 //===========================================================================
647 646
 //============================= Z Probe Options =============================

+ 2
- 3
Marlin/src/config/examples/wt150/Configuration.h View File

@@ -643,15 +643,14 @@
643 643
 #define DEFAULT_EJERK                  5.0
644 644
 
645 645
 /**
646
- * Realtime Jerk Control
646
+ * S-Curve Acceleration
647 647
  *
648 648
  * This option eliminates vibration during printing by fitting a Bézier
649 649
  * curve to move acceleration, producing much smoother direction changes.
650
- * Because this is computationally-intensive, a 32-bit MCU is required.
651 650
  *
652 651
  * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
653 652
  */
654
-//#define BEZIER_JERK_CONTROL
653
+//#define S_CURVE_ACCELERATION
655 654
 
656 655
 //===========================================================================
657 656
 //============================= Z Probe Options =============================

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

@@ -273,6 +273,8 @@
273 273
   #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration."
274 274
 #elif ENABLED(LEVEL_BED_CORNERS) && !defined(LEVEL_CORNERS_INSET)
275 275
   #error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
276
+#elif defined(BEZIER_JERK_CONTROL)
277
+  #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration."
276 278
 #endif
277 279
 
278 280
 #define BOARD_MKS_13     -47

+ 7
- 7
Marlin/src/module/planner.cpp View File

@@ -232,7 +232,7 @@ void Planner::init() {
232 232
   delay_before_delivering = 0;
233 233
 }
234 234
 
235
-#if ENABLED(BEZIER_JERK_CONTROL)
235
+#if ENABLED(S_CURVE_ACCELERATION)
236 236
 
237 237
   #ifdef __AVR__
238 238
     // This routine, for AVR, returns 0x1000000 / d, but trying to get the inverse as
@@ -761,7 +761,7 @@ void Planner::calculate_trapezoid_for_block(block_t* const block, const float &e
761 761
   NOLESS(initial_rate, uint32_t(MINIMAL_STEP_RATE));
762 762
   NOLESS(final_rate, uint32_t(MINIMAL_STEP_RATE));
763 763
 
764
-  #if ENABLED(BEZIER_JERK_CONTROL)
764
+  #if ENABLED(S_CURVE_ACCELERATION)
765 765
     uint32_t cruise_rate = initial_rate;
766 766
   #endif
767 767
 
@@ -782,12 +782,12 @@ void Planner::calculate_trapezoid_for_block(block_t* const block, const float &e
782 782
     accelerate_steps = MIN(uint32_t(MAX(accelerate_steps_float, 0)), block->step_event_count);
783 783
     plateau_steps = 0;
784 784
 
785
-    #if ENABLED(BEZIER_JERK_CONTROL)
785
+    #if ENABLED(S_CURVE_ACCELERATION)
786 786
       // We won't reach the cruising rate. Let's calculate the speed we will reach
787 787
       cruise_rate = final_speed(initial_rate, accel, accelerate_steps);
788 788
     #endif
789 789
   }
790
-  #if ENABLED(BEZIER_JERK_CONTROL)
790
+  #if ENABLED(S_CURVE_ACCELERATION)
791 791
     else // We have some plateau time, so the cruise rate will be the nominal rate
792 792
       cruise_rate = block->nominal_rate;
793 793
   #endif
@@ -795,7 +795,7 @@ void Planner::calculate_trapezoid_for_block(block_t* const block, const float &e
795 795
   // block->accelerate_until = accelerate_steps;
796 796
   // block->decelerate_after = accelerate_steps+plateau_steps;
797 797
 
798
-  #if ENABLED(BEZIER_JERK_CONTROL)
798
+  #if ENABLED(S_CURVE_ACCELERATION)
799 799
     // Jerk controlled speed requires to express speed versus time, NOT steps
800 800
     uint32_t acceleration_time = ((float)(cruise_rate - initial_rate) / accel) * (HAL_STEPPER_TIMER_RATE),
801 801
              deceleration_time = ((float)(cruise_rate - final_rate) / accel) * (HAL_STEPPER_TIMER_RATE);
@@ -815,7 +815,7 @@ void Planner::calculate_trapezoid_for_block(block_t* const block, const float &e
815 815
     block->accelerate_until = accelerate_steps;
816 816
     block->decelerate_after = accelerate_steps + plateau_steps;
817 817
     block->initial_rate = initial_rate;
818
-    #if ENABLED(BEZIER_JERK_CONTROL)
818
+    #if ENABLED(S_CURVE_ACCELERATION)
819 819
       block->acceleration_time = acceleration_time;
820 820
       block->deceleration_time = deceleration_time;
821 821
       block->acceleration_time_inverse = acceleration_time_inverse;
@@ -2136,7 +2136,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2136 2136
   }
2137 2137
   block->acceleration_steps_per_s2 = accel;
2138 2138
   block->acceleration = accel / steps_per_mm;
2139
-  #if DISABLED(BEZIER_JERK_CONTROL)
2139
+  #if DISABLED(S_CURVE_ACCELERATION)
2140 2140
     block->acceleration_rate = (uint32_t)(accel * (4096.0 * 4096.0 / (HAL_STEPPER_TIMER_RATE)));
2141 2141
   #endif
2142 2142
   #if ENABLED(LIN_ADVANCE)

+ 2
- 2
Marlin/src/module/planner.h View File

@@ -115,7 +115,7 @@ typedef struct {
115 115
   uint32_t accelerate_until,                // The index of the step event on which to stop acceleration
116 116
            decelerate_after;                // The index of the step event on which to start decelerating
117 117
 
118
-  #if ENABLED(BEZIER_JERK_CONTROL)
118
+  #if ENABLED(S_CURVE_ACCELERATION)
119 119
     uint32_t cruise_rate;                   // The actual cruise rate to use, between end of the acceleration phase and start of deceleration phase
120 120
     uint32_t acceleration_time,             // Acceleration time and deceleration time in STEP timer counts
121 121
              deceleration_time;
@@ -782,7 +782,7 @@ class Planner {
782 782
       return target_velocity_sqr - 2 * accel * distance;
783 783
     }
784 784
 
785
-    #if ENABLED(BEZIER_JERK_CONTROL)
785
+    #if ENABLED(S_CURVE_ACCELERATION)
786 786
       /**
787 787
        * Calculate the speed reached given initial speed, acceleration and distance
788 788
        */

+ 8
- 8
Marlin/src/module/stepper.cpp View File

@@ -118,7 +118,7 @@ int32_t Stepper::counter_X = 0,
118 118
 
119 119
 uint32_t Stepper::step_events_completed = 0; // The number of step events executed in the current block
120 120
 
121
-#if ENABLED(BEZIER_JERK_CONTROL)
121
+#if ENABLED(S_CURVE_ACCELERATION)
122 122
   int32_t __attribute__((used)) Stepper::bezier_A __asm__("bezier_A");    // A coefficient in Bézier speed curve with alias for assembler
123 123
   int32_t __attribute__((used)) Stepper::bezier_B __asm__("bezier_B");    // B coefficient in Bézier speed curve with alias for assembler
124 124
   int32_t __attribute__((used)) Stepper::bezier_C __asm__("bezier_C");    // C coefficient in Bézier speed curve with alias for assembler
@@ -168,7 +168,7 @@ volatile signed char Stepper::count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
168 168
 uint32_t Stepper::ticks_nominal;
169 169
 uint8_t Stepper::step_loops, Stepper::step_loops_nominal;
170 170
 
171
-#if DISABLED(BEZIER_JERK_CONTROL)
171
+#if DISABLED(S_CURVE_ACCELERATION)
172 172
   uint32_t Stepper::acc_step_rate; // needed for deceleration start point
173 173
 #endif
174 174
 
@@ -318,7 +318,7 @@ void Stepper::set_directions() {
318 318
   #endif // !LIN_ADVANCE
319 319
 }
320 320
 
321
-#if ENABLED(BEZIER_JERK_CONTROL)
321
+#if ENABLED(S_CURVE_ACCELERATION)
322 322
   /**
323 323
    *   We are using a quintic (fifth-degree) Bézier polynomial for the velocity curve.
324 324
    *  This gives us a "linear pop" velocity curve; with pop being the sixth derivative of position:
@@ -1122,7 +1122,7 @@ void Stepper::set_directions() {
1122 1122
       #endif
1123 1123
     }
1124 1124
   #endif
1125
-#endif // BEZIER_JERK_CONTROL
1125
+#endif // S_CURVE_ACCELERATION
1126 1126
 
1127 1127
 /**
1128 1128
  * Stepper Driver Interrupt
@@ -1497,7 +1497,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
1497 1497
     // Calculate new timer value
1498 1498
     if (step_events_completed <= current_block->accelerate_until) {
1499 1499
 
1500
-      #if ENABLED(BEZIER_JERK_CONTROL)
1500
+      #if ENABLED(S_CURVE_ACCELERATION)
1501 1501
         // Get the next speed to use (Jerk limited!)
1502 1502
         uint32_t acc_step_rate =
1503 1503
           acceleration_time < current_block->acceleration_time
@@ -1528,7 +1528,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
1528 1528
     else if (step_events_completed > current_block->decelerate_after) {
1529 1529
       uint32_t step_rate;
1530 1530
 
1531
-      #if ENABLED(BEZIER_JERK_CONTROL)
1531
+      #if ENABLED(S_CURVE_ACCELERATION)
1532 1532
         // If this is the 1st time we process the 2nd half of the trapezoid...
1533 1533
         if (!bezier_2nd_half) {
1534 1534
           // Initialize the Bézier speed curve
@@ -1726,12 +1726,12 @@ uint32_t Stepper::stepper_block_phase_isr() {
1726 1726
       // make a note of the number of step loops required at nominal speed
1727 1727
       step_loops_nominal = step_loops;
1728 1728
 
1729
-      #if DISABLED(BEZIER_JERK_CONTROL)
1729
+      #if DISABLED(S_CURVE_ACCELERATION)
1730 1730
         // Set as deceleration point the initial rate of the block
1731 1731
         acc_step_rate = current_block->initial_rate;
1732 1732
       #endif
1733 1733
 
1734
-      #if ENABLED(BEZIER_JERK_CONTROL)
1734
+      #if ENABLED(S_CURVE_ACCELERATION)
1735 1735
         // Initialize the Bézier speed curve
1736 1736
         _calc_bezier_curve_coeffs(current_block->initial_rate, current_block->cruise_rate, current_block->acceleration_time_inverse);
1737 1737
 

+ 3
- 3
Marlin/src/module/stepper.h View File

@@ -94,7 +94,7 @@ class Stepper {
94 94
     static int32_t counter_X, counter_Y, counter_Z, counter_E;
95 95
     static uint32_t step_events_completed; // The number of step events executed in the current block
96 96
 
97
-    #if ENABLED(BEZIER_JERK_CONTROL)
97
+    #if ENABLED(S_CURVE_ACCELERATION)
98 98
       static int32_t bezier_A,     // A coefficient in Bézier speed curve
99 99
                      bezier_B,     // B coefficient in Bézier speed curve
100 100
                      bezier_C;     // C coefficient in Bézier speed curve
@@ -128,7 +128,7 @@ class Stepper {
128 128
     static uint8_t step_loops, step_loops_nominal;
129 129
 
130 130
     static uint32_t ticks_nominal;
131
-    #if DISABLED(BEZIER_JERK_CONTROL)
131
+    #if DISABLED(S_CURVE_ACCELERATION)
132 132
       static uint32_t acc_step_rate; // needed for deceleration start point
133 133
     #endif
134 134
 
@@ -333,7 +333,7 @@ class Stepper {
333 333
       return timer;
334 334
     }
335 335
 
336
-    #if ENABLED(BEZIER_JERK_CONTROL)
336
+    #if ENABLED(S_CURVE_ACCELERATION)
337 337
       static void _calc_bezier_curve_coeffs(const int32_t v0, const int32_t v1, const uint32_t av);
338 338
       static int32_t _eval_bezier_curve(const uint32_t curr_step);
339 339
     #endif

Loading…
Cancel
Save