From 4eca1174c4001fb6e5b9e26c1247bb30cf054535 Mon Sep 17 00:00:00 2001
From: quillford <adeebshihadeh@gmail.com>
Date: Sun, 30 Aug 2015 12:37:10 -0700
Subject: [PATCH] Added a Marlin driver
---
src/com/t_oster/liblasercut/drivers/Marlin.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/t_oster/liblasercut/drivers/Marlin.java b/src/com/t_oster/liblasercut/drivers/Marlin.java
index 16df4eb..4cad848 100644
--- a/src/com/t_oster/liblasercut/drivers/Marlin.java
+++ b/src/com/t_oster/liblasercut/drivers/Marlin.java
@@ -38,9 +38,9 @@ public class Marlin extends GenericGcodeDriver {
setWaitForOKafterEachLine(true);
setBaudRate(115200);
setLineend("CRLF");
- setInitDelay(0);
- setPreJobGcode(getPreJobGcode()+",G28 XY,M5");
- setPostJobGcode(getPostJobGcode()+",G28 XY,M5");
+ setInitDelay(10);
+ setPreJobGcode(getPreJobGcode()+",G28 XY,M3");
+ setPostJobGcode(getPostJobGcode()+",G0 X0Y0,M5");
//Marlin has no way to upload over the network so remove the upload url text
setHttpUploadUrl("");
@@ -82,7 +82,7 @@ public class Marlin extends GenericGcodeDriver {
String line = waitForLine();
if (line.startsWith(getIdentificationLine()))
{//we received the identification line ("start"), now we have to skip the rest of Marlin's dump
- while(!(waitForLine().startsWith("echo:SD init fail")))
+ while(!(waitForLine().startsWith("echo:SD")))
{
//do nothing and wait until Marlin has dumped all of the settings
}
--
GitLab