Browse Source

Merge pull request #8793 from robpower/NanoDLP_Sync_improvement_2

[2.0.x] V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option.
Scott Lahteine 7 years ago
parent
commit
f9aa1daa0d
No account linked to committer's email address
40 changed files with 240 additions and 113 deletions
  1. 6
    3
      Marlin/Configuration_adv.h
  2. 6
    3
      Marlin/src/config/default/Configuration_adv.h
  3. 6
    3
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  4. 6
    3
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  5. 6
    3
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  6. 6
    3
      Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
  7. 6
    3
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  8. 6
    3
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  9. 6
    3
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  10. 6
    3
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  11. 6
    3
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  12. 6
    3
      Marlin/src/config/examples/Felix/Configuration_adv.h
  13. 6
    3
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  14. 6
    3
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  15. 6
    3
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  16. 6
    3
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  17. 6
    3
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  18. 6
    3
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  19. 6
    3
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  20. 6
    3
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  21. 6
    3
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  22. 6
    3
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  23. 6
    3
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  24. 6
    3
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  25. 6
    3
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  26. 6
    3
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  27. 6
    3
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  28. 6
    3
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  29. 6
    3
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  30. 6
    3
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  31. 6
    3
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  32. 6
    3
      Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
  33. 6
    3
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  34. 6
    3
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  35. 6
    3
      Marlin/src/config/examples/makibox/Configuration_adv.h
  36. 6
    3
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  37. 6
    3
      Marlin/src/config/examples/wt150/Configuration_adv.h
  38. 9
    0
      Marlin/src/gcode/calibrate/G28.cpp
  39. 6
    2
      Marlin/src/gcode/motion/G0_G1.cpp
  40. 3
    0
      Marlin/src/gcode/motion/G4.cpp

+ 6
- 3
Marlin/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/default/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Anet/A6/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Anet/A8/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h View File

@@ -1542,13 +1542,16 @@
1542 1542
 #endif
1543 1543
 
1544 1544
 /**
1545
- * NanoDLP Synch support
1545
+ * NanoDLP Sync support
1546 1546
  *
1547 1547
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1548 1548
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1549 1549
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1550
- *
1551 1550
  */
1552
- //#define NANODLP_Z_SYNC
1551
+//#define NANODLP_Z_SYNC
1552
+#if ENABLED(NANODLP_Z_SYNC)
1553
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1554
+                              // Default behaviour is limited to Z axis only.
1555
+#endif
1553 1556
 
1554 1557
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Cartesio/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h View File

@@ -1544,13 +1544,16 @@
1544 1544
 #endif
1545 1545
 
1546 1546
 /**
1547
- * NanoDLP Synch support
1547
+ * NanoDLP Sync support
1548 1548
  *
1549 1549
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1550 1550
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1551 1551
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1552
- *
1553 1552
  */
1554
- //#define NANODLP_Z_SYNC
1553
+//#define NANODLP_Z_SYNC
1554
+#if ENABLED(NANODLP_Z_SYNC)
1555
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1556
+                              // Default behaviour is limited to Z axis only.
1557
+#endif
1555 1558
 
1556 1559
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Felix/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h View File

@@ -1550,13 +1550,16 @@
1550 1550
 #endif
1551 1551
 
1552 1552
 /**
1553
- * NanoDLP Synch support
1553
+ * NanoDLP Sync support
1554 1554
  *
1555 1555
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1556 1556
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1557 1557
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1558
- *
1559 1558
  */
1560
- //#define NANODLP_Z_SYNC
1559
+//#define NANODLP_Z_SYNC
1560
+#if ENABLED(NANODLP_Z_SYNC)
1561
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1562
+                              // Default behaviour is limited to Z axis only.
1563
+#endif
1561 1564
 
1562 1565
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/MakerParts/Configuration_adv.h View File

@@ -1513,13 +1513,16 @@
1513 1513
 #endif
1514 1514
 
1515 1515
 /**
1516
- * NanoDLP Synch support
1516
+ * NanoDLP Sync support
1517 1517
  *
1518 1518
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1519 1519
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1520 1520
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1521
- *
1522 1521
  */
1523
- //#define NANODLP_Z_SYNC
1522
+//#define NANODLP_Z_SYNC
1523
+#if ENABLED(NANODLP_Z_SYNC)
1524
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1525
+                              // Default behaviour is limited to Z axis only.
1526
+#endif
1524 1527
 
1525 1528
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h View File

@@ -1538,13 +1538,16 @@
1538 1538
 #endif
1539 1539
 
1540 1540
 /**
1541
- * NanoDLP Synch support
1541
+ * NanoDLP Sync support
1542 1542
  *
1543 1543
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1544 1544
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1545 1545
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1546
- *
1547 1546
  */
1548
- //#define NANODLP_Z_SYNC
1547
+//#define NANODLP_Z_SYNC
1548
+#if ENABLED(NANODLP_Z_SYNC)
1549
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1550
+                              // Default behaviour is limited to Z axis only.
1551
+#endif
1549 1552
 
1550 1553
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h View File

@@ -1542,13 +1542,16 @@
1542 1542
 #endif
1543 1543
 
1544 1544
 /**
1545
- * NanoDLP Synch support
1545
+ * NanoDLP Sync support
1546 1546
  *
1547 1547
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1548 1548
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1549 1549
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1550
- *
1551 1550
  */
1552
- //#define NANODLP_Z_SYNC
1551
+//#define NANODLP_Z_SYNC
1552
+#if ENABLED(NANODLP_Z_SYNC)
1553
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1554
+                              // Default behaviour is limited to Z axis only.
1555
+#endif
1553 1556
 
1554 1557
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h View File

@@ -1549,13 +1549,16 @@
1549 1549
 #endif
1550 1550
 
1551 1551
 /**
1552
- * NanoDLP Synch support
1552
+ * NanoDLP Sync support
1553 1553
  *
1554 1554
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1555 1555
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1556 1556
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1557
- *
1558 1557
  */
1559
- //#define NANODLP_Z_SYNC
1558
+//#define NANODLP_Z_SYNC
1559
+#if ENABLED(NANODLP_Z_SYNC)
1560
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1561
+                              // Default behaviour is limited to Z axis only.
1562
+#endif
1560 1563
 
1561 1564
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/RigidBot/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/SCARA/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h View File

@@ -1530,13 +1530,16 @@
1530 1530
 #endif
1531 1531
 
1532 1532
 /**
1533
- * NanoDLP Synch support
1533
+ * NanoDLP Sync support
1534 1534
  *
1535 1535
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1536 1536
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1537 1537
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1538
- *
1539 1538
  */
1540
- //#define NANODLP_Z_SYNC
1539
+//#define NANODLP_Z_SYNC
1540
+#if ENABLED(NANODLP_Z_SYNC)
1541
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1542
+                              // Default behaviour is limited to Z axis only.
1543
+#endif
1541 1544
 
1542 1545
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h View File

@@ -1552,13 +1552,16 @@
1552 1552
 #endif
1553 1553
 
1554 1554
 /**
1555
- * NanoDLP Synch support
1555
+ * NanoDLP Sync support
1556 1556
  *
1557 1557
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1558 1558
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1559 1559
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1560
- *
1561 1560
  */
1562
- //#define NANODLP_Z_SYNC
1561
+//#define NANODLP_Z_SYNC
1562
+#if ENABLED(NANODLP_Z_SYNC)
1563
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1564
+                              // Default behaviour is limited to Z axis only.
1565
+#endif
1563 1566
 
1564 1567
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h View File

@@ -1542,13 +1542,16 @@
1542 1542
 #endif
1543 1543
 
1544 1544
 /**
1545
- * NanoDLP Synch support
1545
+ * NanoDLP Sync support
1546 1546
  *
1547 1547
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1548 1548
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1549 1549
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1550
- *
1551 1550
  */
1552
- //#define NANODLP_Z_SYNC
1551
+//#define NANODLP_Z_SYNC
1552
+#if ENABLED(NANODLP_Z_SYNC)
1553
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1554
+                              // Default behaviour is limited to Z axis only.
1555
+#endif
1553 1556
 
1554 1557
 #endif // CONFIGURATION_ADV_H

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

@@ -1543,13 +1543,16 @@
1543 1543
 #endif
1544 1544
 
1545 1545
 /**
1546
- * NanoDLP Synch support
1546
+ * NanoDLP Sync support
1547 1547
  *
1548 1548
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1549 1549
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1550 1550
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1551
- *
1552 1551
  */
1553
- //#define NANODLP_Z_SYNC
1552
+//#define NANODLP_Z_SYNC
1553
+#if ENABLED(NANODLP_Z_SYNC)
1554
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1555
+                              // Default behaviour is limited to Z axis only.
1556
+#endif
1554 1557
 
1555 1558
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h View File

@@ -1543,13 +1543,16 @@
1543 1543
 #endif
1544 1544
 
1545 1545
 /**
1546
- * NanoDLP Synch support
1546
+ * NanoDLP Sync support
1547 1547
  *
1548 1548
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1549 1549
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1550 1550
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1551
- *
1552 1551
  */
1553
- //#define NANODLP_Z_SYNC
1552
+//#define NANODLP_Z_SYNC
1553
+#if ENABLED(NANODLP_Z_SYNC)
1554
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1555
+                              // Default behaviour is limited to Z axis only.
1556
+#endif
1554 1557
 
1555 1558
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h View File

@@ -1543,13 +1543,16 @@
1543 1543
 #endif
1544 1544
 
1545 1545
 /**
1546
- * NanoDLP Synch support
1546
+ * NanoDLP Sync support
1547 1547
  *
1548 1548
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1549 1549
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1550 1550
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1551
- *
1552 1551
  */
1553
- //#define NANODLP_Z_SYNC
1552
+//#define NANODLP_Z_SYNC
1553
+#if ENABLED(NANODLP_Z_SYNC)
1554
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1555
+                              // Default behaviour is limited to Z axis only.
1556
+#endif
1554 1557
 
1555 1558
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/delta/generic/Configuration_adv.h View File

@@ -1543,13 +1543,16 @@
1543 1543
 #endif
1544 1544
 
1545 1545
 /**
1546
- * NanoDLP Synch support
1546
+ * NanoDLP Sync support
1547 1547
  *
1548 1548
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1549 1549
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1550 1550
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1551
- *
1552 1551
  */
1553
- //#define NANODLP_Z_SYNC
1552
+//#define NANODLP_Z_SYNC
1553
+#if ENABLED(NANODLP_Z_SYNC)
1554
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1555
+                              // Default behaviour is limited to Z axis only.
1556
+#endif
1554 1557
 
1555 1558
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h View File

@@ -1543,13 +1543,16 @@
1543 1543
 #endif
1544 1544
 
1545 1545
 /**
1546
- * NanoDLP Synch support
1546
+ * NanoDLP Sync support
1547 1547
  *
1548 1548
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1549 1549
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1550 1550
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1551
- *
1552 1551
  */
1553
- //#define NANODLP_Z_SYNC
1552
+//#define NANODLP_Z_SYNC
1553
+#if ENABLED(NANODLP_Z_SYNC)
1554
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1555
+                              // Default behaviour is limited to Z axis only.
1556
+#endif
1554 1557
 
1555 1558
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h View File

@@ -1548,13 +1548,16 @@
1548 1548
 #endif
1549 1549
 
1550 1550
 /**
1551
- * NanoDLP Synch support
1551
+ * NanoDLP Sync support
1552 1552
  *
1553 1553
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1554 1554
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1555 1555
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1556
- *
1557 1556
  */
1558
- //#define NANODLP_Z_SYNC
1557
+//#define NANODLP_Z_SYNC
1558
+#if ENABLED(NANODLP_Z_SYNC)
1559
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1560
+                              // Default behaviour is limited to Z axis only.
1561
+#endif
1559 1562
 
1560 1563
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h View File

@@ -1543,13 +1543,16 @@
1543 1543
 #endif
1544 1544
 
1545 1545
 /**
1546
- * NanoDLP Synch support
1546
+ * NanoDLP Sync support
1547 1547
  *
1548 1548
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1549 1549
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1550 1550
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1551
- *
1552 1551
  */
1553
- //#define NANODLP_Z_SYNC
1552
+//#define NANODLP_Z_SYNC
1553
+#if ENABLED(NANODLP_Z_SYNC)
1554
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1555
+                              // Default behaviour is limited to Z axis only.
1556
+#endif
1554 1557
 
1555 1558
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h View File

@@ -1542,13 +1542,16 @@
1542 1542
 #endif
1543 1543
 
1544 1544
 /**
1545
- * NanoDLP Synch support
1545
+ * NanoDLP Sync support
1546 1546
  *
1547 1547
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1548 1548
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1549 1549
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1550
- *
1551 1550
  */
1552
- //#define NANODLP_Z_SYNC
1551
+//#define NANODLP_Z_SYNC
1552
+#if ENABLED(NANODLP_Z_SYNC)
1553
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1554
+                              // Default behaviour is limited to Z axis only.
1555
+#endif
1553 1556
 
1554 1557
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/makibox/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h View File

@@ -1541,13 +1541,16 @@
1541 1541
 #endif
1542 1542
 
1543 1543
 /**
1544
- * NanoDLP Synch support
1544
+ * NanoDLP Sync support
1545 1545
  *
1546 1546
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1547 1547
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1548 1548
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1549
- *
1550 1549
  */
1551
- //#define NANODLP_Z_SYNC
1550
+//#define NANODLP_Z_SYNC
1551
+#if ENABLED(NANODLP_Z_SYNC)
1552
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1553
+                              // Default behaviour is limited to Z axis only.
1554
+#endif
1552 1555
 
1553 1556
 #endif // CONFIGURATION_ADV_H

+ 6
- 3
Marlin/src/config/examples/wt150/Configuration_adv.h View File

@@ -1542,13 +1542,16 @@
1542 1542
 #endif
1543 1543
 
1544 1544
 /**
1545
- * NanoDLP Synch support
1545
+ * NanoDLP Sync support
1546 1546
  *
1547 1547
  * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp"
1548 1548
  * string to enable synchronization with DLP projector exposure. This change will allow to use
1549 1549
  * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1550
- *
1551 1550
  */
1552
- //#define NANODLP_Z_SYNC
1551
+//#define NANODLP_Z_SYNC
1552
+#if ENABLED(NANODLP_Z_SYNC)
1553
+  //#define NANODLP_ALL_AXIS  // Enables "Z_move_comp" output on any axis move.
1554
+                              // Default behaviour is limited to Z axis only.
1555
+#endif
1553 1556
 
1554 1557
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/src/gcode/calibrate/G28.cpp View File

@@ -325,6 +325,15 @@ void GcodeSuite::G28(const bool always_home_all) {
325 325
   lcd_refresh();
326 326
 
327 327
   report_current_position();
328
+  #if ENABLED(NANODLP_Z_SYNC)
329
+    #if ENABLED(NANODLP_ALL_AXIS)
330
+      #define _HOME_SYNC true                 // For any axis, output sync text.
331
+    #else
332
+      #define _HOME_SYNC (home_all || homeZ)  // Only for Z-axis
333
+    #endif
334
+    if (_HOME_SYNC)
335
+      SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
336
+  #endif
328 337
 
329 338
   #if ENABLED(DEBUG_LEVELING_FEATURE)
330 339
     if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< G28");

+ 6
- 2
Marlin/src/gcode/motion/G0_G1.cpp View File

@@ -78,8 +78,12 @@ void GcodeSuite::G0_G1(
78 78
     #endif
79 79
 
80 80
     #if ENABLED(NANODLP_Z_SYNC)
81
-      // If G0/G1 command include Z-axis, wait for move and output sync text.
82
-      if (parser.seenval('Z')) {
81
+      #if ENABLED(NANODLP_ALL_AXIS)
82
+        #define _MOVE_SYNC true                 // For any move wait and output sync message
83
+      #else
84
+        #define _MOVE_SYNC parser.seenval('Z')  // Only for Z move
85
+      #endif
86
+      if (_MOVE_SYNC) {
83 87
         stepper.synchronize();
84 88
         SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
85 89
       }

+ 3
- 0
Marlin/src/gcode/motion/G4.cpp View File

@@ -34,6 +34,9 @@ void GcodeSuite::G4() {
34 34
   if (parser.seenval('S')) dwell_ms = parser.value_millis_from_seconds(); // seconds to wait
35 35
 
36 36
   stepper.synchronize();
37
+  #if ENABLED(NANODLP_Z_SYNC)
38
+    SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
39
+  #endif
37 40
 
38 41
   if (!lcd_hasstatus()) LCD_MESSAGEPGM(MSG_DWELL);
39 42
 

Loading…
Cancel
Save