diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-02 19:59:40 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-02 19:59:40 -0700 |
| commit | f86dac643081987c8994ab57a96640d5e91b342a (patch) | |
| tree | cc175f18f8930c04be16bb4c12b756782ecff568 /altoslib/AltosTelemetryReader.java | |
| parent | dd43a2ae7594f062a8980d1756a07488ee54b447 (diff) | |
altoslib: Clean up random rebase failures
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryReader.java')
| -rw-r--r-- | altoslib/AltosTelemetryReader.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index 67ac1b65..112e008e 100644 --- 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 */ - 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 */ - 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 == AltosLib.ao_telemetry_0_9) return true; else return false; } /* Version 0.8 firmware only supports 0.8 telemetry */ - if (telemetry == Altos.ao_telemetry_0_8) + if (telemetry == AltosLib.ao_telemetry_0_8) return true; else return false; |