Sfoglia il codice sorgente

Rename Junction Deviation options

Scott Lahteine 6 anni fa
parent
commit
931ab4ec40
52 ha cambiato i file con 106 aggiunte e 102 eliminazioni
  1. 2
    2
      Marlin/Configuration_adv.h
  2. 2
    2
      Marlin/src/config/default/Configuration_adv.h
  3. 2
    2
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  4. 2
    2
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  5. 2
    2
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  6. 2
    2
      Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
  7. 2
    2
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  8. 2
    2
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
  9. 2
    2
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  10. 2
    2
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  11. 2
    2
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  12. 2
    2
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  13. 2
    2
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  14. 2
    2
      Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
  15. 2
    2
      Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
  16. 2
    2
      Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
  17. 2
    2
      Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
  18. 2
    2
      Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
  19. 2
    2
      Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
  20. 2
    2
      Marlin/src/config/examples/Felix/Configuration_adv.h
  21. 2
    2
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  22. 2
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  23. 2
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  24. 2
    2
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  25. 2
    2
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  26. 2
    2
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  27. 2
    2
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  28. 2
    2
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  29. 2
    2
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  30. 2
    2
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  31. 2
    2
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  32. 2
    2
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  33. 2
    2
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  34. 2
    2
      Marlin/src/config/examples/TheBorg/Configuration_adv.h
  35. 2
    2
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  36. 2
    2
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  37. 2
    2
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  38. 2
    2
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  39. 2
    2
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  40. 2
    2
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  41. 2
    2
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
  42. 2
    2
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  43. 2
    2
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  44. 2
    2
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  45. 2
    2
      Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
  46. 2
    2
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  47. 2
    2
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  48. 2
    2
      Marlin/src/config/examples/makibox/Configuration_adv.h
  49. 2
    2
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  50. 2
    2
      Marlin/src/config/examples/wt150/Configuration_adv.h
  51. 4
    0
      Marlin/src/inc/SanityCheck.h
  52. 2
    2
      Marlin/src/module/planner.cpp

+ 2
- 2
Marlin/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/default/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Anet/A6/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Anet/A8/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Cartesio/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Felix/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/MakerParts/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/RigidBot/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/SCARA/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/TheBorg/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h Vedi File

@@ -449,8 +449,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h Vedi File

@@ -448,8 +448,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h Vedi File

@@ -448,8 +448,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h Vedi File

@@ -448,8 +448,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/delta/generic/Configuration_adv.h Vedi File

@@ -448,8 +448,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h Vedi File

@@ -448,8 +448,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h Vedi File

@@ -453,8 +453,8 @@
453 453
 //
454 454
 //#define JUNCTION_DEVIATION
455 455
 #if ENABLED(JUNCTION_DEVIATION)
456
-  #define JUNCTION_DEVIATION_FACTOR 0.05
457
-  #define JUNCTION_ACCELERATION_FACTOR 1000
456
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
457
+  #define JUNCTION_ACCELERATION 1000  // (mm/s²) Maximum centripetal acceleration
458 458
   //#define JUNCTION_DEVIATION_INCLUDE_E
459 459
 #endif
460 460
 

+ 2
- 2
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h Vedi File

@@ -448,8 +448,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/makibox/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 2
- 2
Marlin/src/config/examples/wt150/Configuration_adv.h Vedi File

@@ -446,8 +446,8 @@
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
 

+ 4
- 0
Marlin/src/inc/SanityCheck.h Vedi File

@@ -275,6 +275,10 @@
275 275
   #error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
276 276
 #elif defined(BEZIER_JERK_CONTROL)
277 277
   #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration."
278
+#elif defined(JUNCTION_DEVIATION_FACTOR)
279
+  #error "JUNCTION_DEVIATION_FACTOR is now JUNCTION_DEVIATION_MM. Please update your configuration."
280
+#elif defined(JUNCTION_ACCELERATION_FACTOR)
281
+  #error "JUNCTION_ACCELERATION_FACTOR is now JUNCTION_ACCELERATION. Please update your configuration."
278 282
 #endif
279 283
 
280 284
 #define BOARD_MKS_13     -47

+ 2
- 2
Marlin/src/module/planner.cpp Vedi File

@@ -2230,7 +2230,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2230 2230
 
2231 2231
         // TODO: Technically, the acceleration used in calculation needs to be limited by the minimum of the
2232 2232
         // two junctions. However, this shouldn't be a significant problem except in extreme circumstances.
2233
-        vmax_junction_sqr = (JUNCTION_ACCELERATION_FACTOR * JUNCTION_DEVIATION_FACTOR * sin_theta_d2) / (1.0 - sin_theta_d2);
2233
+        vmax_junction_sqr = (JUNCTION_ACCELERATION * JUNCTION_DEVIATION_MM * sin_theta_d2) / (1.0 - sin_theta_d2);
2234 2234
         if (block->millimeters < 1.0) {
2235 2235
 
2236 2236
           // Fast acos approximation, minus the error bar to be safe
@@ -2238,7 +2238,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2238 2238
 
2239 2239
           // If angle is greater than 135 degrees (octagon), find speed for approximate arc
2240 2240
           if (junction_theta > RADIANS(135)) {
2241
-            const float limit_sqr = block->millimeters / (RADIANS(180) - junction_theta) * JUNCTION_ACCELERATION_FACTOR;
2241
+            const float limit_sqr = block->millimeters / (RADIANS(180) - junction_theta) * JUNCTION_ACCELERATION;
2242 2242
             NOMORE(vmax_junction_sqr, limit_sqr);
2243 2243
           }
2244 2244
         }

Loading…
Annulla
Salva