projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove *_TO_DATA macros
[fw/altos]
/
src
/
kernel
/
ao_sample.h
diff --git
a/src/kernel/ao_sample.h
b/src/kernel/ao_sample.h
index f89d6a4ced254e0c7723eb002503987590b73d3d..5ae389bec7c636e4356b1d0c4042fd7fee5e25b0 100644
(file)
--- a/
src/kernel/ao_sample.h
+++ b/
src/kernel/ao_sample.h
@@
-146,7
+146,10
@@
extern __pdata accel_t ao_sample_accel_through;
extern __pdata gyro_t ao_sample_roll;
extern __pdata gyro_t ao_sample_pitch;
extern __pdata gyro_t ao_sample_yaw;
extern __pdata gyro_t ao_sample_roll;
extern __pdata gyro_t ao_sample_pitch;
extern __pdata gyro_t ao_sample_yaw;
+#define AO_NUM_ORIENT 64
extern __pdata angle_t ao_sample_orient;
extern __pdata angle_t ao_sample_orient;
+extern __pdata angle_t ao_sample_orients[AO_NUM_ORIENT];
+extern __pdata uint8_t ao_sample_orient_pos;
#endif
void ao_sample_init(void);
#endif
void ao_sample_init(void);
@@
-180,7
+183,9
@@
extern __xdata ao_v_t ao_max_height; /* max of ao_height */
extern __xdata ao_v_t ao_avg_height; /* running average of height */
extern __pdata ao_v_t ao_error_h;
extern __xdata ao_v_t ao_avg_height; /* running average of height */
extern __pdata ao_v_t ao_error_h;
+#if !HAS_ACCEL
extern __pdata ao_v_t ao_error_h_sq_avg;
extern __pdata ao_v_t ao_error_h_sq_avg;
+#endif
#if HAS_ACCEL
extern __pdata ao_v_t ao_error_a;
#if HAS_ACCEL
extern __pdata ao_v_t ao_error_a;