diff options
| author | Keith Packard <keithp@keithp.com> | 2013-08-26 18:46:02 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-08-26 18:47:27 -0700 |
| commit | a73b02518fcbc9fc0807ed8e141d3a06e8ad8214 (patch) | |
| tree | e3701ea26fa97e1f94457cb6108352f4d3f479c9 | |
| parent | d54156caf856ab5570f050692b333a2c5d991265 (diff) | |
altos: Don't use ao_data on cc1111 projectstelemini
cc1111 ao_adc.c supplies the needed globals at this point, and linking
both into the program leads to two different versions of each at
different addresses (yay SDCC linker!)
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/cc1111/ao_adc.c | 3 | ||||
| -rw-r--r-- | src/telemini-v2.0/Makefile | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c index 97a39c4d..15429677 100644 --- a/src/cc1111/ao_adc.c +++ b/src/cc1111/ao_adc.c @@ -19,6 +19,9 @@ volatile __xdata struct ao_data ao_data_ring[AO_DATA_RING]; volatile __data uint8_t ao_data_head; +#if (AO_DATA_ALL & ~(AO_DATA_ADC)) +volatile __data uint8_t ao_data_present; +#endif #ifdef TELENANO_V_0_1 # define AO_ADC_FIRST_PIN 1 diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile index 5550e172..40878778 100644 --- a/src/telemini-v2.0/Makefile +++ b/src/telemini-v2.0/Makefile @@ -24,7 +24,8 @@ INC = \ ao_product.h \ ao_int64.h \ ao_sample.h \ - ao_exti.h + ao_exti.h \ + ao_task.h CORE_SRC = \ ao_cmd.c \ @@ -58,7 +59,6 @@ CC1111_SRC = \ ao_spi.c \ ao_usb.c \ ao_convert_pa.c \ - ao_data.c \ ao_beep.c \ ao_timer.c \ ao_exti.c \ |