altosui: Make sure packet mode is turned off when the connection fails

[fw/altos] / ao-tools / altosui / AltosIgniteUI.java

diff --git a/ao-tools/altosui/AltosIgniteUI.java b/ao-tools/altosui/AltosIgniteUI.java
index caecc3ef8fd7d392ec12cceac33ace39897089a2..d542729cd0de5003d2272b5ad902a0d2450472e5 100644 (file)
--- a/ao-tools/altosui/AltosIgniteUI.java
+++ b/ao-tools/altosui/AltosIgniteUI.java
@@ -103,7 +103,7 @@ public class AltosIgniteUI
                close();
                JOptionPane.showMessageDialog(owner,
                                              String.format("Connection to \"%s\" failed",
-                                                           device.toString()),
+                                                           device.toShortString()),
                                              "Connection Failed",
                                              JOptionPane.ERROR_MESSAGE);
        }
@@ -145,13 +145,11 @@ public class AltosIgniteUI
 
                if (cmd.equals("apogee") && apogee.isSelected()) {
                        main.setSelected(false);
-                       if (apogee_status == AltosIgnite.Ready)
-                               arm.setEnabled(true);
+                       arm.setEnabled(true);
                }
                if (cmd.equals("main") && main.isSelected()) {
                        apogee.setSelected(false);
-                       if (main_status == AltosIgnite.Ready)
-                               arm.setEnabled(true);
+                       arm.setEnabled(true);
                }
 
                if (cmd.equals("arm")) {
@@ -194,18 +192,18 @@ public class AltosIgniteUI
                        } catch (FileNotFoundException ee) {
                                JOptionPane.showMessageDialog(owner,
                                                              String.format("Cannot open device \"%s\"",
-                                                                           device.toString()),
+                                                                           device.toShortString()),
                                                              "Cannot open target device",
                                                              JOptionPane.ERROR_MESSAGE);
                        } catch (AltosSerialInUseException si) {
                                JOptionPane.showMessageDialog(owner,
                                                              String.format("Device \"%s\" already in use",
-                                                                           device.toString()),
+                                                                           device.toShortString()),
                                                              "Device in use",
                                                              JOptionPane.ERROR_MESSAGE);
                        } catch (IOException ee) {
                                JOptionPane.showMessageDialog(owner,
-                                                             device.toString(),
+                                                             device.toShortString(),
                                                              ee.getLocalizedMessage(),
                                                              JOptionPane.ERROR_MESSAGE);
                        }