Switch from GPLv2 to GPLv2+

[fw/altos] / ao-tools / ao-telem / ao-telem.c

diff --git a/ao-tools/ao-telem/ao-telem.c b/ao-tools/ao-telem/ao-telem.c
index f1755b824f82ef233a89d6ec9312bdea623700c9..aa54a1b9a4ffe5b0a1906ff211e659197118d463 100644 (file)
--- a/ao-tools/ao-telem/ao-telem.c
+++ b/ao-tools/ao-telem/ao-telem.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -158,7 +159,8 @@ main (int argc, char **argv)
                                        printf ("\n");
                                        break;
                                case AO_TELEMETRY_MEGA_SENSOR:
-                                       printf ("accel %5d pres %9d temp %5d accel_x %5d accel_y %5d accel_z %5d gyro_x %5d gyro_y %5d gyro_z %5d mag_x %5d mag_y %5d mag_z %5d\n",
+                                       printf ("orient %3d accel %5d pres %9d temp %5d accel_x %5d accel_y %5d accel_z %5d gyro_x %5d gyro_y %5d gyro_z %5d mag_x %5d mag_y %5d mag_z %5d\n",
+                                               telem.mega_sensor.orient,
                                                telem.mega_sensor.accel,
                                                telem.mega_sensor.pres,
                                                telem.mega_sensor.temp,
@@ -172,6 +174,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,
@@ -181,7 +192,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,