diff options
| author | Keith Packard <keithp@keithp.com> | 2014-02-18 09:45:41 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-02-18 09:45:41 -0800 |
| commit | 8b6f051663dd17492bece9efb9e898ef113ab414 (patch) | |
| tree | 4c01b8f7742e53fb253f1fc5c0bfac33aecbc663 | |
| parent | 9f6983e3d61fa5231f3d0ce33dbc5aadf946b597 (diff) | |
altos: Set reasonable accel values when !HAS_ACCEL
This lets us use telemetrum log and telemetry formats for balloons
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/core/ao_log_metrum.c | 2 | ||||
| -rw-r--r-- | src/core/ao_telemetry.c | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/ao_log_metrum.c b/src/core/ao_log_metrum.c index 91624d98..9b17adc2 100644 --- a/src/core/ao_log_metrum.c +++ b/src/core/ao_log_metrum.c @@ -116,7 +116,9 @@ ao_log(void) log.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres; log.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607_raw.temp; #endif +#if HAS_ACCEL log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]); +#endif ao_log_metrum(&log); if (ao_log_state <= ao_flight_coast) next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT; 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; |