Browse Source

fix urscript bool values
fix radio button in grip ui

Martin Kunz 4 years ago
parent
commit
d0584962c2

+ 2 - 2
src/main/java/urgrip/programnodes/GripperBlowoutNodeContribution.java

@@ -47,9 +47,9 @@ public class GripperBlowoutNodeContribution implements ProgramNodeContribution {
     public void generateScript(ScriptWriter writer) {
         String ioName=programAPI.getInstallationNode(URGripInstallationNodeContribution.class).getBlowoutIO();
         int idx = IOHandler.getIOIndex(ioName);
-        writer.appendLine("set_standard_digital_out("+ idx +"," + 1 + ")");
+        writer.appendLine("set_standard_digital_out("+ idx +", True)");
         writer.appendLine("sleep("+ Float.toString(view.getDelay()/1000.0f) +")");
-        writer.appendLine("set_standard_digital_out("+ idx +"," + 0 + ")");
+        writer.appendLine("set_standard_digital_out("+ idx +", False)");
         System.out.println(writer.generateScript());
         writer.writeChildren();
     }

+ 4 - 4
src/main/java/urgrip/programnodes/GripperCoupleNodeContribution.java

@@ -46,11 +46,11 @@ public class GripperCoupleNodeContribution implements ProgramNodeContribution {
         int idxOpen = IOHandler.getIOIndex(ioNameOpen);
         int idxClose = IOHandler.getIOIndex(ioNameClose);
         if(model.get(KEY_ACTION,"COUPLE").equals("COUPLE")) {
-            writer.appendLine("set_standard_digital_out("+ idxOpen +"," + 1 + ")");
-            writer.appendLine("set_standard_digital_out("+ idxClose +"," + 0 + ")");
+            writer.appendLine("set_standard_digital_out("+ idxOpen +", True)");
+            writer.appendLine("set_standard_digital_out("+ idxClose +", False)");
         } else {
-            writer.appendLine("set_standard_digital_out("+ idxOpen +"," + 0 + ")");
-            writer.appendLine("set_standard_digital_out("+ idxClose +"," + 1 + ")");
+            writer.appendLine("set_standard_digital_out("+ idxOpen +", False)");
+            writer.appendLine("set_standard_digital_out("+ idxClose +", True)");
         }
         System.out.println(writer.generateScript());
         writer.writeChildren();

+ 4 - 4
src/main/java/urgrip/programnodes/GripperGripNodeContribution.java

@@ -47,11 +47,11 @@ public class GripperGripNodeContribution implements ProgramNodeContribution {
         int idxOpen = IOHandler.getIOIndex(ioNameOpen);
         int idxClose = IOHandler.getIOIndex(ioNameClose);
         if(model.get(KEY_ACTION,"GRIP").equals("GRIP")) {
-            writer.appendLine("set_standard_digital_out("+ idxOpen +"," + 1 + ")");
-            writer.appendLine("set_standard_digital_out("+ idxClose +"," + 0 + ")");
+            writer.appendLine("set_standard_digital_out("+ idxOpen +", True)");
+            writer.appendLine("set_standard_digital_out("+ idxClose +", False)");
         } else {
-            writer.appendLine("set_standard_digital_out("+ idxOpen +"," + 0 + ")");
-            writer.appendLine("set_standard_digital_out("+ idxClose +"," + 1 + ")");
+            writer.appendLine("set_standard_digital_out("+ idxOpen +", False)");
+            writer.appendLine("set_standard_digital_out("+ idxClose +", True)");
         }
         System.out.println(writer.generateScript());
         writer.writeChildren();

+ 3 - 3
src/main/java/urgrip/programnodes/GripperGripNodeView.java

@@ -32,7 +32,7 @@ public class GripperGripNodeView implements SwingProgramNodeView<GripperGripNode
         inputBox.add(new JLabel("Action:"));
         inputBox.add(createHorizontalSpacing());
         gripButton = new JRadioButton("Grip");
-        ungripButton = new JRadioButton("Ungrip");
+        ungripButton = new JRadioButton("Release");
         ButtonGroup group = new ButtonGroup();
         group.add(gripButton);
         group.add(ungripButton);
@@ -50,7 +50,7 @@ public class GripperGripNodeView implements SwingProgramNodeView<GripperGripNode
     }
 
     public void setAction(String which) {
-        if(which.equals("COUPLE"))
+        if(which.equals("GRIP"))
             gripButton.setSelected(true);
         else
             ungripButton.setSelected(true);
@@ -59,6 +59,6 @@ public class GripperGripNodeView implements SwingProgramNodeView<GripperGripNode
 
     public String getAction() {
         if(gripButton.isSelected()) return "GRIP";
-        return "UNGRIP";
+        return "RELEASE";
     }
 }