diff --git a/src/com/t_oster/liblasercut/LibInfo.java b/src/com/t_oster/liblasercut/LibInfo.java index bcd18582c2b3c8c9f35533ce552543eee0771537..65ae343f26b9e5a63be848ade37e6c0829853114 100644 --- a/src/com/t_oster/liblasercut/LibInfo.java +++ b/src/com/t_oster/liblasercut/LibInfo.java @@ -29,7 +29,7 @@ import com.t_oster.liblasercut.drivers.LaosCutter; */ public class LibInfo { - private static String VERSION = "1.3"; + private static String VERSION = "1.4"; public static String getVersion() { diff --git a/src/com/t_oster/liblasercut/drivers/LaosCutter.java b/src/com/t_oster/liblasercut/drivers/LaosCutter.java index b1f5671399529df8de4a2ac9c29fa0d823dfeb5e..2df2e2f0dd397ea1ffa5cc10659dfd05b2e1c427 100644 --- a/src/com/t_oster/liblasercut/drivers/LaosCutter.java +++ b/src/com/t_oster/liblasercut/drivers/LaosCutter.java @@ -134,7 +134,7 @@ public class LaosCutter extends LaserCutter { this.simpleMode = simpleMode; } - protected String hostname = "localhost"; + protected String hostname = "192.168.1.111"; /** * Get the value of hostname @@ -155,7 +155,7 @@ public class LaosCutter extends LaserCutter { this.hostname = hostname; } - protected int port = 515; + protected int port = 69; /** * Get the value of port @@ -176,7 +176,7 @@ public class LaosCutter extends LaserCutter { this.port = port; } - protected double mmPerStep = 0.006323126711476225; + protected double mmPerStep = 0.001; /** * Get the value of mmPerStep @@ -211,6 +211,10 @@ public class LaosCutter extends LaserCutter int speed = 50; int frequency = 500; double focus = 0; + //reset saved values, so the first ones get verbosed + this.currentPower = -1; + this.currentSpeed = -1; + this.currentFrequency = -1; for (VectorCommand cmd : vp.getCommandList()) { switch (cmd.getType()) @@ -506,7 +510,7 @@ public class LaosCutter extends LaserCutter //back to origin and shutdown if (this.isSimpleMode()) { - out.printf("0 0 0\n"); + //out.printf("0 0 0\n"); //Set focus to 0 out.printf(Locale.US, "2 %d\n", 0); } @@ -650,7 +654,7 @@ public class LaosCutter extends LaserCutter settingAttributes = new LinkedList<String>(); settingAttributes.add(SETTING_HOSTNAME); settingAttributes.add(SETTING_PORT); - settingAttributes.add(SETTING_GCODE); + //settingAttributes.add(SETTING_GCODE); settingAttributes.add(SETTING_BEDWIDTH); settingAttributes.add(SETTING_BEDHEIGHT); settingAttributes.add(SETTING_FLIPX);