From 077fd044e6ef62e4311a2fd9d67979a03dd230fe Mon Sep 17 00:00:00 2001 From: Blade2021 Date: Mon, 5 Jun 2017 14:50:32 -0400 Subject: [PATCH] bug fix Issue#16 Issue #16 --- AssemblyAutoBoard/AssemblyAutoBoard.ino | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/AssemblyAutoBoard/AssemblyAutoBoard.ino b/AssemblyAutoBoard/AssemblyAutoBoard.ino index 9760d22..58e2ef3 100644 --- a/AssemblyAutoBoard/AssemblyAutoBoard.ino +++ b/AssemblyAutoBoard/AssemblyAutoBoard.ino @@ -336,9 +336,19 @@ void loop() { previousTimer1 = currentTime; } } - if (currentTime - previousTimer1 <= sysArray[6]) { + if ((currentTime - previousTimer1 <= sysArray[6]) && (manualFeed == LOW)) { + //previousTimer1 = currentTime; + //machStop(0); + Serial.println("Motor stopped due to ERROR[0032]"); + Serial.print("preTime: "); + Serial.print(previousTimer1); + Serial.print(" - "); + Serial.print("currentTime: "); + Serial.print(currentTime); + Serial.print(" > "); + Serial.print("varTime: "); + Serial.println(sysArray[6]); previousTimer1 = currentTime; - machStop(0); } } // FEED OPEN