From 00456b0cb32dfc397107ea7346beb2c0fde7b788 Mon Sep 17 00:00:00 2001
From: esenapaj <creation0004@gmail.com>
Date: Mon, 10 Oct 2016 14:22:17 +0900
Subject: [PATCH] Fix compilation errors
---
Marlin/Marlin_main.cpp | 4 ++--
Marlin/pinsDebug.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 5d0e0e3c83..6026d46da9 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4690,7 +4690,7 @@ inline void gcode_M42() {
pin_state[pin - first_pin] = digitalRead(pin);
}
- #if ENABLED(EMERGENCY_PARSER)
+ #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
wait_for_user = true;
#endif
@@ -4708,7 +4708,7 @@ inline void gcode_M42() {
}
}
- #if ENABLED(EMERGENCY_PARSER)
+ #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
if (!wait_for_user) break;
#endif
diff --git a/Marlin/pinsDebug.h b/Marlin/pinsDebug.h
index 25039c0691..d0b43a4794 100644
--- a/Marlin/pinsDebug.h
+++ b/Marlin/pinsDebug.h
@@ -36,7 +36,7 @@
#define _PIN_SAY(NAME) { SERIAL_ECHOPGM(STRINGIFY(NAME)); return true; }
#define PIN_SAY(NAME) if (pin == NAME) _PIN_SAY(_##NAME##_);
#define ANALOG_PIN_SAY(NAME) if (pin == analogInputToDigitalPin(NAME)) _PIN_SAY(_##NAME##_);
-#define IS_ANALOG(P) if ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(5)))
+#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(5)))
// Report pin name for a given fastio digital pin index
static bool report_pin_name(int8_t pin) {