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

Fix CALIBRATION_GCODE pin handling

Browse Source
This commit is contained in:
Scott Lahteine
2020-02-04 08:32:43 -06:00
parent 081ef46e76
commit 7bf2190f03
7 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/gcode/calibrate/G425.cpp
View File

@ -128,13 +128,15 @@ inline void park_above_object(measurements_t &m, const float uncertainty) {
#endif
inline bool read_calibration_pin() {
#if HAS_CALIBRATION_PIN
return (READ(CALIBRATION_PIN) != CALIBRATION_PIN_INVERTING);
#elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
return (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
#else
return (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING);
#endif
return (
#if PIN_EXISTS(CALIBRATION)
READ(CALIBRATION_PIN) != CALIBRATION_PIN_INVERTING
#elif HAS_CUSTOM_PROBE_PIN
READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING
#else
READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING
#endif
);
}
/**