altosui: Fix telemetry file reader to handle tick count wrapping

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

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 0c2041e3cf338f9a8fbdf7adf3125549aaef13aa..5ed417da993a0d149146ff78d039ccb2a5f703c1 100644 (file)
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -57,8 +57,10 @@ public class AltosFlashUI
                } else {
                        String  cmd = e.getActionCommand();
                        if (cmd.equals("done"))
-                               dispose();
-                       else {
+                               ;
+                       else if (cmd.equals("start")) {
+                               setVisible(true);
+                       } else {
                                pbar.setValue(e.getID());
                                pbar.setString(cmd);
                        }
@@ -70,33 +72,35 @@ public class AltosFlashUI
                flash.addActionListener(this);
                try {
                        flash.open();
-                       if (!flash.check_rom_config()) {
-                               AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
-                               romconfig_ui.showDialog();
-                               AltosRomconfig romconfig = romconfig_ui.romconfig();
-                               if (romconfig == null)
-                                       return;
+                       AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
+
+                       romconfig_ui.set(flash.romconfig());
+                       AltosRomconfig romconfig = romconfig_ui.showDialog();
+
+                       if (romconfig != null && romconfig.valid()) {
                                flash.set_romconfig(romconfig);
+                               serial_value.setText(String.format("%d",
+                                                                  flash.romconfig().serial_number));
+                               file_value.setText(file.toString());
+                               setVisible(true);
+                               flash.flash();
+                               flash = null;
                        }
-                       serial_value.setText(String.format("%d",
-                                                          flash.romconfig().serial_number));
-                       file_value.setText(file.toString());
-                       setVisible(true);
-                       flash.flash();
                } catch (FileNotFoundException ee) {
                        JOptionPane.showMessageDialog(frame,
                                                      "Cannot open image",
                                                      file.toString(),
                                                      JOptionPane.ERROR_MESSAGE);
-                       return;
                } catch (IOException e) {
                        JOptionPane.showMessageDialog(frame,
                                                      e.getMessage(),
                                                      file.toString(),
                                                      JOptionPane.ERROR_MESSAGE);
-                       return;
                } catch (InterruptedException ie) {
+               } finally {
+                       abort();
                }
+               dispose();
        }
 
        public void abort() {
@@ -183,7 +187,7 @@ public class AltosFlashUI
 
                build_dialog();
 
-               debug_dongle = AltosDeviceDialog.show(frame, AltosDevice.Any);
+               debug_dongle = AltosDeviceDialog.show(frame, AltosDevice.product_any);
 
                if (debug_dongle == null)
                        return;