jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It's not golf

Browse Source
This commit is contained in:
Scott Lahteine
2020-12-05 22:42:15 -06:00
parent ae24cfa655
commit 48b61b7cbd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/module/endstops.cpp
+5 -5
View File
@@ -590,7 +590,7 @@ void Endstops::update() {
#endif
#endif
#if HAS_Z_MIN && !Z_SPI_SENSORLESS && DISABLED(PROBE_ENABLED_INPUTT)
#if HAS_Z_MIN && !Z_SPI_SENSORLESS && DISABLED(PROBE_ENABLED_INPUT)
UPDATE_ENDSTOP_BIT(Z, MIN);
#if ENABLED(Z_MULTI_ENDSTOPS)
#if HAS_Z2_MIN
@@ -616,16 +616,16 @@ void Endstops::update() {
#endif
// When closing the gap check the enabled probe
#if HAS_CUSTOM_PROBE_PIN && DISABLED(PROBE_ENABLED_INPUTT)
#if HAS_CUSTOM_PROBE_PIN && DISABLED(PROBE_ENABLED_INPUT)
UPDATE_ENDSTOP_BIT(Z, MIN_PROBE);
#endif
#if ENABLED(PROBE_ENABLED_INPUTT)
#if ENABLED(PROBE_ENABLED_INPUT)
#if HAS_CUSTOM_PROBE_PIN
UPDATE_ENDSTOP_BIT(Z, MIN);
SET_BIT_TO(live_state, _ENDSTOP(Z, MIN), ((READ(_ENDSTOP_PIN(Z, MIN)) != _ENDSTOP_INVERTING(Z, MIN_PROBE) && (READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUTT_STATE))));
SET_BIT_TO(live_state, _ENDSTOP(Z, MIN), ((READ(_ENDSTOP_PIN(Z, MIN)) != _ENDSTOP_INVERTING(Z, MIN_PROBE) && (READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUT_STATE))));
#else
SET_BIT_TO(live_state, _ENDSTOP(Z, MIN), ((READ(_ENDSTOP_PIN(Z, MIN)) != _ENDSTOP_INVERTING(Z, MIN) && (READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUTT_STATE))));
SET_BIT_TO(live_state, _ENDSTOP(Z, MIN), ((READ(_ENDSTOP_PIN(Z, MIN)) != _ENDSTOP_INVERTING(Z, MIN) && (READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUT_STATE))));
#endif
#endif
Marlin/src/module/probe.cpp
+1 -1
View File
@@ -482,7 +482,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
#if ENABLED(PROBE_CAN_TARE)
bool Probe::tare_z_probe() {
#if ENABLED(PROBE_TARE_WHILE_INACTIVEACTIVE)
if ((READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUTT_STATE)) {
if ((READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUT_STATE)) {
SERIAL_ECHOLN("Cannot tare probe, already Enabled");
return true;
}