projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Raise ParseException on invalid eeprom format
[fw/altos]
/
altosui
/
AltosEepromDownload.java
diff --git
a/altosui/AltosEepromDownload.java
b/altosui/AltosEepromDownload.java
index 6e2fd061b1cbef6afe1f6ef223a118b95a57782c..7ccf26a5e359622463b6a8799b8f768cf23eaa54 100644
(file)
--- a/
altosui/AltosEepromDownload.java
+++ b/
altosui/AltosEepromDownload.java
@@
-92,7
+92,7
@@
public class AltosEepromDownload implements Runnable {
}
}
}
}
- void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException {
+ void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException
, ParseException
{
boolean any_valid = false;
boolean got_flight = false;
boolean any_valid = false;
boolean got_flight = false;
@@
-138,7
+138,7
@@
public class AltosEepromDownload implements Runnable {
CheckFile(false);
}
CheckFile(false);
}
- void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
+ void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException
, ParseException
{
int block, state_block = 0;
int log_format = flights.config_data.log_format;
int block, state_block = 0;
int log_format = flights.config_data.log_format;
@@
-222,7
+222,11
@@
public class AltosEepromDownload implements Runnable {
parse_exception = null;
if (log.selected) {
monitor.reset();
parse_exception = null;
if (log.selected) {
monitor.reset();
- CaptureLog(log);
+ try {
+ CaptureLog(log);
+ } catch (ParseException e) {
+ parse_exception = e;
+ }
}
if (parse_exception != null) {
failed = true;
}
if (parse_exception != null) {
failed = true;