diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-02-20 13:23:52 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-02-20 13:23:52 -0700 |
| commit | 104b8bfc9b37fda175f2cb2a1e33601fbf6f48f6 (patch) | |
| tree | 0b47c34e04f4db8bdd509699e9e5b72ed9d6c052 /src/core/ao_telemetry.c | |
| parent | 403b95ee27782309b564855b85285c9f5f5c7068 (diff) | |
| parent | 1edf7ef8026ac4ab698a7f99671e9348d18ffd0a (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/core/ao_telemetry.c')
| -rw-r--r-- | src/core/ao_telemetry.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c index 5a00d825..a1c19185 100644 --- a/src/core/ao_telemetry.c +++ b/src/core/ao_telemetry.c @@ -187,7 +187,9 @@ ao_send_metrum_sensor(void) telemetry.generic.type = AO_TELEMETRY_METRUM_SENSOR; telemetry.metrum_sensor.state = ao_flight_state; +#if HAS_ACCEL telemetry.metrum_sensor.accel = ao_data_accel(packet); +#endif telemetry.metrum_sensor.pres = ao_data_pres(packet); telemetry.metrum_sensor.temp = ao_data_temp(packet); @@ -216,9 +218,15 @@ ao_send_metrum_data(void) telemetry.generic.type = AO_TELEMETRY_METRUM_DATA; telemetry.metrum_data.ground_pres = ao_ground_pres; +#if HAS_ACCEL telemetry.metrum_data.ground_accel = ao_ground_accel; telemetry.metrum_data.accel_plus_g = ao_config.accel_plus_g; telemetry.metrum_data.accel_minus_g = ao_config.accel_minus_g; +#else + telemetry.metrum_data.ground_accel = 1; + telemetry.metrum_data.accel_plus_g = 0; + telemetry.metrum_data.accel_minus_g = 2; +#endif ao_radio_send(&telemetry, sizeof (telemetry)); ao_telemetry_metrum_data_cur = ao_telemetry_metrum_data_max; |