projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Rename ao_orient to ao_sample_orient
[fw/altos]
/
src
/
core
/
ao_sample.c
diff --git
a/src/core/ao_sample.c
b/src/core/ao_sample.c
index a9d50cb2535c528947d4cc3fb0f8b8aa06df5828..47c5ea2e3660d15d0dcb4d526c1136653bb729e5 100644
(file)
--- a/
src/core/ao_sample.c
+++ b/
src/core/ao_sample.c
@@
-48,7
+48,7
@@
__pdata accel_t ao_sample_accel_through;
__pdata gyro_t ao_sample_roll;
__pdata gyro_t ao_sample_pitch;
__pdata gyro_t ao_sample_yaw;
__pdata gyro_t ao_sample_roll;
__pdata gyro_t ao_sample_pitch;
__pdata gyro_t ao_sample_yaw;
-__pdata angle_t ao_orient;
+__pdata angle_t ao_
sample_
orient;
#endif
__data uint8_t ao_sample_data;
#endif
__data uint8_t ao_sample_data;
@@
-134,7
+134,7
@@
ao_sample_preflight_set(void)
ao_sample_pitch_sum = 0;
ao_sample_yaw_sum = 0;
ao_sample_roll_sum = 0;
ao_sample_pitch_sum = 0;
ao_sample_yaw_sum = 0;
ao_sample_roll_sum = 0;
- ao_orient = 0;
+ ao_
sample_
orient = 0;
/* No rotation yet */
ao_quaternion_init_zero_rotation(&ao_rotation);
/* No rotation yet */
ao_quaternion_init_zero_rotation(&ao_rotation);
@@
-212,7
+212,7
@@
ao_sample_rotate(void)
ao_quaternion_rotate(&point, &ao_pad_orientation, &ao_rotation);
ao_quaternion_rotate(&point, &ao_pad_orientation, &ao_rotation);
- ao_
orient = acosf(point.
z) * (float) (180.0/M_PI);
+ ao_
sample_orient = acosf(rot
z) * (float) (180.0/M_PI);
}
#endif
}
#endif
@@
-349,7
+349,7
@@
ao_sample_init(void)
ao_sample_pitch = 0;
ao_sample_yaw = 0;
ao_sample_roll = 0;
ao_sample_pitch = 0;
ao_sample_yaw = 0;
ao_sample_roll = 0;
- ao_orient = 0;
+ ao_
sample_
orient = 0;
#endif
ao_sample_data = ao_data_head;
ao_preflight = TRUE;
#endif
ao_sample_data = ao_data_head;
ao_preflight = TRUE;