diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
| commit | 33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch) | |
| tree | a9ff47afab29fe141dcd1da0ca276b367f911cb6 /altoslib/AltosTelemetryRecordCompanion.java | |
| parent | 1a84db819a359be39be51c9105039ab28c9fc894 (diff) | |
| parent | 90b0db1ae53182c94bf12d661446fc369d916366 (diff) | |
Merge branch 'master' into stm-flash
Conflicts:
ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'altoslib/AltosTelemetryRecordCompanion.java')
| -rw-r--r-- | altoslib/AltosTelemetryRecordCompanion.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/altoslib/AltosTelemetryRecordCompanion.java b/altoslib/AltosTelemetryRecordCompanion.java index e016dd01..2231df13 100644 --- a/altoslib/AltosTelemetryRecordCompanion.java +++ b/altoslib/AltosTelemetryRecordCompanion.java @@ -21,8 +21,8 @@ public class AltosTelemetryRecordCompanion extends AltosTelemetryRecordRaw { AltosRecordCompanion companion; - public AltosTelemetryRecordCompanion(int[] in_bytes) { - super(in_bytes); + public AltosTelemetryRecordCompanion(int[] in_bytes, int rssi) { + super(in_bytes, rssi); int off = 0; if (uint8(6) == 0) |