always use ahrs.status, never ahrs_float.status

This commit is contained in:
Felix Ruess
2011-10-05 01:06:46 +02:00
parent b386d33e09
commit 10f6a86400
5 changed files with 8 additions and 5 deletions
+2 -1
View File
@@ -64,7 +64,8 @@ struct AhrsFloat {
struct FloatRates body_rate;
struct FloatRates body_rate_d;
uint8_t status;
// always use status from fixed point ahrs struct for now
//uint8_t status;
};
extern struct Ahrs ahrs;
@@ -44,7 +44,7 @@ static inline void compute_body_orientation_and_rates(void);
struct AhrsFloatCmplRmat ahrs_impl;
void ahrs_init(void) {
ahrs_float.status = AHRS_UNINIT;
ahrs.status = AHRS_UNINIT;
/* Initialises IMU alignement */
struct FloatEulers body_to_imu_euler =
+1 -1
View File
@@ -162,7 +162,7 @@ void ahrs_update_fw_estimator( void )
void ahrs_init(void) {
ahrs_float.status = AHRS_UNINIT;
ahrs.status = AHRS_UNINIT;
/*
* Initialises our IMU alignement variables
+1 -1
View File
@@ -29,7 +29,7 @@
void ahrs_init(void) {
ahrs_float.status = AHRS_UNINIT;
ahrs.status = AHRS_UNINIT;
/* set ltp_to_body to zero */
FLOAT_QUAT_ZERO(ahrs_float.ltp_to_body_quat);
+3 -1
View File
@@ -58,7 +58,9 @@ void update_attitude_from_sim(void) {
void ahrs_init(void) {
ahrs_float.status = AHRS_UNINIT;
//ahrs_float.status = AHRS_UNINIT;
// set to running for now and only use ahrs.status, not ahrs_float.status
ahrs.status = AHRS_RUNNING;
/* set ltp_to_body to zero */
FLOAT_QUAT_ZERO(ahrs_float.ltp_to_body_quat);