projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Clean up random rebase failures
[fw/altos]
/
altoslib
/
AltosTelemetryReader.java
diff --git
a/altoslib/AltosTelemetryReader.java
b/altoslib/AltosTelemetryReader.java
index 67ac1b6518cfb94f60765c2b9c3b94a86b403015..112e008efff4bd75eb0147f9e3d02eb1d42570a3 100644
(file)
--- a/
altoslib/AltosTelemetryReader.java
+++ b/
altoslib/AltosTelemetryReader.java
@@
-59,19
+59,19
@@
public class AltosTelemetryReader extends AltosFlightReader {
try {
/* Version 1.0 or later firmware supports all telemetry formats */
try {
/* Version 1.0 or later firmware supports all telemetry formats */
- if (
serial
.config_data().compare_version("1.0") >= 0)
+ if (
link
.config_data().compare_version("1.0") >= 0)
return true;
/* Version 0.9 firmware only supports 0.9 telemetry */
return true;
/* Version 0.9 firmware only supports 0.9 telemetry */
- if (
serial
.config_data().compare_version("0.9") >= 0) {
- if (telemetry == Altos.ao_telemetry_0_9)
+ if (
link
.config_data().compare_version("0.9") >= 0) {
+ if (telemetry == Altos
Lib
.ao_telemetry_0_9)
return true;
else
return false;
}
/* Version 0.8 firmware only supports 0.8 telemetry */
return true;
else
return false;
}
/* Version 0.8 firmware only supports 0.8 telemetry */
- if (telemetry == Altos.ao_telemetry_0_8)
+ if (telemetry == Altos
Lib
.ao_telemetry_0_8)
return true;
else
return false;
return true;
else
return false;