projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make telemetrum-v1.1 compile with new ao_data structure
[fw/altos]
/
src
/
cc1111
/
ao_arch.h
diff --git
a/src/cc1111/ao_arch.h
b/src/cc1111/ao_arch.h
index 9d0643b4ba4f0f7d0135b7b81b4a45859d619a60..704ae4f911c2db6356bce656e893c79f02d7d0f6 100644
(file)
--- a/
src/cc1111/ao_arch.h
+++ b/
src/cc1111/ao_arch.h
@@
-199,7
+199,6
@@
extern __code __at (0x00a6) uint32_t ao_radio_cal;
#define ao_arch_critical(b) __critical { b }
struct ao_adc {
#define ao_arch_critical(b) __critical { b }
struct ao_adc {
- uint16_t tick; /* tick when the sample was read */
int16_t accel; /* accelerometer */
int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
int16_t accel; /* accelerometer */
int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
@@
-208,7
+207,7
@@
struct ao_adc {
int16_t sense_m; /* main continuity sense */
};
int16_t sense_m; /* main continuity sense */
};
-#define AO_
ADC_RING
32
+#define AO_
DATA_RING
32
/* ao_button.c */
#ifdef HAS_BUTTON
/* ao_button.c */
#ifdef HAS_BUTTON