diff --git a/conf/airframes/booz2.xml b/conf/airframes/booz2.xml index ec3e445d5f..6864611504 100644 --- a/conf/airframes/booz2.xml +++ b/conf/airframes/booz2.xml @@ -78,8 +78,8 @@ - - + + diff --git a/sw/simulator/booz_sensors_model_accel.c b/sw/simulator/booz_sensors_model_accel.c index f4e8e4f11b..ca6ae2f88f 100644 --- a/sw/simulator/booz_sensors_model_accel.c +++ b/sw/simulator/booz_sensors_model_accel.c @@ -91,11 +91,11 @@ void booz_sensors_model_accel_run( double time, MAT* dcm ) { accel_body->ve[AXIS_X], accel_body->ve[AXIS_Y], accel_body->ve[AXIS_Z]); -#endif accel_body = mv_mlt(dcm, g_inert, accel_body); accel_body = sv_mlt(-1., accel_body, accel_body); +#endif // printf(" accel_body ~ %f %f %f\n", accel_body->ve[AXIS_X], accel_body->ve[AXIS_Y], accel_body->ve[AXIS_Z]); #endif diff --git a/sw/simulator/booz_sensors_model_params_booz2.h b/sw/simulator/booz_sensors_model_params_booz2.h index 92fc47479f..df718290c0 100644 --- a/sw/simulator/booz_sensors_model_params_booz2.h +++ b/sw/simulator/booz_sensors_model_params_booz2.h @@ -31,15 +31,20 @@ #define BSM_ACCEL_RESOLUTION (65536) /* ms-2 */ #define BSM_ACCEL_SENSITIVITY_XX 1250. -#define BSM_ACCEL_SENSITIVITY_YY -1250. -#define BSM_ACCEL_SENSITIVITY_ZZ -1250. +#define BSM_ACCEL_SENSITIVITY_YY 1250. +#define BSM_ACCEL_SENSITIVITY_ZZ 1250. #define BSM_ACCEL_NEUTRAL_X 32768 #define BSM_ACCEL_NEUTRAL_Y 32768 #define BSM_ACCEL_NEUTRAL_Z 32768 /* m2s-4 */ -#define BSM_ACCEL_NOISE_STD_DEV_X 0 -#define BSM_ACCEL_NOISE_STD_DEV_Y 0 -#define BSM_ACCEL_NOISE_STD_DEV_Z 0 +//#define BSM_ACCEL_NOISE_STD_DEV_X 0 +//#define BSM_ACCEL_NOISE_STD_DEV_Y 0 +//#define BSM_ACCEL_NOISE_STD_DEV_Z 0 + +#define BSM_ACCEL_NOISE_STD_DEV_X 5e-1 +#define BSM_ACCEL_NOISE_STD_DEV_Y 5e-1 +#define BSM_ACCEL_NOISE_STD_DEV_Z 5e-1 + /* ms-2 */ #define BSM_ACCEL_BIAS_X 0 #define BSM_ACCEL_BIAS_Y 0