summaryrefslogtreecommitdiff
path: root/ao-tools
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2015-09-29 00:46:42 -0600
committerBdale Garbee <bdale@gag.com>2015-09-29 00:46:42 -0600
commit7064bc685aebeef07711e525dea4d5fbe33d235b (patch)
tree90b7c046fef47ecd2c68c1acafa042871435e24e /ao-tools
parentea1d24151cf76ae8f2368673317b66958e2508c4 (diff)
parentdda3f459eaff8d4e41cb44584c8ef77b8e2b3b1c (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'ao-tools')
-rw-r--r--ao-tools/ao-telem/ao-telem.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/ao-tools/ao-telem/ao-telem.c b/ao-tools/ao-telem/ao-telem.c
index da873838..05a69542 100644
--- a/ao-tools/ao-telem/ao-telem.c
+++ b/ao-tools/ao-telem/ao-telem.c
@@ -173,6 +173,15 @@ main (int argc, char **argv)
telem.mega_sensor.mag_y,
telem.mega_sensor.mag_z);
break;
+ case AO_TELEMETRY_COMPANION:
+ printf("board_id %3d update_period %3d channels %2d",
+ telem.companion.board_id,
+ telem.companion.update_period,
+ telem.companion.channels);
+ for (c = 0; c < telem.companion.channels; c++)
+ printf(" %6d", telem.companion.companion_data[c]);
+ printf("\n");
+ break;
case AO_TELEMETRY_MEGA_DATA:
printf ("state %1d v_batt %5d v_pyro %5d ",
telem.mega_data.state,
@@ -182,7 +191,7 @@ main (int argc, char **argv)
printf ("s%1d %5d ", c,
telem.mega_data.sense[c] |
(telem.mega_data.sense[c] << 8));
-
+
printf ("ground_pres %5d ground_accel %5d accel_plus %5d accel_minus %5d ",
telem.mega_data.ground_pres,
telem.mega_data.ground_accel,