diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-29 19:44:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-29 19:47:42 -0700 |
| commit | 843fcab46d633e5bb6959286adeb68e41a4c30a3 (patch) | |
| tree | 53e38c7326dbc191d89c9a4059dcb8c28b4a9ce9 /src/core | |
| parent | e4d244eefa4c779cd9c8a91389bf998c54705b72 (diff) | |
altos: Add telefire-v0.1
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ao.h | 7 | ||||
| -rw-r--r-- | src/core/ao_config.c | 3 | ||||
| -rw-r--r-- | src/core/ao_storage.c | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/core/ao.h b/src/core/ao.h index 65b9eb18..1032dd33 100644 --- a/src/core/ao.h +++ b/src/core/ao.h @@ -432,6 +432,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 +490,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 +585,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 +623,8 @@ ao_monitor_enable(void); void ao_monitor_init(void) __reentrant; +#endif + /* * ao_stdio.c */ diff --git a/src/core/ao_config.c b/src/core/ao_config.c index e2095e65..f19dd9cd 100644 --- a/src/core/ao_config.c +++ b/src/core/ao_config.c @@ -17,8 +17,11 @@ #include "ao.h" #include "ao_log.h" +#include <ao_storage.h> +#if HAS_FLIGHT #include <ao_sample.h> #include <ao_data.h> +#endif __xdata struct ao_config ao_config; __pdata uint8_t ao_config_loaded; diff --git a/src/core/ao_storage.c b/src/core/ao_storage.c index b2dd435b..adf7e4d4 100644 --- a/src/core/ao_storage.c +++ b/src/core/ao_storage.c @@ -16,6 +16,7 @@ */ #include <ao.h> +#include <ao_storage.h> uint8_t ao_storage_read(ao_pos_t pos, __xdata void *buf, uint16_t len) __reentrant |