From 0d502bf1d5e63f987f99aa431a058ae380969feb Mon Sep 17 00:00:00 2001
From: Michael Adams <michael@michaeladams.org>
Date: Mon, 22 Feb 2016 00:27:02 +1300
Subject: [PATCH] Better error handling during serial connection errors
---
.../drivers/GenericGcodeDriver.java | 68 ++++++++++++-------
1 file changed, 42 insertions(+), 26 deletions(-)
diff --git a/src/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java b/src/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java
index 7fe9b39..a76dc8e 100644
--- a/src/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java
+++ b/src/com/t_oster/liblasercut/drivers/GenericGcodeDriver.java
@@ -530,19 +530,23 @@ public class GenericGcodeDriver extends LaserCutter {
return "Does not seem to be a "+getModelName()+" on "+i.getName();
}
portIdentifier = i;
+ pl.taskChanged(this, "Connected");
return null;
}
catch (PortInUseException e)
{
- return "Port in use "+i.getName();
+ try { disconnect(""); } catch (Exception ex) { System.out.println(ex.getMessage()); }
+ return "Port in use: "+i.getName();
}
catch (IOException e)
{
- return "IO Error "+i.getName();
+ try { disconnect(""); } catch (Exception ex) { System.out.println(ex.getMessage()); }
+ return "IO Error from "+i.getName()+": "+e.getMessage();
}
catch (PureJavaIllegalStateException e)
{
- return "Could not open "+i.getName();
+ try { disconnect(""); } catch (Exception ex) { System.out.println(ex.getMessage()); }
+ return "Could not open "+i.getName()+": "+e.getMessage();
}
}
else
@@ -576,7 +580,12 @@ public class GenericGcodeDriver extends LaserCutter {
String error = "No serial port found";
if (portIdentifier == null && !getComport().equals("auto"))
{
- portIdentifier = CommPortIdentifier.getPortIdentifier(getComport());
+ try {
+ portIdentifier = CommPortIdentifier.getPortIdentifier(getComport());
+ }
+ catch (NoSuchPortException e) {
+ throw new IOException("No such port: "+getComport());
+ }
}
if (portIdentifier != null)
@@ -658,31 +667,38 @@ public class GenericGcodeDriver extends LaserCutter {
pl.taskChanged(this, "connecting...");
connect(pl);
pl.taskChanged(this, "sending");
- writeInitializationCode();
- pl.progressChanged(this, 20);
- int i = 0;
- int max = job.getParts().size();
- for (JobPart p : job.getParts())
- {
- if (p instanceof RasterPart)
- {
- RasterPart rp = (RasterPart) p;
- LaserProperty black = rp.getLaserProperty();
- LaserProperty white = black.clone();
- white.setProperty("power", 0.0f);
- p = convertRasterToVectorPart((RasterPart) p, black, white, p.getDPI(), false);
- }
- if (p instanceof VectorPart)
+ try {
+ writeInitializationCode();
+ pl.progressChanged(this, 20);
+ int i = 0;
+ int max = job.getParts().size();
+ for (JobPart p : job.getParts())
{
- //TODO: in direct mode use progress listener to indicate progress
- //of individual job
- writeVectorGCode((VectorPart) p, p.getDPI());
+ if (p instanceof RasterPart)
+ {
+ RasterPart rp = (RasterPart) p;
+ LaserProperty black = rp.getLaserProperty();
+ LaserProperty white = black.clone();
+ white.setProperty("power", 0.0f);
+ p = convertRasterToVectorPart((RasterPart) p, black, white, p.getDPI(), false);
+ }
+ if (p instanceof VectorPart)
+ {
+ //TODO: in direct mode use progress listener to indicate progress
+ //of individual job
+ writeVectorGCode((VectorPart) p, p.getDPI());
+ }
+ i++;
+ pl.progressChanged(this, 20 + (int) (i*(double) 60/max));
}
- i++;
- pl.progressChanged(this, 20 + (int) (i*(double) 60/max));
+ writeShutdownCode();
+ disconnect(job.getName()+".gcode");
+ }
+ catch (IOException e) {
+ pl.taskChanged(this, "disconnecting");
+ disconnect(job.getName()+".gcode");
+ throw e;
}
- writeShutdownCode();
- disconnect(job.getName()+".gcode");
pl.taskChanged(this, "sent.");
pl.progressChanged(this, 100);
}
--
GitLab