Просмотр исходного кода

Remove JUNCTION_DEVIATION_INCLUDE_E option (#11147)

Scott Lahteine 7 лет назад
Родитель
Сommit
bd7f5848f1
Аккаунт пользователя с таким Email не найден
52 измененных файлов: 13 добавлений и 81 удалений
  1. 0
    1
      Marlin/Configuration_adv.h
  2. 0
    1
      Marlin/src/config/default/Configuration_adv.h
  3. 0
    1
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  4. 0
    1
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  5. 0
    1
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  6. 0
    1
      Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
  7. 0
    1
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  8. 0
    1
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
  9. 0
    1
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  10. 0
    1
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  11. 0
    1
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  12. 0
    1
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  13. 0
    1
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  14. 0
    1
      Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
  15. 0
    1
      Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
  16. 0
    1
      Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
  17. 0
    1
      Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
  18. 0
    1
      Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
  19. 0
    1
      Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
  20. 0
    1
      Marlin/src/config/examples/Felix/Configuration_adv.h
  21. 0
    1
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  22. 0
    1
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  23. 0
    1
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  24. 0
    1
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  25. 0
    1
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  26. 0
    1
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  27. 0
    1
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  28. 0
    1
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  29. 0
    1
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  30. 0
    1
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  31. 0
    1
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  32. 0
    1
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  33. 0
    1
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  34. 0
    1
      Marlin/src/config/examples/TheBorg/Configuration_adv.h
  35. 0
    1
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  36. 0
    1
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  37. 0
    1
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  38. 0
    1
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  39. 0
    1
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  40. 0
    1
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  41. 0
    1
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
  42. 0
    1
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  43. 0
    1
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  44. 0
    1
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  45. 0
    1
      Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
  46. 0
    1
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  47. 0
    1
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  48. 0
    1
      Marlin/src/config/examples/makibox/Configuration_adv.h
  49. 0
    1
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  50. 0
    1
      Marlin/src/config/examples/wt150/Configuration_adv.h
  51. 8
    20
      Marlin/src/module/planner.cpp
  52. 5
    11
      Marlin/src/module/planner.h

+ 0
- 1
Marlin/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/default/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Anet/A6/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Anet/A8/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Cartesio/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Felix/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/MakerParts/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/RigidBot/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/SCARA/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/TheBorg/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h Просмотреть файл

@@ -450,7 +450,6 @@
450 450
 //#define JUNCTION_DEVIATION
451 451
 #if ENABLED(JUNCTION_DEVIATION)
452 452
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
453
-  //#define JUNCTION_DEVIATION_INCLUDE_E
454 453
 #endif
455 454
 
456 455
 /**

+ 0
- 1
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h Просмотреть файл

@@ -449,7 +449,6 @@
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451 451
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
-  //#define JUNCTION_DEVIATION_INCLUDE_E
453 452
 #endif
454 453
 
455 454
 /**

+ 0
- 1
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h Просмотреть файл

@@ -449,7 +449,6 @@
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451 451
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
-  //#define JUNCTION_DEVIATION_INCLUDE_E
453 452
 #endif
454 453
 
455 454
 /**

+ 0
- 1
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h Просмотреть файл

@@ -449,7 +449,6 @@
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451 451
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
-  //#define JUNCTION_DEVIATION_INCLUDE_E
453 452
 #endif
454 453
 
455 454
 /**

+ 0
- 1
Marlin/src/config/examples/delta/generic/Configuration_adv.h Просмотреть файл

@@ -449,7 +449,6 @@
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451 451
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
-  //#define JUNCTION_DEVIATION_INCLUDE_E
453 452
 #endif
454 453
 
455 454
 /**

+ 0
- 1
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h Просмотреть файл

@@ -449,7 +449,6 @@
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451 451
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
-  //#define JUNCTION_DEVIATION_INCLUDE_E
453 452
 #endif
454 453
 
455 454
 /**

+ 0
- 1
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h Просмотреть файл

@@ -454,7 +454,6 @@
454 454
 //#define JUNCTION_DEVIATION
455 455
 #if ENABLED(JUNCTION_DEVIATION)
456 456
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
457
-  //#define JUNCTION_DEVIATION_INCLUDE_E
458 457
 #endif
459 458
 
460 459
 /**

+ 0
- 1
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h Просмотреть файл

@@ -449,7 +449,6 @@
449 449
 //#define JUNCTION_DEVIATION
450 450
 #if ENABLED(JUNCTION_DEVIATION)
451 451
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
452
-  //#define JUNCTION_DEVIATION_INCLUDE_E
453 452
 #endif
454 453
 
455 454
 /**

+ 0
- 1
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/makibox/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 0
- 1
Marlin/src/config/examples/wt150/Configuration_adv.h Просмотреть файл

@@ -447,7 +447,6 @@
447 447
 //#define JUNCTION_DEVIATION
448 448
 #if ENABLED(JUNCTION_DEVIATION)
449 449
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
450
-  //#define JUNCTION_DEVIATION_INCLUDE_E
451 450
 #endif
452 451
 
453 452
 /**

+ 8
- 20
Marlin/src/module/planner.cpp Просмотреть файл

@@ -2230,21 +2230,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2230 2230
           already calculated in a different place. */
2231 2231
 
2232 2232
     // Unit vector of previous path line segment
2233
-    static float previous_unit_vec[
2234
-      #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E)
2235
-        XYZE
2236
-      #else
2237
-        XYZ
2238
-      #endif
2239
-    ];
2233
+    static float previous_unit_vec[XYZE];
2240 2234
 
2241 2235
     float unit_vec[] = {
2242 2236
       delta_mm[A_AXIS] * inverse_millimeters,
2243 2237
       delta_mm[B_AXIS] * inverse_millimeters,
2244
-      delta_mm[C_AXIS] * inverse_millimeters
2245
-      #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E)
2246
-        , delta_mm[E_AXIS] * inverse_millimeters
2247
-      #endif
2238
+      delta_mm[C_AXIS] * inverse_millimeters,
2239
+      delta_mm[E_AXIS] * inverse_millimeters
2248 2240
     };
2249 2241
 
2250 2242
     // Skip first block or when previous_nominal_speed is used as a flag for homing and offset cycles.
@@ -2254,9 +2246,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2254 2246
       float junction_cos_theta = -previous_unit_vec[X_AXIS] * unit_vec[X_AXIS]
2255 2247
                                  -previous_unit_vec[Y_AXIS] * unit_vec[Y_AXIS]
2256 2248
                                  -previous_unit_vec[Z_AXIS] * unit_vec[Z_AXIS]
2257
-                                  #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E)
2258
-                                    -previous_unit_vec[E_AXIS] * unit_vec[E_AXIS]
2259
-                                  #endif
2249
+                                 -previous_unit_vec[E_AXIS] * unit_vec[E_AXIS]
2260 2250
                                 ;
2261 2251
 
2262 2252
       // NOTE: Computed without any expensive trig, sin() or acos(), by trig half angle identity of cos(theta).
@@ -2267,15 +2257,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2267 2257
       else {
2268 2258
         NOLESS(junction_cos_theta, -0.999999); // Check for numerical round-off to avoid divide by zero.
2269 2259
 
2270
-        float junction_unit_vec[JD_AXES] = {
2260
+        // Convert delta vector to unit vector
2261
+        float junction_unit_vec[XYZE] = {
2271 2262
           unit_vec[X_AXIS] - previous_unit_vec[X_AXIS],
2272 2263
           unit_vec[Y_AXIS] - previous_unit_vec[Y_AXIS],
2273
-          unit_vec[Z_AXIS] - previous_unit_vec[Z_AXIS]
2274
-          #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E)
2275
-            , unit_vec[E_AXIS] - previous_unit_vec[E_AXIS]
2276
-          #endif
2264
+          unit_vec[Z_AXIS] - previous_unit_vec[Z_AXIS],
2265
+          unit_vec[E_AXIS] - previous_unit_vec[E_AXIS]
2277 2266
         };
2278
-        // Convert delta vector to unit vector
2279 2267
         normalize_junction_vector(junction_unit_vec);
2280 2268
 
2281 2269
         const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec),

+ 5
- 11
Marlin/src/module/planner.h Просмотреть файл

@@ -830,22 +830,16 @@ class Planner {
830 830
 
831 831
     #if ENABLED(JUNCTION_DEVIATION)
832 832
 
833
-      #if ENABLED(JUNCTION_DEVIATION_INCLUDE_E)
834
-        #define JD_AXES XYZE
835
-      #else
836
-        #define JD_AXES XYZ
837
-      #endif
838
-
839
-      FORCE_INLINE static void normalize_junction_vector(float (&vector)[JD_AXES]) {
833
+      FORCE_INLINE static void normalize_junction_vector(float (&vector)[XYZE]) {
840 834
         float magnitude_sq = 0.0;
841
-        for (uint8_t idx = 0; idx < JD_AXES; idx++) if (vector[idx]) magnitude_sq += sq(vector[idx]);
835
+        LOOP_XYZE(idx) if (vector[idx]) magnitude_sq += sq(vector[idx]);
842 836
         const float inv_magnitude = 1.0 / SQRT(magnitude_sq);
843
-        for (uint8_t idx = 0; idx < JD_AXES; idx++) vector[idx] *= inv_magnitude;
837
+        LOOP_XYZE(idx) vector[idx] *= inv_magnitude;
844 838
       }
845 839
 
846
-      FORCE_INLINE static float limit_value_by_axis_maximum(const float &max_value, float (&unit_vec)[JD_AXES]) {
840
+      FORCE_INLINE static float limit_value_by_axis_maximum(const float &max_value, float (&unit_vec)[XYZE]) {
847 841
         float limit_value = max_value;
848
-        for (uint8_t idx = 0; idx < JD_AXES; idx++) if (unit_vec[idx]) // Avoid divide by zero
842
+        LOOP_XYZE(idx) if (unit_vec[idx]) // Avoid divide by zero
849 843
           NOMORE(limit_value, ABS(max_acceleration_mm_per_s2[idx] / unit_vec[idx]));
850 844
         return limit_value;
851 845
       }

Загрузка…
Отмена
Сохранить