zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4257 from esenapaj/Follow-up-the-PR-#4253-etc

Browse source 
Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104), etc
This commit is contained in:
Scott Lahteine 2016-07-10 16:59:24 -07:00 committed by GitHub
parent 77283f5bf0 9e56d5825e
commit 5b87deebb6
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Marlin/Conditionals.h
View file

@ -846,16 +846,16 @@
/**
* MIN_Z_HEIGHT_FOR_HOMING / Z_RAISE_BETWEEN_PROBINGS
*/
#ifndef MIN_Z_HEIGHT_FOR_HOMING
#ifndef Z_RAISE_BETWEEN_PROBINGS
#define MIN_Z_HEIGHT_FOR_HOMING 0
#else
#define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS
#endif
#endif
#ifndef Z_RAISE_BETWEEN_PROBINGS
#define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
#endif
#ifndef MIN_Z_HEIGHT_FOR_HOMING
#ifndef Z_RAISE_BETWEEN_PROBINGS
#define MIN_Z_HEIGHT_FOR_HOMING 0
#else
#define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS
#endif
#endif
#ifndef Z_RAISE_BETWEEN_PROBINGS
#define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
#endif
#endif //CONFIGURATION_LCD
#endif //CONDITIONALS_H

5
Marlin/example_configurations/Felix/DUAL/Configuration.h
View file

@ -771,7 +771,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Print job timer
//
// Enable this option to automatically start and stop the
// print job timer when M104 and M109 commands are received.
// print job timer when M104/M109/M190 commands are received.
// M104 (extruder without wait) - high temp = none, low temp = stop timer
// M109 (extruder with wait) - high temp = start timer, low temp = stop timer
// M190 (bed with wait) - high temp = start timer, low temp = none
//
// In all cases the timer can be started and stopped using
// the following commands:

5
Marlin/example_configurations/K8400/Dual Heads/Configuration.h
View file

@ -790,7 +790,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Print job timer
//
// Enable this option to automatically start and stop the
// print job timer when M104 and M109 commands are received.
// print job timer when M104/M109/M190 commands are received.
// M104 (extruder without wait) - high temp = none, low temp = stop timer
// M109 (extruder with wait) - high temp = start timer, low temp = stop timer
// M190 (bed with wait) - high temp = start timer, low temp = none
//
// In all cases the timer can be started and stopped using
// the following commands: