From 238e56e0f6ab2f623e0faf25298b38dc3a4aff74 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 10 May 2017 22:19:38 -0600 Subject: [PATCH] telegps: use new eeprom reading code --- telegps/TeleGPS.java | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java index 66eaaa2b..cf2cbd4f 100644 --- a/telegps/TeleGPS.java +++ b/telegps/TeleGPS.java @@ -614,16 +614,23 @@ public class TeleGPS static AltosStateIterable record_iterable(File file) { FileInputStream in; - try { - in = new FileInputStream(file); - } catch (Exception e) { - System.out.printf("Failed to open file '%s'\n", file); - return null; - } - if (file.getName().endsWith("telem")) - return new AltosTelemetryFile(in); - else - return new AltosEepromFile(in); + if (file.getName().endsWith("telem")) { + try { + in = new FileInputStream(file); + return new AltosTelemetryFile(in); + } catch (Exception e) { + System.out.printf("Failed to open file '%s'\n", file); + } + } else { + + try { + AltosEepromFile f = new AltosEepromFile(new FileReader(file)); + return f; + } catch (Exception e) { + System.out.printf("Failed to open file '%s'\n", file); + } + } + return null; } static AltosReplayReader replay_file(File file) { -- 2.30.2