From ea29b71a3aae563a4635ca75883186b6039ee549 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 22 Sep 2018 03:22:55 -0400 Subject: [PATCH] Fix endstop reporting inverting logic --- Marlin/endstops.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/endstops.cpp b/Marlin/endstops.cpp index eb45e47ad..3480e9828 100644 --- a/Marlin/endstops.cpp +++ b/Marlin/endstops.cpp @@ -317,7 +317,7 @@ static void print_es_state(const bool is_hit, const char * const label=NULL) { void _O2 Endstops::M119() { SERIAL_PROTOCOLLNPGM(MSG_M119_REPORT); - #define ES_REPORT(S) print_es_state(READ(S##_PIN) == S##_ENDSTOP_INVERTING, PSTR(MSG_##S)) + #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S)) #if HAS_X_MIN ES_REPORT(X_MIN); #endif @@ -355,12 +355,12 @@ void _O2 Endstops::M119() { ES_REPORT(Z2_MAX); #endif #if ENABLED(Z_MIN_PROBE_ENDSTOP) - print_es_state(READ(Z_MIN_PROBE_PIN) == Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE)); + print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE)); #endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FRS_COUNT (1 + PIN_EXISTS(FIL_RUNOUT2) + PIN_EXISTS(FIL_RUNOUT3) + PIN_EXISTS(FIL_RUNOUT4) + PIN_EXISTS(FIL_RUNOUT5)) #if FRS_COUNT == 1 - print_es_state(READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING, MSG_FILAMENT_RUNOUT_SENSOR); + print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, MSG_FILAMENT_RUNOUT_SENSOR); #else for (uint8_t i = 1; i <= #if FRS_COUNT == 5 @@ -393,7 +393,7 @@ void _O2 Endstops::M119() { } SERIAL_PROTOCOLPGM(MSG_FILAMENT_RUNOUT_SENSOR); if (i > 1) { SERIAL_CHAR(' '); SERIAL_CHAR('0' + i); } - print_es_state(digitalRead(pin) == FIL_RUNOUT_INVERTING); + print_es_state(digitalRead(pin) != FIL_RUNOUT_INVERTING); } #endif #endif