3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Fix and follow-up the PR #4955 (PINS_DEBUGGING and M43: Read pin states), etc
This commit is contained in:
Scott Lahteine 2016-10-10 13:27:52 -05:00 • committed by GitHub
commit a07033a6c1
51 changed files with 742 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View file

@ -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