summaryrefslogtreecommitdiff
path: root/ao_monitor.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-05-17 23:36:21 -0700
committerKeith Packard <keithp@keithp.com>2009-05-17 23:36:21 -0700
commit91b07410122d0eaaf292cdb31c200925d45eaf2c (patch)
tree7a5662b499d09855e9cece8d2de379e3556a0156 /ao_monitor.c
parent71d1689759829f1bc8550f1a4d8c9f2dc90b2ab4 (diff)
Transmit computed ground pressure and acceleration values0.4
These are the last two values relevant to figuring out the state of the flight computer, and as they are computed by averaging 10 seconds of 100Hz sample data, they're a lot more accurate than anything the receiver could do on its own. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'ao_monitor.c')
-rw-r--r--ao_monitor.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ao_monitor.c b/ao_monitor.c
index 880f257c..5997d427 100644
--- a/ao_monitor.c
+++ b/ao_monitor.c
@@ -36,12 +36,12 @@ ao_monitor(void)
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
- printf ("CALL %s SERIAL %3d RSSI %3d STATUS %02x STATE %7s ",
+ printf ("CALL %s SERIAL %3d RSSI %4d STATUS %02x STATE %7s ",
callsign,
recv.telemetry.addr,
(int) recv.rssi - 74, recv.status,
ao_state_names[state]);
- printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d fa: %5d fv: %7ld fp: %5d ",
+ printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d fa: %5d ga: %d fv: %7ld fp: %5d gp: %5d ",
recv.telemetry.adc.tick,
recv.telemetry.adc.accel,
recv.telemetry.adc.pres,
@@ -50,8 +50,10 @@ ao_monitor(void)
recv.telemetry.adc.sense_d,
recv.telemetry.adc.sense_m,
recv.telemetry.flight_accel,
+ recv.telemetry.ground_accel,
recv.telemetry.flight_vel,
- recv.telemetry.flight_pres);
+ recv.telemetry.flight_pres,
+ recv.telemetry.ground_pres);
ao_gps_print(&recv.telemetry.gps);
ao_rssi_set((int) recv.rssi - 74);
} else {