altosui: Exit with an error status when file processing fails
[fw/altos] / altosui / AltosUI.java
index 8799d560767a6d8f532bdc47914e6b228f498121..c1a66b835692c695f232f401a1030002602ee583 100644 (file)
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;
 
@@ -47,7 +48,7 @@ public class AltosUI extends AltosFrame {
 
        void telemetry_window(AltosDevice device) {
                try {
-                       AltosFlightReader reader = new AltosTelemetryReader(device);
+                       AltosFlightReader reader = new AltosTelemetryReader(new AltosSerial(device));
                        if (reader != null)
                                new AltosFlightUI(voice, reader, device.getSerial());
                } catch (FileNotFoundException ee) {
@@ -104,11 +105,7 @@ public class AltosUI extends AltosFrame {
 
                load_library(null);
 
-               java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-               if (imgURL != null)
-                       setIconImage(new ImageIcon(imgURL).getImage());
-
-               AltosPreferences.set_component(this);
+               AltosUIPreferences.set_component(this);
 
                pane = getContentPane();
                gridbag = new GridBagLayout();
@@ -165,28 +162,29 @@ public class AltosUI extends AltosFrame {
                                }
                        });
                b.setToolTipText("Global AltosUI settings");
-               b = addButton(2, 1, "Flash Image");
+
+               b = addButton(2, 1, "Configure Ground Station");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       FlashImage();
+                                       ConfigureTeleDongle();
                                }
                        });
-               b.setToolTipText("Replace the firmware in any AltusMetrum product");
 
-               b = addButton(3, 1, "Fire Igniter");
+               b = addButton(3, 1, "Flash Image");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       FireIgniter();
+                                       FlashImage();
                                }
                        });
-               b.setToolTipText("Remote control of igniters for deployment testing");
-               b = addButton(4, 1, "Quit");
+               b.setToolTipText("Replace the firmware in any AltusMetrum product");
+
+               b = addButton(4, 1, "Fire Igniter");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       System.exit(0);
+                                       FireIgniter();
                                }
                        });
-               b.setToolTipText("Close all active windows and terminate AltosUI");
+               b.setToolTipText("Remote control of igniters for deployment testing");
                b = addButton(0, 2, "Scan Channels");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
@@ -209,12 +207,20 @@ public class AltosUI extends AltosFrame {
                        });
                b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
-               b = addButton(3, 2, "Launch Controller");
+//             b = addButton(3, 2, "Launch Controller");
+//             b.addActionListener(new ActionListener() {
+//                             public void actionPerformed(ActionEvent e) {
+//                                     LaunchController();
+//                             }
+//                     });
+
+               b = addButton(4, 2, "Quit");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       LaunchController();
+                                       System.exit(0);
                                }
                        });
+               b.setToolTipText("Close all active windows and terminate AltosUI");
 
                setTitle("AltOS");
 
@@ -253,15 +259,19 @@ public class AltosUI extends AltosFrame {
                String  result;
                result = JOptionPane.showInputDialog(AltosUI.this,
                                                     "Configure Callsign",
-                                                    AltosPreferences.callsign());
+                                                    AltosUIPreferences.callsign());
                if (result != null)
-                       AltosPreferences.set_callsign(result);
+                       AltosUIPreferences.set_callsign(result);
        }
 
        void ConfigureTeleMetrum() {
                new AltosConfig(AltosUI.this);
        }
 
+       void ConfigureTeleDongle() {
+               new AltosConfigTD(AltosUI.this);
+       }
+
        void FlashImage() {
                AltosFlashUI.show(AltosUI.this);
        }
@@ -352,6 +362,8 @@ public class AltosUI extends AltosFrame {
                        in = new FileInputStream(file);
                        if (filename.endsWith("eeprom"))
                                return new AltosEepromIterable(in);
+                       else if (filename.endsWith("mega"))
+                               return new AltosEepromMegaIterable(in);
                        else
                                return new AltosTelemetryIterable(in);
                } catch (FileNotFoundException fe) {
@@ -387,53 +399,57 @@ public class AltosUI extends AltosFrame {
        static final int process_replay = 4;
        static final int process_summary = 5;
 
-       static void process_csv(String input) {
+       static boolean process_csv(String input) {
                AltosRecordIterable iterable = open_logfile(input);
                if (iterable == null)
-                       return;
+                       return false;
 
                String output = Altos.replace_extension(input,".csv");
                System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
                if (input.equals(output)) {
                        System.out.printf("Not processing '%s'\n", input);
+                       return false;
                } else {
                        AltosWriter writer = open_csv(output);
                        if (writer == null)
-                               return;
+                               return false;
                        writer.write(iterable);
                        writer.close();
                }
+               return true;
        }
 
-       static void process_kml(String input) {
+       static boolean process_kml(String input) {
                AltosRecordIterable iterable = open_logfile(input);
                if (iterable == null)
-                       return;
+                       return false;
 
                String output = Altos.replace_extension(input,".kml");
                System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
                if (input.equals(output)) {
                        System.out.printf("Not processing '%s'\n", input);
+                       return false;
                } else {
                        AltosWriter writer = open_kml(output);
                        if (writer == null)
-                               return;
+                               return false;
                        writer.write(iterable);
                        writer.close();
+                       return true;
                }
        }
 
-       static AltosRecordIterable record_iterable_file(String filename) {
+       static AltosRecordIterable record_iterable(File file) {
                FileInputStream in;
                try {
-                       in = new FileInputStream(filename);
+                       in = new FileInputStream(file);
                } catch (Exception e) {
-                       System.out.printf("Failed to open file '%s'\n", filename);
+                       System.out.printf("Failed to open file '%s'\n", file);
                        return null;
                }
                AltosRecordIterable recs;
                AltosReplayReader reader;
-               if (filename.endsWith("eeprom")) {
+               if (file.getName().endsWith("eeprom")) {
                        recs = new AltosEepromIterable(in);
                } else {
                        recs = new AltosTelemetryIterable(in);
@@ -441,6 +457,10 @@ public class AltosUI extends AltosFrame {
                return recs;
        }
 
+       static AltosRecordIterable record_iterable_file(String filename) {
+               return record_iterable (new File(filename));
+       }
+
        static AltosReplayReader replay_file(String filename) {
                AltosRecordIterable recs = record_iterable_file(filename);
                if (recs == null)
@@ -448,27 +468,34 @@ public class AltosUI extends AltosFrame {
                return new AltosReplayReader(recs.iterator(), new File(filename));
        }
 
-       static void process_replay(String filename) {
+       static boolean process_replay(String filename) {
                AltosReplayReader reader = replay_file(filename);
+               if (reader == null)
+                       return false;
                AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
                flight_ui.set_exit_on_close();
+               return true;
        }
 
-       static void process_graph(String filename) {
+       static boolean process_graph(String filename) {
                AltosRecordIterable recs = record_iterable_file(filename);
                if (recs == null)
-                       return;
+                       return false;
                try {
                        new AltosGraphUI(recs, filename);
+                       return true;
                } catch (InterruptedException ie) {
                } catch (IOException ie) {
                }
+               return false;
        }
        
-       static void process_summary(String filename) {
-               AltosReplayReader reader = replay_file(filename);
+       static boolean process_summary(String filename) {
+               AltosRecordIterable iterable = record_iterable_file(filename);
+               if (iterable == null)
+                       return false;
                try {
-                       AltosFlightStats stats = new AltosFlightStats(reader);
+                       AltosFlightStats stats = new AltosFlightStats(iterable);
                        if (stats.serial > 0)
                                System.out.printf("Serial:       %5d\n", stats.serial);
                        if (stats.flight > 0)
@@ -501,9 +528,11 @@ public class AltosUI extends AltosFrame {
                        System.out.printf("Flight time: %6.0f s\n",
                                          stats.state_end[Altos.ao_flight_main] -
                                          stats.state_start[Altos.ao_flight_boost]);
+                       return true;
                } catch (InterruptedException ie) {
                } catch (IOException ie) {
                }
+               return false;
        }
 
        public static void help(int code) {
@@ -518,8 +547,10 @@ public class AltosUI extends AltosFrame {
        }
        
        public static void main(final String[] args) {
+               int     errors = 0;
+               load_library(null);
                try {
-                       UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+                       UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
                } catch (Exception e) {
                }
                /* Handle batch-mode */
@@ -560,23 +591,30 @@ public class AltosUI extends AltosFrame {
                                        switch (process) {
                                        case process_none:
                                        case process_graph:
-                                               process_graph(args[i]);
+                                               if (!process_graph(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_replay:
-                                               process_replay(args[i]);
+                                               if (!process_replay(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_kml:
-                                               process_kml(args[i]);
+                                               if (!process_kml(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_csv:
-                                               process_csv(args[i]);
+                                               if (!process_csv(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_summary:
-                                               process_summary(args[i]);
+                                               if (!process_summary(args[i]))
+                                                       ++errors;
                                                break;
                                        }
                                }
                        }
                }
+               if (errors != 0)
+                       System.exit(errors);
        }
 }