projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Wake up non-ADC sensor code each timer tick
[fw/altos]
/
altoslib
/
AltosTelemetryRecordMegaSensor.java
diff --git
a/altoslib/AltosTelemetryRecordMegaSensor.java
b/altoslib/AltosTelemetryRecordMegaSensor.java
index 7548d69942af15ce6a055a1e45a4989fe27cc28a..2a4b17a4811839fd5f88503a2bca43e86f105c30 100644
(file)
--- a/
altoslib/AltosTelemetryRecordMegaSensor.java
+++ b/
altoslib/AltosTelemetryRecordMegaSensor.java
@@
-35,10
+35,8
@@
public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
int mag_y;
int mag_z;
int mag_y;
int mag_z;
- int rssi;
-
- public AltosTelemetryRecordMegaSensor(int[] in_bytes, int in_rssi) {
- super(in_bytes);
+ public AltosTelemetryRecordMegaSensor(int[] in_bytes, int rssi) {
+ super(in_bytes, rssi);
accel = int16(6);
pres = int32(8);
accel = int16(6);
pres = int32(8);
@@
-55,8
+53,6
@@
public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
mag_x = int16(26);
mag_y = int16(28);
mag_z = int16(30);
mag_x = int16(26);
mag_y = int16(28);
mag_z = int16(30);
-
- rssi = in_rssi;
}
public AltosRecord update_state(AltosRecord previous) {
}
public AltosRecord update_state(AltosRecord previous) {
@@
-85,8
+81,6
@@
public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
next.mag.y = mag_y;
next.mag.z = mag_z;
next.mag.y = mag_y;
next.mag.z = mag_z;
- next.rssi = rssi;
-
next.seen |= AltosRecord.seen_sensor;
return next;
next.seen |= AltosRecord.seen_sensor;
return next;