projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/easymini-2.0: Add combined .dfu file for Seeed testing
[fw/altos]
/
src
/
kernel
/
ao_host.h
diff --git
a/src/kernel/ao_host.h
b/src/kernel/ao_host.h
index 50583f52929722d14575fd185bdc3fd95389d236..c974a9fe5f1e37c89261245bfa3ab945d1b8bdbf 100644
(file)
--- a/
src/kernel/ao_host.h
+++ b/
src/kernel/ao_host.h
@@
-32,7
+32,7
@@
* One set of samples read from the A/D converter
*/
struct ao_adc {
* One set of samples read from the A/D converter
*/
struct ao_adc {
-
uint16_t
tick; /* tick when the sample was read */
+
AO_TICK_TYPE
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 */
@@
-41,16
+41,6
@@
struct ao_adc {
int16_t sense_m; /* main continuity sense */
};
int16_t sense_m; /* main continuity sense */
};
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
-
-#define DATA_TO_XDATA(a) (a)
-#define PDATA_TO_XDATA(a) (a)
-#define CODE_TO_XDATA(a) (a)
-
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
@@
-131,6
+121,6
@@
struct ao_config {
struct ao_config ao_config = { 250, 16000 };
struct ao_config ao_config = { 250, 16000 };
-#define
ao_x
memcpy(d,s,c) memcpy(d,s,c)
-#define
ao_x
memset(d,v,c) memset(d,v,c)
-#define
ao_x
memcmp(d,s,c) memcmp(d,s,c)
+#define memcpy(d,s,c) memcpy(d,s,c)
+#define memset(d,v,c) memset(d,v,c)
+#define memcmp(d,s,c) memcmp(d,s,c)