From e00aad84afe1660bc27da6e3ea4db1f73a183474 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 14 Feb 2019 16:41:46 -0600
Subject: [PATCH] Add M240 parameters D I J R S
---
Marlin/Configuration_adv.h | 10 +--
Marlin/src/config/default/Configuration_adv.h | 10 +--
.../3DFabXYZ/Migbot/Configuration_adv.h | 10 +--
.../AlephObjects/TAZ4/Configuration_adv.h | 10 +--
.../examples/Anet/A2/Configuration_adv.h | 10 +--
.../examples/Anet/A2plus/Configuration_adv.h | 10 +--
.../examples/Anet/A6/Configuration_adv.h | 10 +--
.../examples/Anet/A8/Configuration_adv.h | 10 +--
.../examples/AnyCubic/i3/Configuration_adv.h | 10 +--
.../config/examples/ArmEd/Configuration_adv.h | 10 +--
.../BIBO/TouchX/cyclops/Configuration_adv.h | 10 +--
.../BIBO/TouchX/default/Configuration_adv.h | 10 +--
.../examples/BQ/Hephestos/Configuration_adv.h | 10 +--
.../BQ/Hephestos_2/Configuration_adv.h | 10 +--
.../examples/BQ/WITBOX/Configuration_adv.h | 10 +--
.../examples/Cartesio/Configuration_adv.h | 10 +--
.../Creality/CR-10/Configuration_adv.h | 10 +--
.../Creality/CR-10S/Configuration_adv.h | 10 +--
.../Creality/CR-10mini/Configuration_adv.h | 10 +--
.../Creality/CR-8/Configuration_adv.h | 10 +--
.../Creality/Ender-2/Configuration_adv.h | 10 +--
.../Creality/Ender-3/Configuration_adv.h | 10 +--
.../Creality/Ender-4/Configuration_adv.h | 10 +--
.../examples/Einstart-S/Configuration_adv.h | 10 +--
.../config/examples/Felix/Configuration_adv.h | 10 +--
.../FlashForge/CreatorPro/Configuration_adv.h | 10 +--
.../FolgerTech/i3-2020/Configuration_adv.h | 10 +--
.../Formbot/Raptor/Configuration_adv.h | 10 +--
.../Formbot/T_Rex_2+/Configuration_adv.h | 10 +--
.../Formbot/T_Rex_3/Configuration_adv.h | 10 +--
.../Geeetech/A10M/Configuration_adv.h | 10 +--
.../Geeetech/A20M/Configuration_adv.h | 10 +--
.../Geeetech/MeCreator2/Configuration_adv.h | 10 +--
.../Prusa i3 Pro C/Configuration_adv.h | 10 +--
.../Prusa i3 Pro W/Configuration_adv.h | 10 +--
.../Infitary/i3-M508/Configuration_adv.h | 10 +--
.../examples/JGAurora/A5/Configuration_adv.h | 10 +--
.../examples/MakerParts/Configuration_adv.h | 10 +--
.../examples/Malyan/M150/Configuration_adv.h | 10 +--
.../examples/Malyan/M200/Configuration_adv.h | 10 +--
.../Micromake/C1/enhanced/Configuration_adv.h | 10 +--
.../examples/Mks/Robin/Configuration_adv.h | 10 +--
.../examples/Mks/Sbase/Configuration_adv.h | 10 +--
.../RapideLite/RL200/Configuration_adv.h | 10 +--
.../examples/RigidBot/Configuration_adv.h | 10 +--
.../config/examples/SCARA/Configuration_adv.h | 10 +--
.../examples/Sanguinololu/Configuration_adv.h | 10 +--
.../examples/TheBorg/Configuration_adv.h | 10 +--
.../examples/TinyBoy2/Configuration_adv.h | 10 +--
.../examples/Tronxy/X3A/Configuration_adv.h | 10 +--
.../UltiMachine/Archim1/Configuration_adv.h | 10 +--
.../UltiMachine/Archim2/Configuration_adv.h | 10 +--
.../examples/VORONDesign/Configuration_adv.h | 10 +--
.../Velleman/K8200/Configuration_adv.h | 10 +--
.../Velleman/K8400/Configuration_adv.h | 10 +--
.../WASP/PowerWASP/Configuration_adv.h | 10 +--
.../Wanhao/Duplicator 6/Configuration_adv.h | 10 +--
.../delta/Anycubic/Kossel/Configuration_adv.h | 10 +--
.../FLSUN/auto_calibrate/Configuration_adv.h | 10 +--
.../delta/FLSUN/kossel/Configuration_adv.h | 10 +--
.../FLSUN/kossel_mini/Configuration_adv.h | 10 +--
.../Geeetech/Rostock 301/Configuration_adv.h | 10 +--
.../delta/MKS/SBASE/Configuration_adv.h | 10 +--
.../Tevo Little Monster/Configuration_adv.h | 10 +--
.../delta/generic/Configuration_adv.h | 10 +--
.../delta/kossel_mini/Configuration_adv.h | 10 +--
.../delta/kossel_xl/Configuration_adv.h | 10 +--
.../gCreate/gMax1.5+/Configuration_adv.h | 10 +--
.../examples/makibox/Configuration_adv.h | 10 +--
.../tvrrug/Round2/Configuration_adv.h | 10 +--
.../config/examples/wt150/Configuration_adv.h | 10 +--
Marlin/src/feature/pause.cpp | 4 +-
Marlin/src/feature/pause.h | 2 +-
Marlin/src/gcode/feature/camera/M240.cpp | 90 +++++++++++--------
74 files changed, 409 insertions(+), 397 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 973fae141a8..02d98b98044 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h
index 973fae141a8..02d98b98044 100644
--- a/Marlin/src/config/default/Configuration_adv.h
+++ b/Marlin/src/config/default/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
index 6966123765c..a92be459ad0 100644
--- a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
+++ b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
index 7f895474726..ac838f52523 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
index 0e0382577cc..03c7b4356da 100644
--- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
index 0e0382577cc..03c7b4356da 100644
--- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
index 331871e739b..e4a3551720d 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
@@ -1814,9 +1814,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1827,10 +1827,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
index 96fb6a07313..2cbd5697be7 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h
index 089f7c08e9c..ab4a2ae4cfa 100644
--- a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h
+++ b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h
index ca396aa21c6..9bb0f8cdd3b 100644
--- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h
+++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h
@@ -1820,9 +1820,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1833,10 +1833,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
index f7f14f4fbc6..59c4f0fac39 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
@@ -1814,9 +1814,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1827,10 +1827,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
index b937796776c..36566a9c028 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
index 7cef325493c..e6b6c858017 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
index 60b8919d5d1..1c9d92fbfcb 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
@@ -1823,9 +1823,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1836,10 +1836,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
index 7cef325493c..e6b6c858017 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
index 596d7cb527a..c7771ab3d83 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
index 1e1f491d04f..adca69991ec 100644
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
index fa084348ce4..904ea109da2 100644
--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
index d0e5624c422..58bcd2a6a5a 100644
--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
index 03383d23d80..26574bfc67a 100644
--- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
index b4e49612d30..0ff923351d0 100644
--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
index 22b8eab1131..0ba93dcfc88 100644
--- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
index dca312e3439..bc451683db9 100644
--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
index 67b0c085bd6..4423efedee1 100644
--- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h
index f2060816d11..01e706d0e29 100644
--- a/Marlin/src/config/examples/Felix/Configuration_adv.h
+++ b/Marlin/src/config/examples/Felix/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h
index a376176bf03..dee3ef2c0a9 100644
--- a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h
+++ b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h
@@ -1814,9 +1814,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1827,10 +1827,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
index c754aadebab..97c70f77b00 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
index baac5a8ea87..bf0f6f3a18e 100644
--- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
index d8b7e6fcb16..4a49b4dbc0f 100644
--- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
@@ -1820,9 +1820,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1833,10 +1833,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
index 89d623517f3..b805afb2eb0 100644
--- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
@@ -1820,9 +1820,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1833,10 +1833,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h
index b5fc3b45358..ac6d87e8168 100644
--- a/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h
index dce5bb7b909..62a57a90eea 100644
--- a/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
index 1a89ced6284..12a615a6b10 100644
--- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
index 000c21265df..d1e03c959ad 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
index 000c21265df..d1e03c959ad 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
index 9edfd22e543..17c219d6a50 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
index 58106185374..fa23ef39405 100644
--- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
index 115beaf8657..60a6b326e07 100644
--- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
index 7e454abba1d..952433b0278 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
index 34cd260fa72..bf6440ec478 100644
--- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
index 3979836eba9..d68637944a5 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
index 5d51e5fe0ef..2d9cfc6257e 100644
--- a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
+++ b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
index 278961994ef..9325d0b270f 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
@@ -1823,9 +1823,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1836,10 +1836,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h
index 728994d89f9..172a787657b 100644
--- a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h
+++ b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
index e233ec781a4..6a8e022871b 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h
index 7ec494b0838..04f55bf5efd 100644
--- a/Marlin/src/config/examples/SCARA/Configuration_adv.h
+++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
index ae9531c6d01..df1a45ee616 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
index 5b8cac5acf7..54c8c1913df 100644
--- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
index 6ea4bd899c3..c5ca3534133 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
index 4317d0ac8dd..c365f242a25 100644
--- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
+++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
index e0069a46805..90f37df4b91 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
index 9a8346a2702..5b157fd09cc 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h
index 24915df994d..bedf3d4978d 100644
--- a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h
+++ b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
index 936415d71a0..1232065e607 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
@@ -1828,9 +1828,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1841,10 +1841,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
index 699092e8334..d47966894c5 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h
index 8fc2e81de68..58881627c0d 100644
--- a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h
+++ b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
index 6c4b9a89ca7..c47b253c7f9 100644
--- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
index 73764c0eba4..3e5cbd9e2a1 100644
--- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
index e1c13a5ca8c..a0c14b1ffd7 100644
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
index e1c13a5ca8c..a0c14b1ffd7 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
index 354a4f0f0a1..bc4077a55f4 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
index 27dafd20f54..19877be5c3e 100644
--- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
@@ -1818,9 +1818,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1831,10 +1831,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
index 9b7c917e925..761123301b6 100644
--- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
index 597336c2fde..2db509810cb 100644
--- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
index 354a4f0f0a1..bc4077a55f4 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
index 4edd16ca59f..fbcea310fe4 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
index b271a0eaf43..64d55d78345 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
@@ -1817,9 +1817,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1830,10 +1830,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
index fddc0bcc9a6..cb811ce59f6 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h
index 9607d97d9ec..a82a92a6924 100644
--- a/Marlin/src/config/examples/makibox/Configuration_adv.h
+++ b/Marlin/src/config/examples/makibox/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
index e838ec7f3ec..0dcc938bb6c 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
@@ -1815,9 +1815,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1828,10 +1828,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h
index c617cca9db0..1ca720f0a83 100644
--- a/Marlin/src/config/examples/wt150/Configuration_adv.h
+++ b/Marlin/src/config/examples/wt150/Configuration_adv.h
@@ -1816,9 +1816,9 @@
//#define PHOTO_GCODE
#if ENABLED(PHOTO_GCODE)
// A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise }
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move
+ //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
+ //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
+ //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
// Canon RC-1 or homebrew digital camera trigger
// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
@@ -1829,10 +1829,10 @@
//#define CHDK_PIN 4
// Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos }
+ //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
// Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms)
+ //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
#endif
/**
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 5226807e6c3..7dc63786d66 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -111,12 +111,12 @@ static bool ensure_safe_temperature(const AdvancedPauseMode mode=ADVANCED_PAUSE_
return thermalManager.wait_for_hotend(active_extruder);
}
-void do_pause_e_move(const float &length, const float &fr) {
+void do_pause_e_move(const float &length, const float &fr_mm_s) {
#if HAS_FILAMENT_SENSOR
runout.reset();
#endif
current_position[E_AXIS] += length / planner.e_factor[active_extruder];
- planner.buffer_line(current_position, fr, active_extruder);
+ planner.buffer_line(current_position, fr_mm_s, active_extruder);
planner.synchronize();
}
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index 621a70934cc..6e82013a460 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -79,7 +79,7 @@ extern uint8_t did_pause_print;
#define DXC_PASS
#endif
-void do_pause_e_move(const float &length, const float &fr);
+void do_pause_e_move(const float &length, const float &fr_mm_s);
bool pause_print(const float &retract, const point_t &park_point, const float &unload_length=0, const bool show_lcd=false DXC_PARAMS);
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index c3cd5ab1360..689252a3528 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -42,30 +42,29 @@
#include "../../../feature/pause.h"
#endif
- inline void e_move_m240(const float length) {
- if (_PHOTO_RETRACT_MM) {
- constexpr float rfr = (MMS_TO_MMM(
+ #ifdef PHOTO_RETRACT_MM
+ inline void e_move_m240(const float length, const float fr_mm_s) {
+ if (length && thermalManager.hotEnoughToExtrude(active_extruder)) {
#if ENABLED(ADVANCED_PAUSE_FEATURE)
- PAUSE_PARK_RETRACT_FEEDRATE
- #elif ENABLED(FWRETRACT)
- RETRACT_FEEDRATE
- #else
- 45
- #endif
- ));
- if (thermalManager.hotEnoughToExtrude(active_extruder)) {
- #if ENABLED(ADVANCED_PAUSE_FEATURE)
- do_pause_e_move(length, rfr);
+ do_pause_e_move(length, fr_mm_s);
#else
current_position[E_AXIS] += length / planner.e_factor[active_extruder];
- planner.buffer_line(current_position, MMM_TO_MMS(rfr), active_extruder);
+ planner.buffer_line(current_position, fr_mm_s, active_extruder);
#endif
}
}
- }
+ #endif
#endif
+#if PIN_EXISTS(PHOTOGRAPH)
+ constexpr uint8_t NUM_PULSES = 16;
+ constexpr float PULSE_LENGTH = 0.01524;
+ inline void set_photo_pin(const uint8_t state) { WRITE(PHOTOGRAPH_PIN, state); _delay_ms(PULSE_LENGTH); }
+ inline void tweak_photo_pin() { set_photo_pin(HIGH); set_photo_pin(LOW); }
+ inline void spin_photo_pin() { for (uint8_t i = NUM_PULSES; i--;) tweak_photo_pin(); }
+#endif
+
/**
* M240: Trigger a camera by...
*
@@ -75,20 +74,41 @@
* See http://www.doc-diy.net/photo/rc-1_hacked/
* - PHOTO_SWITCH_POSITION : Bump a physical switch with the X-carriage using a
* configured position, delay, and retract length.
- * Parameters:
- * X - Move to X before triggering the shutter (Requires PHOTO_POSITION)
- * Y - Move to Y before triggering the shutter (Requires PHOTO_POSITION)
- * Z - Raise Z by a distance before triggering the shutter (Requires PHOTO_POSITION)
- * P - Delay (ms) after triggering the shutter
+ *
+ * PHOTO_POSITION parameters:
+ * R - Retract/recover length (current units)
+ * S - Retract/recover feedrate (mm/m)
+ * X - Move to X before triggering the shutter
+ * Y - Move to Y before triggering the shutter
+ * Z - Raise Z by a distance before triggering the shutter
+ *
+ * PHOTO_SWITCH_POSITION parameters:
+ * D - Duration (ms) to hold down switch (Requires PHOTO_SWITCH_MS)
+ * P - Delay (ms) after triggering the shutter (Requires PHOTO_SWITCH_MS)
+ * I - Switch trigger position override X
+ * J - Switch trigger position override Y
*/
void GcodeSuite::M240() {
#ifdef PHOTO_POSITION
+ if (axis_unhomed_error()) return;
+
const float old_pos[XYZ] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] };
#ifdef PHOTO_RETRACT_MM
- e_move_m240(-(_PHOTO_RETRACT_MM));
+ constexpr float rfr = (MMS_TO_MMM(
+ #if ENABLED(ADVANCED_PAUSE_FEATURE)
+ PAUSE_PARK_RETRACT_FEEDRATE
+ #elif ENABLED(FWRETRACT)
+ RETRACT_FEEDRATE
+ #else
+ 45
+ #endif
+ ));
+ const float rval = parser.seenval('R') ? parser.value_linear_units() : _PHOTO_RETRACT_MM,
+ sval = parser.seenval('S') ? MMM_TO_MMS(parser.value_feedrate()) : rfr;
+ e_move_m240(-rval, sval);
#endif
constexpr float photo_position[XYZ] = PHOTO_POSITION;
@@ -101,10 +121,14 @@ void GcodeSuite::M240() {
do_blocking_move_to(raw);
#ifdef PHOTO_SWITCH_POSITION
- const float photo_switch_position[2] = PHOTO_SWITCH_POSITION;
- do_blocking_move_to_xy(photo_switch_position[X_AXIS], photo_switch_position[Y_AXIS], get_homing_bump_feedrate(X_AXIS));
+ constexpr float photo_switch_position[2] = PHOTO_SWITCH_POSITION;
+ const float sraw[] = {
+ parser.seenval('I') ? RAW_X_POSITION(parser.value_linear_units()) : photo_switch_position[X_AXIS],
+ parser.seenval('J') ? RAW_Y_POSITION(parser.value_linear_units()) : photo_switch_position[Y_AXIS]
+ };
+ do_blocking_move_to_xy(sraw[X_AXIS], sraw[Y_AXIS], get_homing_bump_feedrate(X_AXIS));
#if PHOTO_SWITCH_MS > 0
- safe_delay(PHOTO_SWITCH_MS);
+ safe_delay(parser.intval('D', PHOTO_SWITCH_MS));
#endif
do_blocking_move_to(raw);
#endif
@@ -118,21 +142,9 @@ void GcodeSuite::M240() {
#elif HAS_PHOTOGRAPH
- const uint8_t NUM_PULSES = 16;
- const float PULSE_LENGTH = 0.01524;
- for (int i = 0; i < NUM_PULSES; i++) {
- WRITE(PHOTOGRAPH_PIN, HIGH);
- _delay_ms(PULSE_LENGTH);
- WRITE(PHOTOGRAPH_PIN, LOW);
- _delay_ms(PULSE_LENGTH);
- }
+ spin_photo_pin();
delay(7.33);
- for (int i = 0; i < NUM_PULSES; i++) {
- WRITE(PHOTOGRAPH_PIN, HIGH);
- _delay_ms(PULSE_LENGTH);
- WRITE(PHOTOGRAPH_PIN, LOW);
- _delay_ms(PULSE_LENGTH);
- }
+ spin_photo_pin();
#endif
@@ -142,7 +154,7 @@ void GcodeSuite::M240() {
#endif
do_blocking_move_to(old_pos);
#ifdef PHOTO_RETRACT_MM
- e_move_m240(_PHOTO_RETRACT_MM);
+ e_move_m240(rval, sval);
#endif
#endif
}