altos: Expose ao_gps_set_rate from u-blox driver

[fw/altos] / micropeak / MicroPeak.java

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index cb1c68cbba2eb7afbc55fe3580a0ff5bce1f5d2f..78bc857ec2818746a3fc9f05a5b5d97556286ce0 100644 (file)
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
@@ -65,6 +65,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
                try {
                        data = new MicroData((InputStream) fis, filename.getName());
                        AltosUIPreferences.set_last_logdir(filename);
+               } catch (MicroData.NonHexcharException nhe) {
+                       data = null;
+               } catch (MicroData.FileEndedException nhe) {
+                       data = null;
                } catch (InterruptedException ie) {
                        data = null;
                } finally {