altosui: Eliminate inter-chunk flush_input calls
[fw/altos] / altosui / AltosEepromDownload.java
index f96a3dc90527559b685d2c28b94a090a53ba9467..b44a1451b241db864a3790df8ff00389e95678a3 100644 (file)
@@ -39,6 +39,7 @@ public class AltosEepromDownload implements Runnable {
        AltosEepromMonitor      monitor;
 
        int                     flight;
+       int                     serial;
        int                     year, month, day;
        boolean                 want_file;
        FileWriter              eeprom_file;
@@ -48,6 +49,7 @@ public class AltosEepromDownload implements Runnable {
        ActionListener          listener;
        boolean                 success;
        ParseException          parse_exception;
+       String                  extension;
 
        private void FlushPending() throws IOException {
                for (String s : flights.config_data) {
@@ -64,10 +66,13 @@ public class AltosEepromDownload implements Runnable {
                        return;
                if (force || (flight != 0 && want_file)) {
                        AltosFile               eeprom_name;
+
+                       if (extension == null)
+                               extension = "data";
                        if (year != 0 && month != 0 && day != 0)
-                               eeprom_name = new AltosFile(year, month, day, flights.config_data.serial, flight, "eeprom");
+                               eeprom_name = new AltosFile(year, month, day, serial, flight, extension);
                        else
-                               eeprom_name = new AltosFile(flights.config_data.serial, flight, "eeprom");
+                               eeprom_name = new AltosFile(serial, flight, extension);
 
                        eeprom_file = new FileWriter(eeprom_name);
                        if (eeprom_file != null) {
@@ -89,90 +94,163 @@ public class AltosEepromDownload implements Runnable {
                }
        }
 
-       static final int        log_full = 1;
-       static final int        log_tiny = 2;
+       void set_serial(int in_serial) {
+               serial = in_serial;
+               monitor.set_serial(serial);
+       }
 
+       void set_flight(int in_flight) {
+               flight = in_flight;
+               monitor.set_flight(flight);
+       }
+               
        boolean                 done;
        int                     state;
 
        void CaptureFull(AltosEepromChunk eechunk) throws IOException {
-               AltosEepromBlock        eeblock = new AltosEepromBlock(eechunk);
+               boolean any_valid = false;
+
+               extension = "eeprom";
+               set_serial(flights.config_data.serial);
+               for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromRecord.record_length) {
+                       try {
+                               AltosEepromRecord r = new AltosEepromRecord(eechunk, i);
+                               if (r.cmd == Altos.AO_LOG_FLIGHT)
+                                       set_flight(r.b);
+
+                               /* Monitor state transitions to update display */
+                               if (r.cmd == Altos.AO_LOG_STATE && r.a <= Altos.ao_flight_landed) {
+                                       state = r.a;
+                                       if (state > Altos.ao_flight_pad)
+                                               want_file = true;
+                               }
 
-               if (eeblock.has_flight) {
-                       flight = eeblock.flight;
-                       monitor.set_flight(flight);
-               }
-               if (eeblock.has_date) {
-                       year = eeblock.year;
-                       month = eeblock.month;
-                       day = eeblock.day;
-                       want_file = true;
+                               if (r.cmd == Altos.AO_LOG_GPS_DATE) {
+                                       year = 2000 + (r.a & 0xff);
+                                       month = (r.a >> 8) & 0xff;
+                                       day = (r.b & 0xff);
+                                       want_file = true;
+                               }
+                               if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
+                                       done = true;
+                               any_valid = true;
+                               Log(r);
+                       } catch (ParseException pe) {
+                               if (parse_exception == null)
+                                       parse_exception = pe;
+                       }
                }
 
-               if (eeblock.size() == 0 ||
-                   eeblock.has_state && eeblock.state == Altos.ao_flight_landed)
+               if (!any_valid)
                        done = true;
 
-               /* Monitor state transitions to update display */
-               if (eeblock.has_state) {
-                       if (eeblock.state > Altos.ao_flight_pad)
-                               want_file = true;
-                       if (eeblock.state > state)
-                               state = eeblock.state;
-               }
-
-               if (parse_exception == null && eeblock.parse_exception != null)
-                       parse_exception = eeblock.parse_exception;
-
                CheckFile(false);
-
-               for (int record = 0; record < eeblock.size(); record++)
-                       Log(eeblock.get(record));
        }
 
        boolean start;
        int     tiny_tick;
 
        void CaptureTiny (AltosEepromChunk eechunk) throws IOException {
-               boolean some_reasonable_data = false;
+               boolean any_valid = false;
 
-               for (int i = 0; i < eechunk.data.length; i += 2) {
-                       int     v = eechunk.data16(i);
+               extension = "eeprom";
+               set_serial(flights.config_data.serial);
+               for (int i = 0; i < eechunk.data.length && !done; i += 2) {
+                       int                     v = eechunk.data16(i);
+                       AltosEepromRecord       r;
 
                        if (i == 0 && start) {
                                tiny_tick = 0;
                                start = false;
-                               flight = v;
-                               Log(new AltosEepromRecord(Altos.AO_LOG_FLIGHT, tiny_tick, 0, v));
-                               some_reasonable_data = true;
+                               set_flight(v);
+                               r = new AltosEepromRecord(Altos.AO_LOG_FLIGHT, tiny_tick, 0, v);
+                               any_valid = true;
                        } else {
                                int     s = v ^ 0x8000;
+
                                if (Altos.ao_flight_startup <= s && s <= Altos.ao_flight_invalid) {
-                                       Log(new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, s, 0));
-                                       if (s == Altos.ao_flight_landed) {
+                                       state = s;
+                                       r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, state, 0);
+                                       if (state == Altos.ao_flight_landed)
                                                done = true;
-                                               break;
-                                       }
-                                       some_reasonable_data = true;
+                                       state = s;
+                                       any_valid = true;
                                } else {
                                        if (v != 0xffff)
-                                               some_reasonable_data = true;
-                                       Log(new AltosEepromRecord(Altos.AO_LOG_HEIGHT, tiny_tick, v, 0));
+                                               any_valid = true;
+
+                                       r = new AltosEepromRecord(Altos.AO_LOG_PRESSURE, tiny_tick, 0, v);
+
+                                       /*
+                                        * The flight software records ascent data every 100ms, and descent
+                                        * data every 1s.
+                                        */
                                        if (state < Altos.ao_flight_drogue)
                                                tiny_tick += 10;
                                        else
                                                tiny_tick += 100;
                                }
                        }
+                       Log(r);
+               }
+               CheckFile(false);
+               if (!any_valid)
+                       done = true;
+       }
+
+       void LogTeleScience(AltosEepromTeleScience r) throws IOException {
+               if (r.type != Altos.AO_LOG_INVALID) {
+                       String log_line = String.format("%c %4x %4x %d %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d\n",
+                                                       r.type, r.tick, r.tm_tick, r.tm_state,
+                                                       r.data[0], r.data[1], r.data[2], r.data[3], 
+                                                       r.data[4], r.data[5], r.data[6], r.data[7], 
+                                                       r.data[8], r.data[9], r.data[10], r.data[11]);
+                       if (eeprom_file != null)
+                               eeprom_file.write(log_line);
+                       else
+                               eeprom_pending.add(log_line);
+               }
+       }
+       
+       boolean telescience_start;
+
+       void CaptureTeleScience (AltosEepromChunk eechunk) throws IOException {
+               boolean any_valid = false;
+
+               extension = "science";
+               for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromTeleScience.record_length) {
+                       try {
+                               AltosEepromTeleScience r = new AltosEepromTeleScience(eechunk, i);
+                               if (r.type == AltosEepromTeleScience.AO_LOG_TELESCIENCE_START) {
+                                       if (telescience_start) {
+                                               done = true;
+                                               break;
+                                       }
+                                       set_serial(r.data[0]);
+                                       set_flight(r.data[1]);
+                                       telescience_start = true;
+                               } else {
+                                       if (!telescience_start)
+                                               break;
+                               }
+                               state = r.tm_state;
+                               want_file =true;
+                               any_valid = true;
+                               LogTeleScience(r);
+                       } catch (ParseException pe) {
+                               if (parse_exception == null)
+                                       parse_exception = pe;
+                       }
                }
+
                CheckFile(false);
-               if (!some_reasonable_data)
+               if (!any_valid)
                        done = true;
        }
 
        void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
                int                     block, state_block = 0;
-               int                     log_style = 0;
+               int                     log_format = flights.config_data.log_format;
 
                state = 0;
                done = false;
@@ -191,33 +269,45 @@ public class AltosEepromDownload implements Runnable {
                eeprom_pending = new LinkedList<String>();
 
                /* Set serial number in the monitor dialog window */
-               monitor.set_serial(flights.config_data.serial);
                /* Now scan the eeprom, reading blocks of data and converting to .eeprom file form */
 
                state = 0; state_block = log.start_block;
                for (block = log.start_block; !done && block < log.end_block; block++) {
                        monitor.set_value(Altos.state_to_string[state], state, block - state_block);
 
-                       AltosEepromChunk        eechunk = new AltosEepromChunk(serial_line, block);
+                       AltosEepromChunk        eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
 
                        /*
-                        * Figure out what kind of data is there
+                        * Guess what kind of data is there if the device
+                        * didn't tell us
                         */
 
-                       if (block == log.start_block) {
-                               if (eechunk.data(0) == Altos.AO_LOG_FLIGHT)
-                                       log_style = log_full;
-                               else
-                                       log_style = log_tiny;
+                       if (log_format == Altos.AO_LOG_FORMAT_UNKNOWN) {
+                               if (block == log.start_block) {
+                                       if (eechunk.data(0) == Altos.AO_LOG_FLIGHT)
+                                               log_format = Altos.AO_LOG_FORMAT_FULL;
+                                       else
+                                               log_format = Altos.AO_LOG_FORMAT_TINY;
+                               }
                        }
 
-                       switch (log_style) {
-                       case log_full:
+                       switch (log_format) {
+                       case Altos.AO_LOG_FORMAT_FULL:
+                               extension = "eeprom";
                                CaptureFull(eechunk);
                                break;
-                       case log_tiny:
+                       case Altos.AO_LOG_FORMAT_TINY:
+                               extension = "eeprom";
                                CaptureTiny(eechunk);
                                break;
+//                     case Altos.AO_LOG_FORMAT_TELEMETRY:
+//                             extension = "telem";
+//                             CaptureTelemetry(eechunk);
+//                             break;
+                       case Altos.AO_LOG_FORMAT_TELESCIENCE:
+                               extension = "science";
+                               CaptureTeleScience(eechunk);
+                               break;
                        }
                }
                CheckFile(true);
@@ -250,11 +340,11 @@ public class AltosEepromDownload implements Runnable {
        }
 
        public void run () {
-               if (remote)
-                       serial_line.start_remote();
-
                try {
                        boolean failed = false;
+                       if (remote)
+                               serial_line.start_remote();
+
                        for (AltosEepromLog log : flights) {
                                parse_exception = null;
                                if (log.download) {
@@ -276,16 +366,18 @@ public class AltosEepromDownload implements Runnable {
                                     serial_line.device.toShortString(),
                                     JOptionPane.ERROR_MESSAGE);
                } catch (InterruptedException ie) {
+                       System.out.printf("download interrupted\n");
                } catch (TimeoutException te) {
                        show_message(String.format("Connection to \"%s\" failed",
                                                   serial_line.device.toShortString()),
                                     "Connection Failed",
                                     JOptionPane.ERROR_MESSAGE);
+               } finally {
+                       if (remote)
+                               serial_line.stop_remote();
+                       serial_line.flush_output();
                }
-               if (remote)
-                       serial_line.stop_remote();
                monitor.done();
-               serial_line.flush_output();
                if (listener != null) {
                        Runnable r = new Runnable() {
                                        public void run() {
@@ -317,6 +409,7 @@ public class AltosEepromDownload implements Runnable {
 
                frame = given_frame;
                serial_line = given_serial_line;
+               serial_line.set_frame(frame);
                remote = given_remote;
                flights = given_flights;
                success = false;