projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate RDF tone generation.
[fw/altos]
/
ao_monitor.c
diff --git
a/ao_monitor.c
b/ao_monitor.c
index 6aed581a69b1f6d71a1b597923860f31428c728e..5997d427a4388536687bf1a0c3a4c93238d655bb 100644
(file)
--- a/
ao_monitor.c
+++ b/
ao_monitor.c
@@
-36,19
+36,24
@@
ao_monitor(void)
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
- printf ("CALL %s SERIAL %3d RSSI %
3
d STATUS %02x STATE %7s ",
+ printf ("CALL %s SERIAL %3d RSSI %
4
d STATUS %02x STATE %7s ",
callsign,
recv.telemetry.addr,
(int) recv.rssi - 74, recv.status,
ao_state_names[state]);
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 ",
+ 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,
recv.telemetry.adc.temp,
recv.telemetry.adc.v_batt,
recv.telemetry.adc.sense_d,
recv.telemetry.adc.tick,
recv.telemetry.adc.accel,
recv.telemetry.adc.pres,
recv.telemetry.adc.temp,
recv.telemetry.adc.v_batt,
recv.telemetry.adc.sense_d,
- recv.telemetry.adc.sense_m);
+ recv.telemetry.adc.sense_m,
+ recv.telemetry.flight_accel,
+ recv.telemetry.ground_accel,
+ recv.telemetry.flight_vel,
+ recv.telemetry.flight_pres,
+ recv.telemetry.ground_pres);
ao_gps_print(&recv.telemetry.gps);
ao_rssi_set((int) recv.rssi - 74);
} else {
ao_gps_print(&recv.telemetry.gps);
ao_rssi_set((int) recv.rssi - 74);
} else {