summaryrefslogtreecommitdiff
path: root/altoslib/AltosTelemetryRecordConfiguration.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-04-22 17:20:51 -0500
committerKeith Packard <keithp@keithp.com>2013-04-22 17:20:51 -0500
commit33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch)
treea9ff47afab29fe141dcd1da0ca276b367f911cb6 /altoslib/AltosTelemetryRecordConfiguration.java
parent1a84db819a359be39be51c9105039ab28c9fc894 (diff)
parent90b0db1ae53182c94bf12d661446fc369d916366 (diff)
Merge branch 'master' into stm-flash
Conflicts: ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'altoslib/AltosTelemetryRecordConfiguration.java')
-rw-r--r--altoslib/AltosTelemetryRecordConfiguration.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/altoslib/AltosTelemetryRecordConfiguration.java b/altoslib/AltosTelemetryRecordConfiguration.java
index 472a6318..47fc3488 100644
--- a/altoslib/AltosTelemetryRecordConfiguration.java
+++ b/altoslib/AltosTelemetryRecordConfiguration.java
@@ -29,8 +29,8 @@ public class AltosTelemetryRecordConfiguration extends AltosTelemetryRecordRaw {
String callsign;
String version;
- public AltosTelemetryRecordConfiguration(int[] in_bytes) {
- super(in_bytes);
+ public AltosTelemetryRecordConfiguration(int[] in_bytes, int rssi) {
+ super(in_bytes, rssi);
device_type = uint8(5);
flight = uint16(6);