From e311cefae19d7dc71fb10e9a943daa8e2313c8f8 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 9 May 2017 00:22:35 -0700 Subject: [PATCH] altosui: Use new eeprom reading code This just means using different file opening functions, which then get matched by AltosEepromFile and sent off to the new eeprom code. Signed-off-by: Keith Packard --- altosui/AltosUI.java | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 019bbb9e..b0c6d33b 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -448,16 +448,23 @@ public class AltosUI extends AltosUIFrame { 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")) { + 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); + } } - if (file.getName().endsWith("telem")) - return new AltosTelemetryFile(in); - else - return new AltosEepromFile(in); + return null; } static AltosReplayReader replay_file(File file) { -- 2.30.2