diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-08-08 06:46:56 +1200 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-08-08 06:46:56 +1200 |
| commit | bd02349111ae0f39b320e6a10a330051ddc39fdf (patch) | |
| tree | ab7a29204eea195db77aa302fbe3e2012ef5049e /src/core/ao.h | |
| parent | 8e4ebd1f6eb928b5cb7bcda4ed88851aa9e61bdf (diff) | |
| parent | c7f228503870c44dfd278ede8b0980dbac73d3c7 (diff) | |
Merge branch 'master' of git://git.gag.com/fw/altos
Diffstat (limited to 'src/core/ao.h')
| -rw-r--r-- | src/core/ao.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/core/ao.h b/src/core/ao.h index 65b9eb18..5e1fbb9d 100644 --- a/src/core/ao.h +++ b/src/core/ao.h @@ -125,7 +125,12 @@ ao_panic(uint8_t reason); * ao_timer.c */ -extern volatile __data uint16_t ao_tick_count; +#ifndef AO_TICK_TYPE +#define AO_TICK_TYPE uint16_t +#define AO_TICK_SIGNED int16_t +#endif + +extern volatile __data AO_TICK_TYPE ao_tick_count; /* Our timer runs at 100Hz */ #define AO_HERTZ 100 @@ -432,6 +437,7 @@ ao_gps_report_mega_init(void); * ao_telemetry_orig.c */ +#if LEGACY_MONITOR struct ao_adc_orig { uint16_t tick; /* tick when the sample was read */ int16_t accel; /* accelerometer */ @@ -489,6 +495,8 @@ struct ao_telemetry_tiny_recv { uint8_t status; }; +#endif /* LEGACY_MONITOR */ + /* Unfortunately, we've exposed the CC1111 rssi units as the 'usual' method * for reporting RSSI. So, now we use these values everywhere */ @@ -582,6 +590,8 @@ ao_radio_init(void); * ao_monitor.c */ +#if HAS_MONITOR + extern const char const * const ao_state_names[]; #define AO_MONITOR_RING 8 @@ -618,6 +628,8 @@ ao_monitor_enable(void); void ao_monitor_init(void) __reentrant; +#endif + /* * ao_stdio.c */ |