summaryrefslogtreecommitdiff
path: root/altosui/AltosCSV.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-10-21 16:13:14 -0700
committerKeith Packard <keithp@keithp.com>2012-10-21 16:13:14 -0700
commit7894c27b2b2c3c46a7c107c8acd5977830f006cf (patch)
treef05c9d5c6bc06c1764118d1f5596a95f0016178d /altosui/AltosCSV.java
parentdec2e455935a71dec13b84bb886252b7f4a1a641 (diff)
altoslib: Move computed state from AltosRecord to AltosState
Make AltosRecord simply track the raw data and have AltosState hold all computed values, including cross-packet averages and computed speeds. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosCSV.java')
-rw-r--r--altosui/AltosCSV.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index f8cc1ed6..1c929a7c 100644
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -128,10 +128,10 @@ public class AltosCSV implements AltosWriter {
void write_basic(AltosRecord record) {
out.printf("%8.2f,%10.2f,%8.2f,%8.2f,%8.2f,%8.2f,%5.1f,%5.2f,%5.2f,%5.2f",
record.acceleration(),
- record.raw_pressure(),
- record.raw_altitude(),
- record.raw_height(),
- record.accel_speed(),
+ record.pressure(),
+ record.altitude(),
+ record.height(),
+ state.accel_speed,
state.baro_speed,
record.temperature(),
record.battery_voltage(),