Merge pull request #4974 from esenapaj/Follow-up-the-PR-#4955

Fix and follow-up the PR #4955 (PINS_DEBUGGING and M43: Read pin states), etc
2016-10-10 13:27:52 -05:00
parent f8199b2cc1 f41c60d4a4
commit a07033a6c1
51 changed files with 742 additions and 487 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4700,7 +4700,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

@@ -4718,7 +4718,7 @@ inline void gcode_M42() {
          }
        }

-        #if ENABLED(EMERGENCY_PARSER)
+        #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
          if (!wait_for_user) break;
        #endif