Browse Source

Merge pull request #8337 from robpower/NanoDLP_Z_Move_Sync

[1.1.x] Added optional NanoDLP Z movement synchronization
Scott Lahteine 7 years ago
parent
commit
664d386623
No account linked to committer's email address
33 changed files with 285 additions and 8 deletions
  1. 9
    0
      Marlin/Configuration_adv.h
  2. 8
    0
      Marlin/Marlin_main.cpp
  3. 9
    0
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
  4. 9
    0
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  5. 9
    0
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  6. 9
    0
      Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
  7. 9
    0
      Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
  8. 9
    0
      Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
  9. 9
    0
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  10. 9
    0
      Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
  11. 9
    0
      Marlin/example_configurations/Felix/Configuration_adv.h
  12. 9
    0
      Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
  13. 9
    0
      Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
  14. 9
    0
      Marlin/example_configurations/Malyan/M150/Configuration_adv.h
  15. 9
    0
      Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
  16. 9
    0
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  17. 9
    0
      Marlin/example_configurations/SCARA/Configuration_adv.h
  18. 9
    0
      Marlin/example_configurations/Sanguinololu/Configuration_adv.h
  19. 9
    0
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  20. 9
    0
      Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
  21. 9
    0
      Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
  22. 9
    0
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  23. 9
    0
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  24. 9
    0
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  25. 9
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  26. 9
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  27. 9
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  28. 9
    0
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
  29. 9
    0
      Marlin/example_configurations/makibox/Configuration_adv.h
  30. 9
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  31. 9
    0
      Marlin/example_configurations/wt150/Configuration_adv.h
  32. 1
    0
      Marlin/language.h
  33. 6
    8
      Marlin/stepper_indirection.h

+ 9
- 0
Marlin/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 8
- 0
Marlin/Marlin_main.cpp View File

3430
     #else
3430
     #else
3431
       prepare_move_to_destination();
3431
       prepare_move_to_destination();
3432
     #endif
3432
     #endif
3433
+	
3434
+    #if ENABLED(NANODLP_Z_SYNC)
3435
+      // If G0/G1 command include Z-axis, wait for move and output sync text.
3436
+      if (parser.seenval('Z')) {
3437
+        stepper.synchronize();
3438
+        SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
3439
+      }
3440
+    #endif
3433
   }
3441
   }
3434
 }
3442
 }
3435
 
3443
 

+ 9
- 0
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Anet/A6/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Anet/A8/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h View File

1499
                                          // tweaks made to the configuration are affecting the printer in real-time.
1499
                                          // tweaks made to the configuration are affecting the printer in real-time.
1500
 #endif
1500
 #endif
1501
 
1501
 
1502
+/**
1503
+ * NanoDLP Sync support
1504
+ *
1505
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1506
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1507
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1508
+ */
1509
+//#define NANODLP_Z_SYNC
1510
+ 
1502
 #endif // CONFIGURATION_ADV_H
1511
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Creality/CR-10/Configuration_adv.h View File

1505
                                          // tweaks made to the configuration are affecting the printer in real-time.
1505
                                          // tweaks made to the configuration are affecting the printer in real-time.
1506
 #endif
1506
 #endif
1507
 
1507
 
1508
+/**
1509
+ * NanoDLP Sync support
1510
+ *
1511
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1512
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1513
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1514
+ */
1515
+//#define NANODLP_Z_SYNC
1516
+ 
1508
 #endif // CONFIGURATION_ADV_H
1517
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Felix/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Malyan/M150/Configuration_adv.h View File

1499
                                          // tweaks made to the configuration are affecting the printer in real-time.
1499
                                          // tweaks made to the configuration are affecting the printer in real-time.
1500
 #endif
1500
 #endif
1501
 
1501
 
1502
+/**
1503
+ * NanoDLP Sync support
1504
+ *
1505
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1506
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1507
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1508
+ */
1509
+//#define NANODLP_Z_SYNC
1510
+ 
1502
 #endif // CONFIGURATION_ADV_H
1511
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h View File

1506
                                          // tweaks made to the configuration are affecting the printer in real-time.
1506
                                          // tweaks made to the configuration are affecting the printer in real-time.
1507
 #endif
1507
 #endif
1508
 
1508
 
1509
+/**
1510
+ * NanoDLP Sync support
1511
+ *
1512
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1513
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1514
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1515
+ */
1516
+//#define NANODLP_Z_SYNC
1517
+ 
1509
 #endif // CONFIGURATION_ADV_H
1518
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Sanguinololu/Configuration_adv.h View File

1469
                                          // tweaks made to the configuration are affecting the printer in real-time.
1469
                                          // tweaks made to the configuration are affecting the printer in real-time.
1470
 #endif
1470
 #endif
1471
 
1471
 
1472
+/**
1473
+ * NanoDLP Sync support
1474
+ *
1475
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1476
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1477
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1478
+ */
1479
+//#define NANODLP_Z_SYNC
1480
+ 
1472
 #endif // CONFIGURATION_ADV_H
1481
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/TinyBoy2/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h View File

1510
                                          // tweaks made to the configuration are affecting the printer in real-time.
1510
                                          // tweaks made to the configuration are affecting the printer in real-time.
1511
 #endif
1511
 #endif
1512
 
1512
 
1513
+/**
1514
+ * NanoDLP Sync support
1515
+ *
1516
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1517
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1518
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1519
+ */
1520
+//#define NANODLP_Z_SYNC
1521
+ 
1513
 #endif // CONFIGURATION_ADV_H
1522
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h View File

1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1505
 #endif
1505
 #endif
1506
 
1506
 
1507
+/**
1508
+ * NanoDLP Sync support
1509
+ *
1510
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1511
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1512
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1513
+ */
1514
+//#define NANODLP_Z_SYNC
1515
+ 
1507
 #endif // CONFIGURATION_ADV_H
1516
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h View File

1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1505
 #endif
1505
 #endif
1506
 
1506
 
1507
+/**
1508
+ * NanoDLP Sync support
1509
+ *
1510
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1511
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1512
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1513
+ */
1514
+//#define NANODLP_Z_SYNC
1515
+ 
1507
 #endif // CONFIGURATION_ADV_H
1516
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1505
 #endif
1505
 #endif
1506
 
1506
 
1507
+/**
1508
+ * NanoDLP Sync support
1509
+ *
1510
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1511
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1512
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1513
+ */
1514
+//#define NANODLP_Z_SYNC
1515
+ 
1507
 #endif // CONFIGURATION_ADV_H
1516
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1505
 #endif
1505
 #endif
1506
 
1506
 
1507
+/**
1508
+ * NanoDLP Sync support
1509
+ *
1510
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1511
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1512
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1513
+ */
1514
+//#define NANODLP_Z_SYNC
1515
+ 
1507
 #endif // CONFIGURATION_ADV_H
1516
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

1509
                                          // tweaks made to the configuration are affecting the printer in real-time.
1509
                                          // tweaks made to the configuration are affecting the printer in real-time.
1510
 #endif
1510
 #endif
1511
 
1511
 
1512
+/**
1513
+ * NanoDLP Sync support
1514
+ *
1515
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1516
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1517
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1518
+ */
1519
+//#define NANODLP_Z_SYNC
1520
+ 
1512
 #endif // CONFIGURATION_ADV_H
1521
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1504
                                          // tweaks made to the configuration are affecting the printer in real-time.
1505
 #endif
1505
 #endif
1506
 
1506
 
1507
+/**
1508
+ * NanoDLP Sync support
1509
+ *
1510
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1511
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1512
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1513
+ */
1514
+//#define NANODLP_Z_SYNC
1515
+ 
1507
 #endif // CONFIGURATION_ADV_H
1516
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h View File

1503
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
                                          // tweaks made to the configuration are affecting the printer in real-time.
1504
 #endif
1504
 #endif
1505
 
1505
 
1506
+/**
1507
+ * NanoDLP Sync support
1508
+ *
1509
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1510
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1511
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1512
+ */
1513
+//#define NANODLP_Z_SYNC
1514
+ 
1506
 #endif // CONFIGURATION_ADV_H
1515
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/makibox/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1502
                                          // tweaks made to the configuration are affecting the printer in real-time.
1503
 #endif
1503
 #endif
1504
 
1504
 
1505
+/**
1506
+ * NanoDLP Sync support
1507
+ *
1508
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1509
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1510
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1511
+ */
1512
+//#define NANODLP_Z_SYNC
1513
+ 
1505
 #endif // CONFIGURATION_ADV_H
1514
 #endif // CONFIGURATION_ADV_H

+ 9
- 0
Marlin/example_configurations/wt150/Configuration_adv.h View File

1492
                                          // tweaks made to the configuration are affecting the printer in real-time.
1492
                                          // tweaks made to the configuration are affecting the printer in real-time.
1493
 #endif
1493
 #endif
1494
 
1494
 
1495
+/**
1496
+ * NanoDLP Sync support
1497
+ *
1498
+ * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" 
1499
+ * string to enable synchronization with DLP projector exposure. This change will allow to use
1500
+ * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands
1501
+ */
1502
+//#define NANODLP_Z_SYNC
1503
+ 
1495
 #endif // CONFIGURATION_ADV_H
1504
 #endif // CONFIGURATION_ADV_H

+ 1
- 0
Marlin/language.h View File

144
 #define MSG_BUSY_PROCESSING                 "busy: processing"
144
 #define MSG_BUSY_PROCESSING                 "busy: processing"
145
 #define MSG_BUSY_PAUSED_FOR_USER            "busy: paused for user"
145
 #define MSG_BUSY_PAUSED_FOR_USER            "busy: paused for user"
146
 #define MSG_BUSY_PAUSED_FOR_INPUT           "busy: paused for input"
146
 #define MSG_BUSY_PAUSED_FOR_INPUT           "busy: paused for input"
147
+#define MSG_Z_MOVE_COMP                     "Z_move_comp"
147
 #define MSG_RESEND                          "Resend: "
148
 #define MSG_RESEND                          "Resend: "
148
 #define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
149
 #define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
149
 #define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "
150
 #define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "

+ 6
- 8
Marlin/stepper_indirection.h View File

429
     #define NORM_E_DIR() { switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(INVERT_E0_DIR); break; case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(INVERT_E1_DIR); } }
429
     #define NORM_E_DIR() { switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(INVERT_E0_DIR); break; case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(INVERT_E1_DIR); } }
430
     #define REV_E_DIR() { switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 2: E1_DIR_WRITE(INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); } }
430
     #define REV_E_DIR() { switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 2: E1_DIR_WRITE(INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); } }
431
   #endif
431
   #endif
432
+#elif ENABLED(MK2_MULTIPLEXER) // Even-numbered steppers are reversed
433
+  #define E_STEP_WRITE(v) E0_STEP_WRITE(v)
434
+  #define NORM_E_DIR() E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? !INVERT_E0_DIR: INVERT_E0_DIR)
435
+  #define REV_E_DIR() E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? INVERT_E0_DIR: !INVERT_E0_DIR)
432
 #elif EXTRUDERS > 4
436
 #elif EXTRUDERS > 4
433
   #define E_STEP_WRITE(v) { switch (current_block->active_extruder) { case 0: E0_STEP_WRITE(v); break; case 1: E1_STEP_WRITE(v); break; case 2: E2_STEP_WRITE(v); break; case 3: E3_STEP_WRITE(v); break; case 4: E4_STEP_WRITE(v); } }
437
   #define E_STEP_WRITE(v) { switch (current_block->active_extruder) { case 0: E0_STEP_WRITE(v); break; case 1: E1_STEP_WRITE(v); break; case 2: E2_STEP_WRITE(v); break; case 3: E3_STEP_WRITE(v); break; case 4: E4_STEP_WRITE(v); } }
434
   #define NORM_E_DIR() { switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; case 4: E4_DIR_WRITE(!INVERT_E4_DIR); } }
438
   #define NORM_E_DIR() { switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; case 4: E4_DIR_WRITE(!INVERT_E4_DIR); } }
472
   #endif
476
   #endif
473
 #else
477
 #else
474
   #define E_STEP_WRITE(v) E0_STEP_WRITE(v)
478
   #define E_STEP_WRITE(v) E0_STEP_WRITE(v)
475
-  #if ENABLED(MK2_MULTIPLEXER)
476
-    // Even-numbered steppers are reversed
477
-    #define NORM_E_DIR() E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? !INVERT_E0_DIR: INVERT_E0_DIR)
478
-    #define REV_E_DIR() E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? INVERT_E0_DIR: !INVERT_E0_DIR)
479
-  #else
480
-    #define NORM_E_DIR() E0_DIR_WRITE(!INVERT_E0_DIR)
481
-    #define REV_E_DIR() E0_DIR_WRITE(INVERT_E0_DIR)
482
-  #endif
479
+  #define NORM_E_DIR() E0_DIR_WRITE(!INVERT_E0_DIR)
480
+  #define REV_E_DIR() E0_DIR_WRITE(INVERT_E0_DIR)
483
 #endif
481
 #endif
484
 
482
 
485
 #endif // STEPPER_INDIRECTION_H
483
 #endif // STEPPER_INDIRECTION_H

Loading…
Cancel
Save