diff options
| author | Bdale Garbee <bdale@gag.com> | 2010-05-17 23:59:43 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2010-05-17 23:59:43 -0600 |
| commit | 0c6cf621dfd8339b8bc3915750a3147235f1331b (patch) | |
| tree | 59acb8f8311fc33ccd36dba4d932110da7ad1e97 /ao-tools/altosui/AltosState.java | |
| parent | 32e430b8a5f93b312f6359b4d553bad92ed37b19 (diff) | |
| parent | 563a9dcdfef42718370c49f16cc2271642b3e055 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'ao-tools/altosui/AltosState.java')
| -rw-r--r-- | ao-tools/altosui/AltosState.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java index 192011d0..59a1999e 100644 --- a/ao-tools/altosui/AltosState.java +++ b/ao-tools/altosui/AltosState.java @@ -29,7 +29,7 @@ public class AltosState { /* derived data */ - double report_time; + long report_time; double time_change; int tick; @@ -66,11 +66,6 @@ public class AltosState { int speak_tick; double speak_altitude; - static double - aoview_time() - { - return System.currentTimeMillis() / 1000.0; - } void init (AltosTelemetry cur, AltosState prev_state) { int i; @@ -82,7 +77,7 @@ public class AltosState { ground_altitude = AltosConvert.cc_barometer_to_altitude(data.ground_pres); height = AltosConvert.cc_barometer_to_altitude(data.flight_pres) - ground_altitude; - report_time = aoview_time(); + report_time = System.currentTimeMillis(); accel_counts_per_mss = ((data.accel_minus_g - data.accel_plus_g) / 2.0) / 9.80665; acceleration = (data.ground_accel - data.flight_accel) / accel_counts_per_mss; |