ソースを参照

Merge pull request #10858 from thinkyhead/bf2_rename_some_options

[2.0.x] Rename and document some configuration options
Scott Lahteine 7年前
コミット
05fc761929
コミッターのメールアドレスに関連付けられたアカウントが存在しません
100個のファイルの変更238行の追加295行の削除
  1. 1
    1
      .travis.yml
  2. 2
    3
      Marlin/Configuration.h
  3. 3
    3
      Marlin/Configuration_adv.h
  4. 2
    3
      Marlin/src/config/default/Configuration.h
  5. 3
    3
      Marlin/src/config/default/Configuration_adv.h
  6. 2
    3
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  7. 3
    3
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  8. 2
    3
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  9. 2
    3
      Marlin/src/config/examples/Anet/A6/Configuration.h
  10. 3
    3
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  11. 2
    3
      Marlin/src/config/examples/Anet/A8/Configuration.h
  12. 3
    3
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  13. 2
    3
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  14. 3
    3
      Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
  15. 2
    3
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  16. 3
    3
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  17. 2
    3
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  18. 3
    3
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
  19. 2
    3
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  20. 3
    3
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  21. 2
    3
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  22. 3
    3
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  23. 2
    3
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  24. 3
    3
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  25. 2
    3
      Marlin/src/config/examples/Cartesio/Configuration.h
  26. 3
    3
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  27. 2
    3
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  28. 3
    3
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  29. 2
    3
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  30. 3
    3
      Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
  31. 2
    3
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  32. 3
    3
      Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
  33. 2
    3
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  34. 3
    3
      Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
  35. 2
    3
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  36. 3
    3
      Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
  37. 2
    3
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  38. 3
    3
      Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
  39. 2
    3
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  40. 3
    3
      Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
  41. 2
    3
      Marlin/src/config/examples/Felix/Configuration.h
  42. 3
    3
      Marlin/src/config/examples/Felix/Configuration_adv.h
  43. 2
    3
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  44. 2
    3
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  45. 3
    3
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  46. 2
    3
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  47. 2
    3
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  48. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  49. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  50. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  51. 3
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  52. 2
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  53. 3
    3
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  54. 2
    3
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  55. 3
    3
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  56. 2
    3
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  57. 3
    3
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  58. 2
    3
      Marlin/src/config/examples/MakerParts/Configuration.h
  59. 3
    3
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  60. 2
    3
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  61. 3
    3
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  62. 2
    3
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  63. 3
    3
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  64. 2
    3
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  65. 2
    3
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  66. 3
    3
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  67. 2
    3
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  68. 3
    3
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  69. 2
    3
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  70. 2
    3
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  71. 2
    3
      Marlin/src/config/examples/RigidBot/Configuration.h
  72. 3
    3
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  73. 2
    3
      Marlin/src/config/examples/SCARA/Configuration.h
  74. 3
    3
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  75. 2
    3
      Marlin/src/config/examples/STM32F10/Configuration.h
  76. 2
    3
      Marlin/src/config/examples/STM32F4/Configuration.h
  77. 2
    3
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  78. 3
    3
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  79. 2
    3
      Marlin/src/config/examples/TheBorg/Configuration.h
  80. 3
    3
      Marlin/src/config/examples/TheBorg/Configuration_adv.h
  81. 2
    3
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  82. 3
    3
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  83. 2
    3
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  84. 2
    3
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  85. 2
    3
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  86. 2
    3
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  87. 3
    3
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  88. 2
    3
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  89. 3
    3
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  90. 2
    3
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  91. 3
    3
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  92. 2
    3
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  93. 2
    3
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  94. 3
    3
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  95. 2
    3
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  96. 2
    3
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  97. 3
    3
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  98. 2
    3
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  99. 3
    3
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
  100. 0
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h

+ 1
- 1
.travis.yml ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/default/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/default/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,4,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 4, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Anet/A6/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Anet/A8/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Anet/A8/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/BQ/Hephestos/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/BQ/WITBOX/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Cartesio/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Cartesio/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/CR-10/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/CR-10S/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/CR-8/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/Ender-2/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/Ender-3/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Creality/Ender-4/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Felix/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Felix/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Felix/DUAL/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/JGAurora/A5/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/MakerParts/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/MakerParts/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Malyan/M150/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Malyan/M200/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Mks/Sbase/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/RigidBot/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/SCARA/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/SCARA/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/STM32F10/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/TheBorg/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/TheBorg/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/TinyBoy2/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Tronxy/X1/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Velleman/K8200/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h ファイルの表示

@@ -449,13 +449,13 @@
449 449
 //
450 450
 //#define JUNCTION_DEVIATION
451 451
 #if ENABLED(JUNCTION_DEVIATION)
452
-  #define JUNCTION_DEVIATION_FACTOR 0.05
453
-  #define JUNCTION_ACCELERATION_FACTOR 1000
452
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
453
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
454 454
   //#define JUNCTION_DEVIATION_INCLUDE_E
455 455
 #endif
456 456
 
457 457
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
458
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
458
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
459 459
 
460 460
 /**
461 461
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Velleman/K8400/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h ファイルの表示

@@ -446,13 +446,13 @@
446 446
 //
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449
-  #define JUNCTION_DEVIATION_FACTOR 0.05
450
-  #define JUNCTION_ACCELERATION_FACTOR 1000
449
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
451 451
   //#define JUNCTION_DEVIATION_INCLUDE_E
452 452
 #endif
453 453
 
454 454
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
455
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
455
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
456 456
 
457 457
 /**
458 458
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/adafruit/ST7565/Configuration.h ファイルの表示

@@ -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 ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h ファイルの表示

@@ -448,13 +448,13 @@
448 448
 //
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451
-  #define JUNCTION_DEVIATION_FACTOR 0.05
452
-  #define JUNCTION_ACCELERATION_FACTOR 1000
451
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
453 453
   //#define JUNCTION_DEVIATION_INCLUDE_E
454 454
 #endif
455 455
 
456 456
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
457
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
457
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
458 458
 
459 459
 /**
460 460
  *  @section  stepper motor current

+ 2
- 3
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h ファイルの表示

@@ -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 =============================

+ 3
- 3
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h ファイルの表示

@@ -448,13 +448,13 @@
448 448
 //
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451
-  #define JUNCTION_DEVIATION_FACTOR 0.05
452
-  #define JUNCTION_ACCELERATION_FACTOR 1000
451
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
453 453
   //#define JUNCTION_DEVIATION_INCLUDE_E
454 454
 #endif
455 455
 
456 456
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
457
-#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
457
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
458 458
 
459 459
 /**
460 460
  *  @section  stepper motor current

+ 0
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h ファイルの表示


変更されたファイルが多すぎるため、一部のファイルは表示されません

読み込み中…
キャンセル
保存