bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.

Browse Source 
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
This commit is contained in:
Chris Roadfeldt
2015-04-01 02:14:55 -05:00
parent fdb4ddbdea
commit a508d835db
5 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@@ -1240,7 +1240,7 @@ inline void sync_plan_position() {
st_synchronize();
#if defined(Z_PROBE_AND_ENDSTOP)
#if defined(Z_PROBE_ENDSTOP)
bool z_probe_endstop = (READ(Z_PROBE_PIN) != Z_PROBE_ENDSTOP_INVERTING);
if (z_probe_endstop) {
#else
@@ -1314,7 +1314,7 @@ inline void sync_plan_position() {
st_synchronize();
#if defined(Z_PROBE_AND_ENDSTOP)
#if defined(Z_PROBE_ENDSTOP)
bool z_probe_endstop = (READ(Z_PROBE_PIN) != Z_PROBE_ENDSTOP_INVERTING);
if (z_probe_endstop) {
#else
@@ -2805,13 +2805,17 @@ inline void gcode_M42() {
} // code_seen('S')
}
// If Z_PROBE_AND_ENDSTOP is changed to completely break it's bonds from Z_MIN_ENDSTOP and become
// it's own unique entity, then the following logic will need to be modified
// so it only uses the Z_PROBE
#if defined(ENABLE_AUTO_BED_LEVELING) && defined(Z_PROBE_REPEATABILITY_TEST)
#if (Z_MIN_PIN == -1) && (! defined (Z_PROBE_PIN) || Z_PROBE_PIN == -1)
#error "You must have a Z_MIN or Z_PROBE endstop in order to enable calculation of Z-Probe repeatability."
// This is redudant since the SanityCheck.h already checks for a valid Z_PROBE_PIN, but here for clarity.
#if defined (Z_PROBE_ENDSTOP)
#if (! defined (Z_PROBE_PIN) || Z_PROBE_PIN == -1)
#error "You must have a Z_PROBE_PIN defined in order to enable calculation of Z-Probe repeatability."
#endif
#else
#if (Z_MIN_PIN == -1) &&
#error "You must have a Z_MIN_PIN defined in order to enable calculation of Z-Probe repeatability."
#endif
#endif
/**