0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3725 from esenapaj/patch-1

Browse source 
Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
This commit is contained in:
Scott Lahteine 2016-05-16 20:23:03 -07:00
parent 58339aea5f 95f30529a6
commit ce1d6981c2
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/Conditionals.h
View file

@ -387,13 +387,6 @@
#endif #endif
#endif #endif
/**
* Enable MECHANICAL_PROBE for Z_PROBE_ALLEN_KEY, for older configs
*/
#if ENABLED(Z_PROBE_ALLEN_KEY)
#define MECHANICAL_PROBE
#endif
/** /**
* Host keep alive * Host keep alive
*/ */
@ -742,7 +735,7 @@
#endif #endif
#endif #endif
#define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED)) #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))
#define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))) #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))

6
Marlin/Marlin_main.cpp
View file

@ -3238,7 +3238,7 @@ inline void gcode_G28() {
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
dock_sled(false); // engage (un-dock) the Z probe dock_sled(false); // engage (un-dock) the Z probe
#elif ENABLED(MECHANICAL_PROBE) || ENABLED(FIX_MOUNTED_PROBE) || (ENABLED(DELTA) && SERVO_LEVELING) #elif ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || (ENABLED(DELTA) && SERVO_LEVELING)
deploy_z_probe(); deploy_z_probe();
#endif #endif
@ -3583,6 +3583,10 @@ inline void gcode_G28() {
#endif // !DELTA #endif // !DELTA
#if ENABLED(MECHANICAL_PROBE)
stow_z_probe();
#endif
#ifdef Z_PROBE_END_SCRIPT #ifdef Z_PROBE_END_SCRIPT
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {

5
Marlin/SanityCheck.h
View file

@ -237,8 +237,9 @@
/** /**
* Only allow one probe option to be defined * Only allow one probe option to be defined
*/ */
#if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \ #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|| (ENABLED(MECHANICAL_PROBE) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \ || (ENABLED(MECHANICAL_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|| (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|| (HAS_Z_ENDSTOP_SERVO && ENABLED(Z_PROBE_SLED)) || (HAS_Z_ENDSTOP_SERVO && ENABLED(Z_PROBE_SLED))
#error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
#endif #endif