From 28910bf039234f32b9e8b0f9e33b78e92faeeb2f Mon Sep 17 00:00:00 2001
From: Thomas Oster <thomas.oster@rwth-aachen.de>
Date: Sun, 18 Mar 2012 10:10:54 +0100
Subject: [PATCH] LAOS Fixes: - Default values changed (0,001 step/mm, IP,
Port) - No return to 0/0 after job, because firmware does it - No GCode
Option (visible) because no firmware exists (yet) - Fix:
Power,Speed,Frequency were not put out on second job if same as in first job
---
src/com/t_oster/liblasercut/LibInfo.java | 2 +-
.../t_oster/liblasercut/drivers/LaosCutter.java | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/com/t_oster/liblasercut/LibInfo.java b/src/com/t_oster/liblasercut/LibInfo.java
index bcd1858..65ae343 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 b1f5671..2df2e2f 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);
--
GitLab