Skip to content

Commit e3cd96f

Browse files
committed
connection dialog fails over to serial for non windows 8
1 parent 15805ac commit e3cd96f

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/ConnectionDialog.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.neuronrobotics.sdk.common.Log;
2222
import com.neuronrobotics.sdk.dyio.DyIOCommunicationException;
2323
import com.neuronrobotics.sdk.serial.SerialConnection;
24+
import com.neuronrobotics.sdk.util.OsInfoUtil;
2425

2526
public class ConnectionDialog extends JDialog {
2627

@@ -107,9 +108,18 @@ public void windowGainedFocus(WindowEvent e) {
107108

108109
private void loadDefaultConnections() {
109110
try{
110-
addConnectionPanel(new UsbConnectionPanel());
111+
if(!OsInfoUtil.isWindows() || OsInfoUtil.getOsName().contains("Windows 8") ){
112+
113+
addConnectionPanel(new UsbConnectionPanel());
114+
}else{
115+
System.out.println(OsInfoUtil.getOsName());
116+
addConnectionPanel(new SerialConnectionPanel());
117+
}
111118
addConnectionPanel(new BluetoothConnectionPanel());
112-
addConnectionPanel(new SerialConnectionPanel());
119+
//serial at the end if USB is enabled
120+
if(!OsInfoUtil.isWindows())
121+
addConnectionPanel(new SerialConnectionPanel());
122+
113123
}catch(Error e){
114124
e.printStackTrace();
115125
Log.error("This is not a java 8 compliant system, removing the serial, bluetooth and usb connections");

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/UsbConnectionPanel.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ public void refresh() {
117117
String s = UsbCDCSerialConnection.getUniqueID(prts.get(i));
118118
connectionCbo.addItem(s);
119119
}
120-
} catch (Exception e) {}
120+
} catch (Exception e) {
121+
e.printStackTrace();
122+
}
121123

122124
}
123125

0 commit comments

Comments
 (0)