diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-06 16:19:22 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-06 16:19:46 -0700 |
| commit | 0154d13756bcb09f009981ee5e4bd27fd04b8788 (patch) | |
| tree | 2f97963e8de0e79dc2c1e6405c69762d2356a8f7 | |
| parent | b65140a0139075adeddaccf0f4d5c7a75fac4757 (diff) | |
altos: Switch Tm and Tn to common telemetry code
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/Makefile.proto | 4 | ||||
| -rw-r--r-- | src/ao_telemetry.c | 6 | ||||
| -rw-r--r-- | src/ao_telemini.c | 2 | ||||
| -rw-r--r-- | src/ao_telenano.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/Makefile.proto b/src/Makefile.proto index 5322df17..309fd75d 100644 --- a/src/Makefile.proto +++ b/src/Makefile.proto @@ -195,7 +195,7 @@ TMINI_TASK_SRC = \ ao_log.c \ ao_log_tiny.c \ ao_report.c \ - ao_telemetry_tiny.c + ao_telemetry.c TMINI_MAIN_SRC = \ ao_telemini.c @@ -225,7 +225,7 @@ TNANO_TASK_SRC = \ ao_log.c \ ao_log_tiny.c \ ao_report.c \ - ao_telemetry_tiny.c + ao_telemetry.c TNANO_MAIN_SRC = \ ao_telenano.c diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c index dcd0ff62..603a6791 100644 --- a/src/ao_telemetry.c +++ b/src/ao_telemetry.c @@ -77,9 +77,15 @@ ao_send_sensor(void) telemetry.sensor.height = ao_height; telemetry.sensor.ground_pres = ao_ground_pres; +#if HAS_ACCEL telemetry.sensor.ground_accel = ao_ground_accel; telemetry.sensor.accel_plus_g = ao_config.accel_plus_g; telemetry.sensor.accel_minus_g = ao_config.accel_minus_g; +#else + telemetry.sensor.ground_accel = 0; + telemetry.sensor.accel_plus_g = 0; + telemetry.sensor.accel_minus_g = 0; +#endif ao_radio_send(&telemetry, sizeof (telemetry)); } diff --git a/src/ao_telemini.c b/src/ao_telemini.c index dbc3b74c..19d03692 100644 --- a/src/ao_telemini.c +++ b/src/ao_telemini.c @@ -42,7 +42,7 @@ main(void) ao_flight_init(); ao_log_init(); ao_report_init(); - ao_telemetry_tiny_init(); + ao_telemetry_init(); ao_radio_init(); ao_packet_slave_init(TRUE); ao_igniter_init(); diff --git a/src/ao_telenano.c b/src/ao_telenano.c index 47b7b3c3..40822b6e 100644 --- a/src/ao_telenano.c +++ b/src/ao_telenano.c @@ -42,7 +42,7 @@ main(void) ao_flight_nano_init(); ao_log_init(); ao_report_init(); - ao_telemetry_tiny_init(); + ao_telemetry_init(); ao_radio_init(); ao_packet_slave_init(TRUE); ao_config_init(); |