From 1260589976c1a95848b298497fd251c4ee7d3f93 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 19 Sep 2010 02:52:29 -0700 Subject: [PATCH] altosui: Write raw sensor data to .csv files For data export, provide the raw sensor samples instead of the filtered values. Signed-off-by: Keith Packard --- ao-tools/altosui/AltosCSV.java | 6 +++--- ao-tools/altosui/AltosRecord.java | 22 +++++++++++++++++----- ao-tools/altosui/AltosState.java | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ao-tools/altosui/AltosCSV.java b/ao-tools/altosui/AltosCSV.java index 07fa371f..f7b3c03c 100644 --- a/ao-tools/altosui/AltosCSV.java +++ b/ao-tools/altosui/AltosCSV.java @@ -111,9 +111,9 @@ public class AltosCSV { 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.pressure(), - record.altitude(), - record.height(), + record.raw_pressure(), + record.raw_altitude(), + record.raw_height(), record.accel_speed(), state.baro_speed, record.temperature(), diff --git a/ao-tools/altosui/AltosRecord.java b/ao-tools/altosui/AltosRecord.java index b670ee37..18c6079d 100644 --- a/ao-tools/altosui/AltosRecord.java +++ b/ao-tools/altosui/AltosRecord.java @@ -73,7 +73,11 @@ public class AltosRecord { return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0; } - public double pressure() { + public double raw_pressure() { + return barometer_to_pressure(pres); + } + + public double filtered_pressure() { return barometer_to_pressure(flight_pres); } @@ -81,16 +85,24 @@ public class AltosRecord { return barometer_to_pressure(ground_pres); } - public double altitude() { - return AltosConvert.pressure_to_altitude(pressure()); + public double filtered_altitude() { + return AltosConvert.pressure_to_altitude(filtered_pressure()); + } + + public double raw_altitude() { + return AltosConvert.pressure_to_altitude(raw_pressure()); } public double ground_altitude() { return AltosConvert.pressure_to_altitude(ground_pressure()); } - public double height() { - return altitude() - ground_altitude(); + public double filtered_height() { + return filtered_altitude() - ground_altitude(); + } + + public double raw_height() { + return raw_altitude() - ground_altitude(); } public double battery_voltage() { diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java index 3ef00f35..90e73f5e 100644 --- a/ao-tools/altosui/AltosState.java +++ b/ao-tools/altosui/AltosState.java @@ -80,7 +80,7 @@ public class AltosState { data = cur; ground_altitude = data.ground_altitude(); - height = data.altitude() - ground_altitude; + height = data.filtered_altitude() - ground_altitude; report_time = System.currentTimeMillis(); -- 2.30.2