Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 18:07:25 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

replacing use of deprecated macros

Browse Source
This commit is contained in:
Ewoud Smeur
2016-06-29 11:44:45 +02:00
parent 041bdbab88
commit d22b727abd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/math/pprz_algebra_float.c
+1 -1
View File
@@ -248,7 +248,7 @@ void float_rmat_integrate_fi(struct FloatRMat *rm, struct FloatRates *omega, flo
} }
}; };
struct FloatRMat R_tdt; struct FloatRMat R_tdt;
FLOAT_RMAT_COMP(R_tdt, *rm, exp_omega_dt); float_rmat_comp(R_tdt, *rm, exp_omega_dt);
memcpy(rm, &R_tdt, sizeof(R_tdt)); memcpy(rm, &R_tdt, sizeof(R_tdt));
} }
sw/airborne/state.c
+3 -3
View File
@@ -704,7 +704,7 @@ void stateCalcHorizontalSpeedNorm_i(void)
} else if (bit_is_set(state.speed_status, SPEED_NED_I)) { } else if (bit_is_set(state.speed_status, SPEED_NED_I)) {
uint32_t n2 = (state.ned_speed_i.x * state.ned_speed_i.x + uint32_t n2 = (state.ned_speed_i.x * state.ned_speed_i.x +
state.ned_speed_i.y * state.ned_speed_i.y) >> INT32_SPEED_FRAC; state.ned_speed_i.y * state.ned_speed_i.y) >> INT32_SPEED_FRAC;
INT32_SQRT(state.h_speed_norm_i, n2); int32_sqrt(state.h_speed_norm_i, n2);
} else if (bit_is_set(state.speed_status, SPEED_NED_F)) { } else if (bit_is_set(state.speed_status, SPEED_NED_F)) {
state.h_speed_norm_f = FLOAT_VECT2_NORM(state.ned_speed_f); state.h_speed_norm_f = FLOAT_VECT2_NORM(state.ned_speed_f);
SetBit(state.speed_status, SPEED_HNORM_F); SetBit(state.speed_status, SPEED_HNORM_F);
@@ -712,7 +712,7 @@ void stateCalcHorizontalSpeedNorm_i(void)
} else if (bit_is_set(state.speed_status, SPEED_ENU_I)) { } else if (bit_is_set(state.speed_status, SPEED_ENU_I)) {
uint32_t n2 = (state.enu_speed_i.x * state.enu_speed_i.x + uint32_t n2 = (state.enu_speed_i.x * state.enu_speed_i.x +
state.enu_speed_i.y * state.enu_speed_i.y) >> INT32_SPEED_FRAC; state.enu_speed_i.y * state.enu_speed_i.y) >> INT32_SPEED_FRAC;
INT32_SQRT(state.h_speed_norm_i, n2); int32_sqrt(state.h_speed_norm_i, n2);
} else if (bit_is_set(state.speed_status, SPEED_ENU_F)) { } else if (bit_is_set(state.speed_status, SPEED_ENU_F)) {
state.h_speed_norm_f = FLOAT_VECT2_NORM(state.enu_speed_f); state.h_speed_norm_f = FLOAT_VECT2_NORM(state.enu_speed_f);
SetBit(state.speed_status, SPEED_HNORM_F); SetBit(state.speed_status, SPEED_HNORM_F);
@@ -723,7 +723,7 @@ void stateCalcHorizontalSpeedNorm_i(void)
SetBit(state.speed_status, SPEED_NED_I); SetBit(state.speed_status, SPEED_NED_I);
uint32_t n2 = (state.ned_speed_i.x * state.ned_speed_i.x + uint32_t n2 = (state.ned_speed_i.x * state.ned_speed_i.x +
state.ned_speed_i.y * state.ned_speed_i.y) >> INT32_SPEED_FRAC; state.ned_speed_i.y * state.ned_speed_i.y) >> INT32_SPEED_FRAC;
INT32_SQRT(state.h_speed_norm_i, n2); int32_sqrt(state.h_speed_norm_i, n2);
} else if (bit_is_set(state.speed_status, SPEED_ECEF_F)) { } else if (bit_is_set(state.speed_status, SPEED_ECEF_F)) {
ned_of_ecef_vect_f(&state.ned_speed_f, &state.ned_origin_f, &state.ecef_speed_f); ned_of_ecef_vect_f(&state.ned_speed_f, &state.ned_origin_f, &state.ecef_speed_f);
SetBit(state.speed_status, SPEED_NED_F); SetBit(state.speed_status, SPEED_NED_F);
sw/airborne/subsystems/ahrs/ahrs_gx3.c
+1 -1
View File
@@ -266,7 +266,7 @@ void gx3_packet_read_message(void)
// Attitude // Attitude
struct FloatRMat ltp_to_body_rmat; struct FloatRMat ltp_to_body_rmat;
FLOAT_RMAT_COMP(ltp_to_body_rmat, ahrs_gx3.rmat, *body_to_imu_rmat); float_rmat_comp(ltp_to_body_rmat, ahrs_gx3.rmat, *body_to_imu_rmat);
#if AHRS_USE_GPS_HEADING && USE_GPS #if AHRS_USE_GPS_HEADING && USE_GPS
struct FloatEulers ltp_to_body_eulers; struct FloatEulers ltp_to_body_eulers;