Skip to content

Commit 3b86925

Browse files
committed
Merge pull request #15 from NeuronRobotics/development
Release of 3.10.0
2 parents 560b98e + 47369bb commit 3b86925

File tree

128 files changed

+1290
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1290
-810
lines changed

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/AbstractRobotDrive.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.neuronrobotics.addons.driving;
22

33
import java.util.ArrayList;
4+
45
import com.neuronrobotics.sdk.pid.IPIDEventListener;
56
import com.neuronrobotics.sdk.pid.PIDLimitEvent;
67

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/AckermanBot.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.neuronrobotics.sdk.common.Log;
55
import com.neuronrobotics.sdk.dyio.peripherals.DigitalOutputChannel;
66
import com.neuronrobotics.sdk.pid.PIDChannel;
7-
import com.neuronrobotics.sdk.pid.PIDCommandException;
87
import com.neuronrobotics.sdk.pid.PIDEvent;
98
import com.neuronrobotics.sdk.util.ThreadUtil;
109

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/HokuyoURGDevice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.neuronrobotics.addons.driving;
22

3+
import gnu.io.NRSerialPort;
4+
35
import java.io.DataInputStream;
46
import java.io.DataOutputStream;
57
import java.io.IOException;
@@ -8,8 +10,6 @@
810
import com.neuronrobotics.sdk.common.ByteList;
911
import com.neuronrobotics.sdk.util.ThreadUtil;
1012

11-
import gnu.io.NRSerialPort;
12-
1313
public class HokuyoURGDevice {
1414
private NRSerialPort serial;
1515
private DataInputStream ins;

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/SimpleDisplay.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.neuronrobotics.addons.driving;
22

33
import java.awt.Color;
4-
import java.awt.color.CMMException;
54
import java.util.ArrayList;
65

76
import javax.swing.JFrame;

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/virtual/VirtualLineSensor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import com.neuronrobotics.addons.driving.AbstractRobotDrive;
66
import com.neuronrobotics.addons.driving.AbstractSensor;
7-
87
import com.neuronrobotics.sdk.util.ThreadUtil;
98

109
public class VirtualLineSensor extends AbstractSensor {

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/virtual/VirtualPuckBot.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.neuronrobotics.addons.driving.IPuckBotKinematics;
44
import com.neuronrobotics.addons.driving.PuckBot;
5-
import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
65
import com.neuronrobotics.sdk.pid.IPIDEventListener;
76
import com.neuronrobotics.sdk.pid.PIDEvent;
87
import com.neuronrobotics.sdk.pid.PIDLimitEvent;

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/virtual/VirtualWorld.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import java.awt.image.BufferedImage;
77
import java.util.ArrayList;
88

9-
import javax.swing.ImageIcon;
109
import javax.swing.JFrame;
11-
import javax.swing.JLabel;
12-
import javax.swing.JPanel;
1310

1411
import com.neuronrobotics.addons.driving.AbstractRobotDrive;
1512
import com.neuronrobotics.addons.driving.NrMap;

javasdk/NRSDK/addons/com/neuronrobotics/application/xmpp/GoogleChat/GoogleChatEngine.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
import org.jivesoftware.smack.ChatManagerListener;
1616
import org.jivesoftware.smack.ConnectionConfiguration;
1717
import org.jivesoftware.smack.MessageListener;
18-
1918
import org.jivesoftware.smack.XMPPConnection;
2019
import org.jivesoftware.smack.XMPPException;
21-
22-
2320
import org.jivesoftware.smack.packet.Presence;
2421
import org.w3c.dom.Document;
2522
import org.w3c.dom.Element;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/Axis.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
*/
4444

4545

46-
import java.awt.Color;
47-
4846
import javax.media.j3d.Geometry;
4947
import javax.media.j3d.GeometryArray;
5048
import javax.media.j3d.IndexedLineArray;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/DHKinematicsViewer.java

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,22 @@
33

44
import java.awt.BorderLayout;
55
import java.awt.Color;
6-
import java.awt.GraphicsConfiguration;
6+
import java.awt.event.ActionEvent;
7+
import java.awt.event.ActionListener;
78

8-
import javax.media.j3d.BoundingSphere;
9-
import javax.media.j3d.BranchGroup;
10-
import javax.media.j3d.Canvas3D;
11-
import javax.media.j3d.Transform3D;
12-
import javax.media.j3d.TransformGroup;
139
import javax.swing.JButton;
1410
import javax.swing.JFrame;
1511
import javax.swing.JPanel;
16-
import javax.vecmath.Point3d;
12+
13+
import net.miginfocom.swing.MigLayout;
1714

1815
import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
16+
import com.neuronrobotics.sdk.addons.kinematics.DHParameterKinematics;
1917
import com.neuronrobotics.sdk.addons.kinematics.IJointSpaceUpdateListenerNR;
2018
import com.neuronrobotics.sdk.addons.kinematics.JointLimit;
21-
import com.neuronrobotics.sdk.addons.kinematics.DHParameterKinematics;
2219
import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
23-
import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
2420
import com.neuronrobotics.sdk.common.Log;
25-
import com.neuronrobotics.sdk.dyio.DyIO;
26-
import com.neuronrobotics.sdk.ui.ConnectionDialog;
2721
import com.neuronrobotics.sdk.util.ThreadUtil;
28-
import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
29-
import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
30-
import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
31-
import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
32-
import com.sun.j3d.utils.geometry.ColorCube;
33-
import com.sun.j3d.utils.pickfast.behaviors.PickRotateBehavior;
34-
import com.sun.j3d.utils.universe.SimpleUniverse;
35-
36-
import com.sun.j3d.utils.applet.MainFrame;
37-
import com.sun.j3d.utils.universe.*;
38-
import com.sun.j3d.utils.behaviors.mouse.*;
39-
import com.sun.j3d.utils.behaviors.vp.OrbitBehavior;
40-
import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
41-
42-
import javax.media.j3d.*;
43-
import javax.vecmath.*;
44-
45-
import net.miginfocom.swing.MigLayout;
46-
47-
import java.awt.event.*;
48-
import java.util.ArrayList;
49-
import java.util.Enumeration;
5022

5123

5224
public class DHKinematicsViewer extends JPanel implements IJointSpaceUpdateListenerNR{

0 commit comments

Comments
 (0)