projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: avr-gcc appears to find the loader scripts without help now
[fw/altos]
/
altosui
/
AltosEepromDownload.java
diff --git
a/altosui/AltosEepromDownload.java
b/altosui/AltosEepromDownload.java
index f034d73c81193dbe44756f052dcbbb7d8db16b4d..6e2fd061b1cbef6afe1f6ef223a118b95a57782c 100644
(file)
--- a/
altosui/AltosEepromDownload.java
+++ b/
altosui/AltosEepromDownload.java
@@
-94,10
+94,12
@@
public class AltosEepromDownload implements Runnable {
void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException {
boolean any_valid = false;
void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException {
boolean any_valid = false;
+ boolean got_flight = false;
int record_length = 8;
state.set_serial(flights.config_data.serial);
int record_length = 8;
state.set_serial(flights.config_data.serial);
+ monitor.set_serial(flights.config_data.serial);
for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += record_length) {
AltosEeprom r = eechunk.eeprom(i, log_format, state);
for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += record_length) {
AltosEeprom r = eechunk.eeprom(i, log_format, state);
@@
-109,6
+111,9
@@
public class AltosEepromDownload implements Runnable {
r.update_state(state);
r.update_state(state);
+ if (!got_flight && state.flight != AltosLib.MISSING)
+ monitor.set_flight(state.flight);
+
/* Monitor state transitions to update display */
if (state.state != AltosLib.ao_flight_invalid &&
state.state <= AltosLib.ao_flight_landed)
/* Monitor state transitions to update display */
if (state.state != AltosLib.ao_flight_invalid &&
state.state <= AltosLib.ao_flight_landed)
@@
-234,7
+239,10
@@
public class AltosEepromDownload implements Runnable {
serial_line.device.toShortString(),
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
serial_line.device.toShortString(),
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
- System.out.printf("download interrupted\n");
+ show_message(String.format("Connection to \"%s\" interrupted",
+ serial_line.device.toShortString()),
+ "Connection Interrupted",
+ JOptionPane.ERROR_MESSAGE);
} catch (TimeoutException te) {
show_message(String.format("Connection to \"%s\" failed",
serial_line.device.toShortString()),
} catch (TimeoutException te) {
show_message(String.format("Connection to \"%s\" failed",
serial_line.device.toShortString()),