Skip to content

Commit

Permalink
GenericGcodeDriver: Add support for grblHAL HTTP-upload. Fixes #207
Browse files Browse the repository at this point in the history
  • Loading branch information
@pimsierhuis
pimsierhuis committed Feb 1, 2024
1 parent f8b6202 commit 9280578
Showing 1 changed file with 77 additions and 18 deletions.
95 changes: 77 additions & 18 deletions src/main/java/de/thomas_oster/liblasercut/drivers/GenericGcodeDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import de.thomas_oster.liblasercut.platform.Util;
import net.sf.corn.httpclient.HttpClient;
import net.sf.corn.httpclient.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import purejavacomm.CommPort;
import purejavacomm.CommPortIdentifier;
import purejavacomm.NoSuchPortException;
Expand All @@ -51,15 +52,14 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
import java.math.BigInteger;
import java.net.*;
import java.net.http.HttpRequest;
import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
Expand Down Expand Up @@ -119,8 +119,9 @@ public class GenericGcodeDriver extends LaserCutter {
protected static final String UPLOAD_METHOD_IP = "IP";
protected static final String UPLOAD_METHOD_SERIAL = "Serial";
protected static final String UPLOAD_METHOD_OCTOPRINT = "Octoprint";
protected static final String UPLOAD_METHOD_GRBLHAL = "grblHAL";

protected static final String[] uploadMethodList = {UPLOAD_METHOD_FILE, UPLOAD_METHOD_HTTP, UPLOAD_METHOD_IP, UPLOAD_METHOD_SERIAL, UPLOAD_METHOD_OCTOPRINT};
protected static final String[] uploadMethodList = {UPLOAD_METHOD_FILE, UPLOAD_METHOD_HTTP, UPLOAD_METHOD_IP, UPLOAD_METHOD_SERIAL, UPLOAD_METHOD_OCTOPRINT, UPLOAD_METHOD_GRBLHAL};

private String lineend = "LF";

Expand Down Expand Up @@ -603,12 +604,41 @@ protected void http_upload(URI url, String data, String filename) throws IOExcep
HttpClient client = new HttpClient(url);
client.putAdditionalRequestProperty("X-Filename", filename);
HttpResponse response = client.sendData(HttpClient.HTTP_METHOD.POST, data);
if (response == null || response.hasError())
{
if (response == null || response.hasError()) {
throw new IOException("Error during POST Request");
}
}

private void http_upload_grblhal(String baseUri, byte[] data, String jobname) throws IOException {
// Implement https://github.com/grblHAL/Plugin_networking/blob/master/http_upload.c
// see also https://esp3d.io/esp3d-webui/v3.x/documentation/api/fileupload/index.html

String filename = jobname;
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost uploadFile = new HttpPost(baseUri + "?t=" + Long.toString(System.currentTimeMillis()));
MultipartEntityBuilder builder = MultipartEntityBuilder.create();

builder.addTextBody("path", "/");
builder.addTextBody(filename + "S", Integer.toString(data.length));
builder.addTextBody(filename + "T", DateTimeFormatter.ofPattern("yyyy-MM-hh'T'hh:mm:ss").format(LocalDateTime.now()));

builder.addBinaryBody(
"myfiles",
data,
ContentType.create("text/x.gcode"),
filename
);

HttpEntity multipart = builder.build();
uploadFile.setEntity(multipart);
try (CloseableHttpResponse response = httpClient.execute(uploadFile))
{
if (response.getStatusLine().getStatusCode() != 200) {
throw new IOException("Error: grblHAL returned "+response.getStatusLine().getReasonPhrase());
}
}
}

protected void http_play(String filename) throws IOException, URISyntaxException
{
String command = "play /sd/"+filename;
Expand All @@ -626,13 +656,32 @@ protected void http_commands(String commands, String filename) throws IOExceptio

protected void http_command(String command) throws IOException, URISyntaxException
{
command = command + "\n";
URI url = new URI(getHttpUploadUrl().replace("upload", "command"));
HttpClient client = new HttpClient(url);
HttpResponse response = client.sendData(HttpClient.HTTP_METHOD.POST, command);
if (response == null || response.hasError())
if (UPLOAD_METHOD_HTTP.equals(uploadMethod))
{
throw new IOException("Error during POST Request");
command = command + "\n";
URI url = new URI(getHttpUploadUrl().replace("upload", "command"));
HttpClient client = new HttpClient(url);
HttpResponse response = client.sendData(HttpClient.HTTP_METHOD.POST, command);
if (response == null || response.hasError())
{
throw new IOException("Error during POST Request");
}
}
else if (UPLOAD_METHOD_GRBLHAL.equals(uploadMethod))
{
CloseableHttpClient httpClient = HttpClients.createDefault();
String encodedCommand = URLEncoder.encode(command, StandardCharsets.UTF_8.toString());

String baseUrl = getHttpUploadUrl().replace("sdfiles", "command");
String completeUrl = baseUrl + "?cmd=" + encodedCommand;

HttpGet httpGet = new HttpGet(completeUrl);
try (CloseableHttpResponse response = httpClient.execute(httpGet))
{
if (response.getStatusLine().getStatusCode() != 200) {
throw new IOException("Error: grblHAL returned "+response.getStatusLine().getReasonPhrase());
}
}
}
}

Expand Down Expand Up @@ -829,7 +878,7 @@ else if (UPLOAD_METHOD_SERIAL.equals(uploadMethod))
throw new IOException(error);
}
}
else if (UPLOAD_METHOD_HTTP.equals(uploadMethod))
else if (UPLOAD_METHOD_HTTP.equals(uploadMethod) || UPLOAD_METHOD_GRBLHAL.equals(uploadMethod))
{
if (getHttpUploadUrl() == null || getHttpUploadUrl().equals(""))
{
Expand Down Expand Up @@ -889,6 +938,16 @@ else if (UPLOAD_METHOD_OCTOPRINT.equals(uploadMethod)) {
out.close();
octoprint_upload(getHost(), getApiKey(), outputBuffer.toByteArray(), jobname, this.isAutoPlay());
}
else if (UPLOAD_METHOD_GRBLHAL.equals(uploadMethod))
{
out.close();
http_upload_grblhal(getHttpUploadUrl(), outputBuffer.toByteArray(), jobname);
if (this.getPostHttpUploadGcode() != null && !this.getPostHttpUploadGcode().equals(""))
{
http_commands(this.getPostHttpUploadGcode(), jobname);
}
// Autoplay can be implemented by adding "$F=$filename" to PostHttpUploadGcode
}
else
{
if (in != null)
Expand Down

0 comments on commit 9280578

Please sign in to comment.