Suport for modal G1 (Changed for pull request)

[alromh87]

Hi, I have added support for modal G1 as output by pcb2gcode, and would like to have it included in the main code, here are the relevant lines:

diff --git a/src/cnc/gcode/controller/CNCCommand.java b/src/cnc/gcode/controller/CNCCommand.java index aaa30d4..f0485af 100644 --- a/src/cnc/gcode/controller/CNCCommand.java +++ b/src/cnc/gcode/controller/CNCCommand.java @@ -269,6 +269,22 @@ public class CNCCommand { } else {

• switch(p.get(0).letter)
• {
• case 'G':
• case 'M':
• break;
• default:
• if(p.contains('X') || p.contains('Y') || p.contains('Z'))
• {
• if(c.lastMovetype==Type.G1){
• p.insert(0, 'G', 1, true);
• message+="Using modal G1! ";
• }
• }
• break;
• }

•    if(!p.get(0).isint)
     {
         state=State.ERROR;

  diff --git a/src/cnc/gcode/controller/CommandParsing.java b/src/cnc/gcode/controller/CommandParsing.java index 23edabc..ae2fd19 100644 --- a/src/cnc/gcode/controller/CommandParsing.java +++ b/src/cnc/gcode/controller/CommandParsing.java @@ -168,6 +168,16 @@ public class CommandParsing { return parameters.contains(new Parameter(letter)); }

• public boolean insert(int i, char letter, double value, boolean isint){
• Parameter p = new Parameter(letter, value, isint);
• if (parameters.contains(p)){
• return false;
• } else {
• parameters.add(i, p);
• }
• return true;
• }

• public Parameter get(int index) { return parameters.get(index);

Thnaks