Skip to content
Snippets Groups Projects
Commit 0f42ca51 authored by James Churchill's avatar James Churchill
Browse files

Fix broken Smoothieboard serial and IP upload methods.

parent 07612496
No related branches found
No related tags found
No related merge requests found
......@@ -245,7 +245,7 @@ public class GenericGcodeDriver extends LaserCutter {
return exportPath;
}
private String uploadMethod = "";
protected String uploadMethod = "";
public void setUploadMethod(Object method)
{
......
......@@ -47,13 +47,13 @@ public class SmoothieBoard extends GenericGcodeDriver {
@Override
public String getIdentificationLine()
{
if (getHost() == null || "".equals(getHost()))
if (UPLOAD_METHOD_IP.equals(this.uploadMethod))
{
return "Smoothie";
return "Smoothie command shell";
}
else
{
return "Smoothie command shell";
return "Smoothie";
}
}
......@@ -62,7 +62,7 @@ public class SmoothieBoard extends GenericGcodeDriver {
{
String line = super.waitForLine();
//The telnet interface for smoothie prepends lines with '> '
if (getHost() != null && !"".equals(getHost()) && line.startsWith("> "))
if (UPLOAD_METHOD_IP.equals(this.uploadMethod) && line.startsWith("> "))
{
return line.substring(2);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment