From 7600116a191b3ac252a0f716d200d0e0b3500987 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 23 May 2017 14:53:55 -0700 Subject: altoslib: Don't store computed telemetry fields These values are only needed once, so there's no reason to save them. Signed-off-by: Keith Packard --- altoslib/AltosTelemetryMetrumData.java | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'altoslib/AltosTelemetryMetrumData.java') diff --git a/altoslib/AltosTelemetryMetrumData.java b/altoslib/AltosTelemetryMetrumData.java index 53a10cc4..7ba591ed 100644 --- a/altoslib/AltosTelemetryMetrumData.java +++ b/altoslib/AltosTelemetryMetrumData.java @@ -21,23 +21,18 @@ package org.altusmetrum.altoslib_11; public class AltosTelemetryMetrumData extends AltosTelemetryStandard { - int ground_pres; - int ground_accel; - int accel_plus_g; - int accel_minus_g; + int ground_pres() { return int32(8); } + int ground_accel() { return int16(12); } + int accel_plus_g() { return int16(14); } + int accel_minus_g() { return int16(16); } - public AltosTelemetryMetrumData(int[] bytes) { + public AltosTelemetryMetrumData(int[] bytes) throws AltosCRCException { super(bytes); - - ground_pres = int32(8); - ground_accel = int16(12); - accel_plus_g = int16(14); - accel_minus_g = int16(16); } public void update_state(AltosState state) { - state.set_ground_accel(ground_accel); - state.set_accel_g(accel_plus_g, accel_minus_g); - state.set_ground_pressure(ground_pres); + state.set_ground_accel(ground_accel()); + state.set_accel_g(accel_plus_g(), accel_minus_g()); + state.set_ground_pressure(ground_pres()); } } -- cgit v1.2.3