altos: Rename telemetry to telemetry_orig
[fw/altos] / altosui / AltosEepromDownload.java
index f1abd50cd21b07ecf9dabc03259d1a9b5cfb8fdb..82f01ef52ea360dc53dc59ecda51203777c5067a 100644 (file)
@@ -47,6 +47,7 @@ public class AltosEepromDownload implements Runnable {
        AltosEepromList         flights;
        ActionListener          listener;
        boolean                 success;
+       ParseException          parse_exception;
 
        private void FlushPending() throws IOException {
                for (String s : flights.config_data) {
@@ -77,11 +78,119 @@ public class AltosEepromDownload implements Runnable {
                }
        }
 
+       void Log(AltosEepromRecord r) throws IOException {
+               if (r.cmd != Altos.AO_LOG_INVALID) {
+                       String log_line = String.format("%c %4x %4x %4x\n",
+                                                       r.cmd, r.tick, r.a, r.b);
+                       if (eeprom_file != null)
+                               eeprom_file.write(log_line);
+                       else
+                               eeprom_pending.add(log_line);
+               }
+       }
+
+       static final int        log_full = 1;
+       static final int        log_tiny = 2;
+
+       boolean                 done;
+       int                     state;
+
+       void CaptureFull(AltosEepromChunk eechunk) throws IOException {
+               boolean any_valid = false;
+               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) {
+                                       flight = r.b;
+                                       monitor.set_flight(flight);
+                               }
+
+                               /* 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 (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 (!any_valid)
+                       done = true;
+
+               CheckFile(false);
+       }
+
+       boolean start;
+       int     tiny_tick;
+
+       void CaptureTiny (AltosEepromChunk eechunk) throws IOException {
+               boolean any_valid = false;
+
+               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;
+                               monitor.set_flight(flight);
+                               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) {
+                                       state = s;
+                                       r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, state, 0);
+                                       if (state == Altos.ao_flight_landed)
+                                               done = true;
+                                       state = s;
+                                       any_valid = true;
+                               } else {
+                                       if (v != 0xffff)
+                                               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 CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
                int                     block, state_block = 0;
-               int                     state = 0;
-               boolean                 done = false;
-               int                     record;
+               int                     log_style = 0;
+
+               state = 0;
+               done = false;
+               start = true;
 
                if (flights.config_data.serial == 0)
                        throw new IOException("no serial number found");
@@ -103,42 +212,26 @@ public class AltosEepromDownload implements Runnable {
                for (block = log.start_block; !done && block < log.end_block; block++) {
                        monitor.set_value(Altos.state_to_string[state], state, block - state_block);
 
-                       AltosEepromBlock        eeblock = new AltosEepromBlock(serial_line, block);
-
-                       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;
-                       }
+                       AltosEepromChunk        eechunk = new AltosEepromChunk(serial_line, block);
 
-                       if (eeblock.size() == 0 ||
-                           eeblock.has_state && eeblock.state == Altos.ao_flight_landed)
-                                       done = true;
+                       /*
+                        * Figure out what kind of data is there
+                        */
 
-                       /* 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 (block == log.start_block) {
+                               if (eechunk.data(0) == Altos.AO_LOG_FLIGHT)
+                                       log_style = log_full;
+                               else
+                                       log_style = log_tiny;
                        }
 
-                       CheckFile(false);
-
-                       for (record = 0; record < eeblock.size(); record++) {
-                               AltosEepromRecord r = eeblock.get(record);
-
-                               String log_line = String.format("%c %4x %4x %4x\n",
-                                                               r.cmd, r.tick, r.a, r.b);
-                               if (eeprom_file != null)
-                                       eeprom_file.write(log_line);
-                               else
-                                       eeprom_pending.add(log_line);
+                       switch (log_style) {
+                       case log_full:
+                               CaptureFull(eechunk);
+                               break;
+                       case log_tiny:
+                               CaptureTiny(eechunk);
+                               break;
                        }
                }
                CheckFile(true);
@@ -148,20 +241,21 @@ public class AltosEepromDownload implements Runnable {
                }
        }
 
-       private void show_error_internal(String message, String title) {
+       private void show_message_internal(String message, String title, int message_type) {
                JOptionPane.showMessageDialog(frame,
                                              message,
                                              title,
-                                             JOptionPane.ERROR_MESSAGE);
+                                             message_type);
        }
 
-       private void show_error(String in_message, String in_title) {
+       private void show_message(String in_message, String in_title, int in_message_type) {
                final String message = in_message;
                final String title = in_title;
+               final int message_type = in_message_type;
                Runnable r = new Runnable() {
                                public void run() {
                                        try {
-                                               show_error_internal(message, title);
+                                               show_message_internal(message, title, message_type);
                                        } catch (Exception ex) {
                                        }
                                }
@@ -174,21 +268,33 @@ public class AltosEepromDownload implements Runnable {
                        serial_line.start_remote();
 
                try {
+                       boolean failed = false;
                        for (AltosEepromLog log : flights) {
+                               parse_exception = null;
                                if (log.download) {
                                        monitor.reset();
                                        CaptureLog(log);
                                }
+                               if (parse_exception != null) {
+                                       failed = true;
+                                       show_message(String.format("Flight %d download error\n%s\nValid log data saved",
+                                                                  log.flight,
+                                                                  parse_exception.getMessage()),
+                                                    serial_line.device.toShortString(),
+                                                    JOptionPane.WARNING_MESSAGE);
+                               }
                        }
-                       success = true;
+                       success = !failed;
                } catch (IOException ee) {
-                       show_error (serial_line.device.toShortString(),
-                                   ee.getLocalizedMessage());
+                       show_message(ee.getLocalizedMessage(),
+                                    serial_line.device.toShortString(),
+                                    JOptionPane.ERROR_MESSAGE);
                } catch (InterruptedException ie) {
                } catch (TimeoutException te) {
-                       show_error (String.format("Connection to \"%s\" failed",
-                                                 serial_line.device.toShortString()),
-                                   "Connection Failed");
+                       show_message(String.format("Connection to \"%s\" failed",
+                                                  serial_line.device.toShortString()),
+                                    "Connection Failed",
+                                    JOptionPane.ERROR_MESSAGE);
                }
                if (remote)
                        serial_line.stop_remote();
@@ -225,6 +331,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;