projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master-fixes' into stm-flash-fixes
[fw/altos]
/
altoslib
/
AltosTelemetryRecordSensor.java
diff --git
a/altoslib/AltosTelemetryRecordSensor.java
b/altoslib/AltosTelemetryRecordSensor.java
index 767a464a7e5e046e8534481d89f46e21345e1516..e0e92c13d5ba2218d17119b0241db34e58400da3 100644
(file)
--- a/
altoslib/AltosTelemetryRecordSensor.java
+++ b/
altoslib/AltosTelemetryRecordSensor.java
@@
-36,10
+36,8
@@
public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
int accel_plus_g;
int accel_minus_g;
int accel_plus_g;
int accel_minus_g;
- int rssi;
-
- public AltosTelemetryRecordSensor(int[] in_bytes, int in_rssi) {
- super(in_bytes);
+ public AltosTelemetryRecordSensor(int[] in_bytes, int rssi) {
+ super(in_bytes, rssi);
state = uint8(5);
accel = int16(6);
state = uint8(5);
accel = int16(6);
@@
-57,8
+55,6
@@
public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
ground_accel = int16(26);
accel_plus_g = int16(28);
accel_minus_g = int16(30);
ground_accel = int16(26);
accel_plus_g = int16(28);
accel_minus_g = int16(30);
-
- rssi = in_rssi;
}
public AltosRecord update_state(AltosRecord prev) {
}
public AltosRecord update_state(AltosRecord prev) {
@@
-101,8
+97,6
@@
public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
next.accel_minus_g = AltosRecord.MISSING;
}
next.accel_minus_g = AltosRecord.MISSING;
}
- next.rssi = rssi;
-
next.seen |= AltosRecord.seen_sensor | AltosRecord.seen_temp_volt;
return next;
next.seen |= AltosRecord.seen_sensor | AltosRecord.seen_temp_volt;
return next;