summaryrefslogtreecommitdiff
path: root/altoslib/AltosTelemetryRecordSensor.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-09-05 11:33:48 -0700
committerKeith Packard <keithp@keithp.com>2013-09-05 11:35:14 -0700
commit5b976a6651f4eb05d30afc08b9e1f27c7e52ae00 (patch)
tree3a8f38d92fdc3b3e9e62d7744ff93a0f9ca8f7dc /altoslib/AltosTelemetryRecordSensor.java
parentb984ff81d6b8979574e0248ffe8876634b8e1942 (diff)
altoslib: Finish AltosState changes. Update version number.
Removes all of the AltosRecord bits, changes the monitor idle bits to have per-object state updaters. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryRecordSensor.java')
-rw-r--r--altoslib/AltosTelemetryRecordSensor.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/altoslib/AltosTelemetryRecordSensor.java b/altoslib/AltosTelemetryRecordSensor.java
index e0e92c13..d1d9dd7e 100644
--- a/altoslib/AltosTelemetryRecordSensor.java
+++ b/altoslib/AltosTelemetryRecordSensor.java
@@ -15,7 +15,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
@@ -70,7 +70,7 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
if (type == packet_type_TM_sensor)
next.accel = accel;
else
- next.accel = AltosRecord.MISSING;
+ next.accel = AltosLib.MISSING;
next.pres = pres;
next.temp = temp;
next.batt = v_batt;
@@ -78,8 +78,8 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
next.drogue = sense_d;
next.main = sense_m;
} else {
- next.drogue = AltosRecord.MISSING;
- next.main = AltosRecord.MISSING;
+ next.drogue = AltosLib.MISSING;
+ next.main = AltosLib.MISSING;
}
next.kalman_acceleration = acceleration / 16.0;
@@ -92,9 +92,9 @@ public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
next.accel_plus_g = accel_plus_g;
next.accel_minus_g = accel_minus_g;
} else {
- next.ground_accel = AltosRecord.MISSING;
- next.accel_plus_g = AltosRecord.MISSING;
- next.accel_minus_g = AltosRecord.MISSING;
+ next.ground_accel = AltosLib.MISSING;
+ next.accel_plus_g = AltosLib.MISSING;
+ next.accel_minus_g = AltosLib.MISSING;
}
next.seen |= AltosRecord.seen_sensor | AltosRecord.seen_temp_volt;