projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: create target pdclib directories before building
[fw/altos]
/
altoslib
/
AltosTelemetryReader.java
diff --git
a/altoslib/AltosTelemetryReader.java
b/altoslib/AltosTelemetryReader.java
index aea978445578e536b3daf3a5b1ffc73ffaf3675d..405c555b35b460c27448ca73fae8bb23a12b6c20 100644
(file)
--- a/
altoslib/AltosTelemetryReader.java
+++ b/
altoslib/AltosTelemetryReader.java
@@
-54,7
+54,10
@@
public class AltosTelemetryReader extends AltosFlightReader {
public void close(boolean interrupted) {
link.remove_monitor(telem);
log.close();
public void close(boolean interrupted) {
link.remove_monitor(telem);
log.close();
- link.close();
+ try {
+ link.close();
+ } catch (InterruptedException ie) {
+ }
}
public void set_frequency(double in_frequency) throws InterruptedException, TimeoutException {
}
public void set_frequency(double in_frequency) throws InterruptedException, TimeoutException {
@@
-83,7
+86,7
@@
public class AltosTelemetryReader extends AltosFlightReader {
else
return false;
} catch (InterruptedException ie) {
else
return false;
} catch (InterruptedException ie) {
- return
tru
e;
+ return
fals
e;
} catch (TimeoutException te) {
return true;
}
} catch (TimeoutException te) {
return true;
}
@@
-114,7
+117,7
@@
public class AltosTelemetryReader extends AltosFlightReader {
return link.has_monitor_battery();
}
return link.has_monitor_battery();
}
- public double monitor_battery() {
+ public double monitor_battery()
throws InterruptedException
{
return link.monitor_battery();
}
return link.monitor_battery();
}
@@
-130,12
+133,8
@@
public class AltosTelemetryReader extends AltosFlightReader {
telemetry = AltosPreferences.telemetry(link.serial);
set_telemetry(telemetry);
link.add_monitor(telem);
telemetry = AltosPreferences.telemetry(link.serial);
set_telemetry(telemetry);
link.add_monitor(telem);
- } catch (TimeoutException e) {
- close(true);
- throw(e);
- } catch (InterruptedException e) {
+ } finally {
close(true);
close(true);
- throw(e);
}
}
}
}
}
}