diff --git a/sw/airborne/airspeed_ets.c b/sw/airborne/airspeed_ets.c index ed4b0fd787..71a9312ef0 100644 --- a/sw/airborne/airspeed_ets.c +++ b/sw/airborne/airspeed_ets.c @@ -37,7 +37,7 @@ #include "airspeed_ets.h" #include "i2c.h" #include "nav.h" -#include +#include "math.h" #ifdef SITL #include "gps.h" diff --git a/sw/airborne/arch/sim/jsbsim_gps.c b/sw/airborne/arch/sim/jsbsim_gps.c index 60bcdb658f..af58c7eb47 100644 --- a/sw/airborne/arch/sim/jsbsim_gps.c +++ b/sw/airborne/arch/sim/jsbsim_gps.c @@ -1,7 +1,7 @@ /* OCaml binding to link the simulator to autopilot functions. */ #include -#include +#include "math.h" #include /** From airborne/autopilot/ */ diff --git a/sw/airborne/arch/sim/jsbsim_ir.c b/sw/airborne/arch/sim/jsbsim_ir.c index 579caf645c..ca3e8c55fb 100644 --- a/sw/airborne/arch/sim/jsbsim_ir.c +++ b/sw/airborne/arch/sim/jsbsim_ir.c @@ -6,7 +6,7 @@ #include "jsbsim_hw.h" -#include +#include "math.h" #ifndef JSBSIM_IR_ROLL_NEUTRAL #define JSBSIM_IR_ROLL_NEUTRAL 0. diff --git a/sw/airborne/arch/sim/sim_gps.c b/sw/airborne/arch/sim/sim_gps.c index 0887176e2d..7a4160e8b5 100644 --- a/sw/airborne/arch/sim/sim_gps.c +++ b/sw/airborne/arch/sim/sim_gps.c @@ -1,7 +1,7 @@ /* OCaml binding to link the simulator to autopilot functions. */ #include -#include +#include "math.h" #include /** From airborne/autopilot/ */ diff --git a/sw/airborne/baro_ets.c b/sw/airborne/baro_ets.c index 04902994e4..7d74971b55 100644 --- a/sw/airborne/baro_ets.c +++ b/sw/airborne/baro_ets.c @@ -37,7 +37,7 @@ #include "baro_ets.h" #include "i2c.h" -#include +#include "math.h" #ifdef SITL #include "gps.h" diff --git a/sw/airborne/beth/overo_estimator.c b/sw/airborne/beth/overo_estimator.c index b74f96735d..db0680f164 100644 --- a/sw/airborne/beth/overo_estimator.c +++ b/sw/airborne/beth/overo_estimator.c @@ -1,7 +1,7 @@ #include "overo_estimator.h" #include "subsystems/imu.h" -#include +#include "math.h" #include "messages2.h" #include "overo_gcs_com.h" diff --git a/sw/airborne/booz/booz2_datalink.c b/sw/airborne/booz/booz2_datalink.c index a868772946..d52ba3dc86 100644 --- a/sw/airborne/booz/booz2_datalink.c +++ b/sw/airborne/booz/booz2_datalink.c @@ -40,7 +40,7 @@ #include "firmwares/rotorcraft/navigation.h" -#include +#include "math/pprz_geodetic_int.h" #include "firmwares/rotorcraft/ins.h" #define IdOfMsg(x) (x[1]) diff --git a/sw/airborne/booz/booz_gps.h b/sw/airborne/booz/booz_gps.h index e1b10bbe12..52d136df53 100644 --- a/sw/airborne/booz/booz_gps.h +++ b/sw/airborne/booz/booz_gps.h @@ -25,7 +25,7 @@ #define BOOZ2_GPS_H #include "std.h" -#include +#include "math/pprz_geodetic_int.h" #include "uart.h" struct Booz_gps_state { diff --git a/sw/airborne/booz/test/test_mlkf.c b/sw/airborne/booz/test/test_mlkf.c index 45c830f800..c74e6842e0 100644 --- a/sw/airborne/booz/test/test_mlkf.c +++ b/sw/airborne/booz/test/test_mlkf.c @@ -1,7 +1,7 @@ #include #include -#include +#include "math/pprz_algebra_double.h" #include "subsystems/imu.h" #include "subsystems/ahrs.h" #include "ahrs/ahrs_mlkf.h" diff --git a/sw/airborne/booz/test/test_scaling.c b/sw/airborne/booz/test/test_scaling.c index f589b449eb..d8fa977093 100644 --- a/sw/airborne/booz/test/test_scaling.c +++ b/sw/airborne/booz/test/test_scaling.c @@ -22,10 +22,10 @@ */ #include -#include +#include "math.h" #include -#include +#include "math/pprz_algebra_int.h" #define IMU_ACCEL_X_NEUTRAL 32081 #define IMU_ACCEL_X_SENS -2.50411474 diff --git a/sw/airborne/csc/csc_autopilot.c b/sw/airborne/csc/csc_autopilot.c index 9a012d62a4..4cb5e3da61 100644 --- a/sw/airborne/csc/csc_autopilot.c +++ b/sw/airborne/csc/csc_autopilot.c @@ -26,12 +26,12 @@ #include "csc_autopilot.h" #include -#include +#include "math.h" #include "commands.h" #include "csc_xsens.h" #include "led.h" -#include +#include "math/pprz_algebra_float.h" #include "string.h" #include "subsystems/radio_control.h" #include "pwm_input.h" diff --git a/sw/airborne/csc/csc_autopilot.h b/sw/airborne/csc/csc_autopilot.h index 0098195b2a..52f4d0df3f 100644 --- a/sw/airborne/csc/csc_autopilot.h +++ b/sw/airborne/csc/csc_autopilot.h @@ -27,8 +27,8 @@ #include "types.h" #include "std.h" -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_geodetic_int.h" struct control_gains { float pitch_kp; diff --git a/sw/airborne/csc/csc_main.c b/sw/airborne/csc/csc_main.c index f8175f7ce0..e9801608de 100644 --- a/sw/airborne/csc/csc_main.c +++ b/sw/airborne/csc/csc_main.c @@ -57,7 +57,7 @@ static uint32_t can_msg_count = 0; // gps stuff stolen from antoine's code #include "booz/booz2_gps.h" -#include +#include "math/pprz_geodetic_int.h" struct LtpDef_i booz_ins_ltp_def; bool_t booz_ins_ltp_initialised; diff --git a/sw/airborne/csc/csc_xsens.c b/sw/airborne/csc/csc_xsens.c index 07a489e656..0fcf28637a 100644 --- a/sw/airborne/csc/csc_xsens.c +++ b/sw/airborne/csc/csc_xsens.c @@ -36,7 +36,7 @@ #include "messages.h" #include "uart.h" //#include "com_stats.h" -#include +#include "math/pprz_algebra_float.h" #include "string.h" void parse_xsens_msg(uint8_t xsens_id, uint8_t c ); diff --git a/sw/airborne/csc/csc_xsens.h b/sw/airborne/csc/csc_xsens.h index c0e69f74c3..f786965c08 100644 --- a/sw/airborne/csc/csc_xsens.h +++ b/sw/airborne/csc/csc_xsens.h @@ -26,7 +26,7 @@ #define __CSC_XSENS_H__ #include "types.h" -#include +#include "math/pprz_algebra_float.h" #define XSENS_COUNT 1 diff --git a/sw/airborne/csc/mercury_ap.c b/sw/airborne/csc/mercury_ap.c index a5350dbe86..ead159baa5 100644 --- a/sw/airborne/csc/mercury_ap.c +++ b/sw/airborne/csc/mercury_ap.c @@ -30,7 +30,7 @@ #include "firmwares/rotorcraft/stabilization.h" #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h" #include "led.h" -#include +#include "math/pprz_algebra_float.h" #include "string.h" #include "subsystems/radio_control.h" #include "mercury_supervision.h" diff --git a/sw/airborne/csc/mercury_xsens.c b/sw/airborne/csc/mercury_xsens.c index bd8d12a39b..a42582568d 100644 --- a/sw/airborne/csc/mercury_xsens.c +++ b/sw/airborne/csc/mercury_xsens.c @@ -41,7 +41,7 @@ #include "messages.h" #include "uart.h" //#include "com_stats.h" -#include +#include "math/pprz_algebra_float.h" #include "string.h" void parse_xsens_msg(uint8_t xsens_id, uint8_t c ); diff --git a/sw/airborne/estimator.c b/sw/airborne/estimator.c index ca25719e44..e32b4ddcdd 100644 --- a/sw/airborne/estimator.c +++ b/sw/airborne/estimator.c @@ -27,7 +27,7 @@ */ #include -#include +#include "math.h" #include "estimator.h" #include "uart.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h index c78d79e882..3ca5cab494 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h @@ -25,7 +25,7 @@ #define GUIDANCE_H_H -#include +#include "math/pprz_algebra_int.h" #include "firmwares/rotorcraft/guidance/guidance_h_ref.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h index d15d44d271..6861767740 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h @@ -26,8 +26,8 @@ #include "airframe.h" #include "inttypes.h" -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_int.h" /* update frequency */ #define B2_GH_FREQ_FRAC 9 diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c index 2a852a58f5..7fca3fe101 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c @@ -33,7 +33,7 @@ #include "firmwares/rotorcraft/navigation.h" #include "firmwares/rotorcraft/ins.h" -#include +#include "math/pprz_algebra_int.h" #include "airframe.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h index 44fb867bfa..dba603bddb 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h @@ -26,8 +26,8 @@ #include "airframe.h" #include "inttypes.h" -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_int.h" /* update frequency */ #define GV_FREQ_FRAC 9 diff --git a/sw/airborne/firmwares/rotorcraft/ins.c b/sw/airborne/firmwares/rotorcraft/ins.c index ba97a70910..271197e77f 100644 --- a/sw/airborne/firmwares/rotorcraft/ins.c +++ b/sw/airborne/firmwares/rotorcraft/ins.c @@ -29,8 +29,8 @@ #include "booz_gps.h" #include "airframe.h" -#include -#include +#include "math/pprz_algebra_int.h" +#include "math/pprz_algebra_float.h" #include "subsystems/ahrs.h" @@ -52,7 +52,7 @@ #endif -#include +#include "math/pprz_geodetic_int.h" #include "flight_plan.h" diff --git a/sw/airborne/firmwares/rotorcraft/ins.h b/sw/airborne/firmwares/rotorcraft/ins.h index 22e30b9c6d..9296453cf7 100644 --- a/sw/airborne/firmwares/rotorcraft/ins.h +++ b/sw/airborne/firmwares/rotorcraft/ins.h @@ -25,8 +25,8 @@ #define INS_H #include "std.h" -#include -#include +#include "math/pprz_geodetic_int.h" +#include "math/pprz_algebra_float.h" /* gps transformed to LTP-NED */ extern struct LtpDef_i ins_ltp_def; diff --git a/sw/airborne/firmwares/rotorcraft/ins/hf_float.h b/sw/airborne/firmwares/rotorcraft/ins/hf_float.h index 9e52dd267c..897737dde2 100644 --- a/sw/airborne/firmwares/rotorcraft/ins/hf_float.h +++ b/sw/airborne/firmwares/rotorcraft/ins/hf_float.h @@ -25,7 +25,7 @@ #define HF_FLOAT_H #include "std.h" -#include +#include "math/pprz_algebra_float.h" #define HFF_STATE_SIZE 2 diff --git a/sw/airborne/firmwares/rotorcraft/navigation.c b/sw/airborne/firmwares/rotorcraft/navigation.c index c79ce75ab0..4a537d24b6 100644 --- a/sw/airborne/firmwares/rotorcraft/navigation.c +++ b/sw/airborne/firmwares/rotorcraft/navigation.c @@ -33,7 +33,7 @@ #include "modules.h" #include "flight_plan.h" -#include +#include "math/pprz_algebra_int.h" const uint8_t nb_waypoint = NB_WAYPOINT; struct EnuCoor_f waypoints_float[NB_WAYPOINT] = WAYPOINTS; diff --git a/sw/airborne/firmwares/rotorcraft/navigation.h b/sw/airborne/firmwares/rotorcraft/navigation.h index 21781fe5e9..dff7396961 100644 --- a/sw/airborne/firmwares/rotorcraft/navigation.h +++ b/sw/airborne/firmwares/rotorcraft/navigation.h @@ -25,8 +25,8 @@ #define NAVIGATION_H #include "std.h" -#include -#include +#include "math/pprz_geodetic_int.h" +#include "math/pprz_geodetic_float.h" #define NAV_FREQ 16 // FIXME use periodic FREQ diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c index 6651dba296..f9b4de4465 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c @@ -23,7 +23,7 @@ #include "firmwares/rotorcraft/stabilization.h" -#include +#include "math/pprz_algebra_float.h" #include "subsystems/ahrs.h" #include "subsystems/radio_control.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h index bd9615deb6..fe8cb92a89 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h @@ -24,7 +24,7 @@ #ifndef STABILIZATION_ATTITUDE_FLOAT_H #define STABILIZATION_ATTITUDE_FLOAT_H -#include +#include "math/pprz_algebra_float.h" #include "airframe.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h index ca3baf2654..cd6d1db2a3 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h @@ -24,7 +24,7 @@ #ifndef STABILIZATION_ATTITUDE_INT_H #define STABILIZATION_ATTITUDE_INT_H -#include +#include "math/pprz_algebra_int.h" #include "airframe.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c index d9c676005b..8502f26e2d 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c @@ -28,8 +28,8 @@ #include "firmwares/rotorcraft/stabilization.h" #include -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_algebra_int.h" #include "subsystems/ahrs.h" #include "airframe.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h index 0763a9f313..3808c9aaea 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h @@ -25,7 +25,7 @@ #define STABILIZATION_ATTITUDE_FLOAT_REF_EULER_FLOAT_H #include "subsystems/radio_control.h" -#include +#include "math/pprz_algebra_float.h" #include "stabilization_attitude_ref_float.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h index 515f532e04..f3bfa3f69c 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h @@ -26,7 +26,7 @@ #include "firmwares/rotorcraft/stabilization.h" #include "subsystems/radio_control.h" -#include +#include "math/pprz_algebra_float.h" #include "stabilization_attitude_ref_float.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h index c1b0c8786d..741b3c4fb0 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h @@ -24,7 +24,7 @@ #ifndef STABILIZATION_RATE #define STABILIZATION_RATE -#include +#include "math/pprz_algebra_int.h" extern void stabilization_rate_init(void); extern void stabilization_rate_read_rc(void); diff --git a/sw/airborne/fms/fms_autopilot_msg.h b/sw/airborne/fms/fms_autopilot_msg.h index 70e98cad50..b504d8e01f 100644 --- a/sw/airborne/fms/fms_autopilot_msg.h +++ b/sw/airborne/fms/fms_autopilot_msg.h @@ -2,8 +2,8 @@ #define FMS_AUTOPILOT_H #include -#include -#include +#include "math/pprz_algebra_int.h" +#include "math/pprz_geodetic_int.h" #include "airframe.h" //#include "adc.h" #define NB_ADC 8 diff --git a/sw/airborne/fms/libeknav/estimate_attitude.h b/sw/airborne/fms/libeknav/estimate_attitude.h index ac2756299d..0f6a518cc0 100644 --- a/sw/airborne/fms/libeknav/estimate_attitude.h +++ b/sw/airborne/fms/libeknav/estimate_attitude.h @@ -2,7 +2,7 @@ #define ESTIMATE_ATTITUDE_H /* for sqrt */ -#include +#include "math.h" #include "paparazzi_eigen_conversion.h" #include "../../math/pprz_algebra.h" diff --git a/sw/airborne/fms/libeknav/libeknav_from_log.hpp b/sw/airborne/fms/libeknav/libeknav_from_log.hpp index 34342d0dd0..0614f26e7b 100644 --- a/sw/airborne/fms/libeknav/libeknav_from_log.hpp +++ b/sw/airborne/fms/libeknav/libeknav_from_log.hpp @@ -17,13 +17,13 @@ //#include -#include -#include -#include -#include -#include -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_geodetic.h" +#include "math/pprz_geodetic_int.h" +#include "math/pprz_geodetic_float.h" +#include "math/pprz_geodetic_double.h" +#include "math.h" #include #include @@ -53,7 +53,7 @@ /** baro-sensor **/ // I only want the function -#define NPS_SENSORS_PARAMS +#define NPS_SENSORS_PARAMS "math.h" // Params taken from trunk/conf/simulator/nps/nps_sensors_params_booz2_a1.h #define NPS_BARO_QNH 900. #define NPS_BARO_SENSITIVITY 17.066667 diff --git a/sw/airborne/fms/libeknav/raw_log.h b/sw/airborne/fms/libeknav/raw_log.h index 97756bfae2..ede3924220 100644 --- a/sw/airborne/fms/libeknav/raw_log.h +++ b/sw/airborne/fms/libeknav/raw_log.h @@ -1,7 +1,7 @@ #ifndef LIBEKNAV_RAW_LOG_H #define LIBEKNAV_RAW_LOG_H -#include +#include "math/pprz_algebra_float.h" struct __attribute__ ((packed)) raw_log_entry{ float time; diff --git a/sw/airborne/fms/libeknav/test_libeknav_3.cpp b/sw/airborne/fms/libeknav/test_libeknav_3.cpp index e765165c6d..d3cf007793 100644 --- a/sw/airborne/fms/libeknav/test_libeknav_3.cpp +++ b/sw/airborne/fms/libeknav/test_libeknav_3.cpp @@ -29,7 +29,7 @@ static void main_trick_libevent(void); static void on_foo_event(int fd, short event __attribute__((unused)), void *arg); static struct event foo_event; -#include +#include "math/pprz_algebra_float.h" static void main_rawlog_init(const char* filename); static void main_rawlog_dump(void); diff --git a/sw/airborne/fms/libeknav/test_libeknav_4.hpp b/sw/airborne/fms/libeknav/test_libeknav_4.hpp index 6ee984cd07..f364ae9dd1 100644 --- a/sw/airborne/fms/libeknav/test_libeknav_4.hpp +++ b/sw/airborne/fms/libeknav/test_libeknav_4.hpp @@ -26,12 +26,12 @@ extern "C" { static int raw_log_fd; } -#include -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_geodetic.h" #include "math/pprz_geodetic_float.c" #include "math/pprz_geodetic_double.c" -#include +#include "math.h" /* constants */ diff --git a/sw/airborne/gps_nmea.c b/sw/airborne/gps_nmea.c index 8c8df2b3dd..f010c0f35b 100644 --- a/sw/airborne/gps_nmea.c +++ b/sw/airborne/gps_nmea.c @@ -35,7 +35,7 @@ #include #include -#include +#include "math.h" #ifdef LINUX // do debug-output if run on the linux-target #include diff --git a/sw/airborne/gps_ubx.c b/sw/airborne/gps_ubx.c index 68543b421a..8067161451 100644 --- a/sw/airborne/gps_ubx.c +++ b/sw/airborne/gps_ubx.c @@ -28,7 +28,7 @@ #include #include -#include +#include "math.h" #ifdef FMS_PERIODIC_FREQ //for printf diff --git a/sw/airborne/latlong.c b/sw/airborne/latlong.c index 2d8da47ac0..84cc6a7a44 100644 --- a/sw/airborne/latlong.c +++ b/sw/airborne/latlong.c @@ -1,7 +1,7 @@ /** c.f. sw/lib/ocaml/latlong.ml */ #include -#include +#include "math.h" #include "std.h" #include "latlong.h" #include "led.h" diff --git a/sw/airborne/lisa/test/lisa_test_hmc5843.c b/sw/airborne/lisa/test/lisa_test_hmc5843.c index 2cf06c4c53..1ba1ed2763 100644 --- a/sw/airborne/lisa/test/lisa_test_hmc5843.c +++ b/sw/airborne/lisa/test/lisa_test_hmc5843.c @@ -35,7 +35,7 @@ #include "peripherals/hmc5843.h" #include "my_debug_servo.h" -#include +#include "math/pprz_algebra_int.h" static inline void main_init( void ); static inline void main_periodic_task( void ); diff --git a/sw/airborne/lisa/test/lisa_test_itg3200.c b/sw/airborne/lisa/test/lisa_test_itg3200.c index f27952001e..47223219b7 100644 --- a/sw/airborne/lisa/test/lisa_test_itg3200.c +++ b/sw/airborne/lisa/test/lisa_test_itg3200.c @@ -32,7 +32,7 @@ #include "sys_time.h" #include "downlink.h" #include "std.h" -#include +#include "math/pprz_algebra_int.h" #include "peripherals/itg3200.h" #include "my_debug_servo.h" diff --git a/sw/airborne/lisa/test_float.c b/sw/airborne/lisa/test_float.c index aa6b5ca388..d24c3b6425 100644 --- a/sw/airborne/lisa/test_float.c +++ b/sw/airborne/lisa/test_float.c @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "math.h" #include BOARD_CONFIG #include "init_hw.h" diff --git a/sw/airborne/main_ap.c b/sw/airborne/main_ap.c index ef028ed848..701a5a5260 100644 --- a/sw/airborne/main_ap.c +++ b/sw/airborne/main_ap.c @@ -31,7 +31,7 @@ #define MODULES_C -#include +#include "math.h" #include "main_ap.h" diff --git a/sw/airborne/math/pprz_algebra_float.h b/sw/airborne/math/pprz_algebra_float.h index 7286c62f3d..1d08e37b8e 100644 --- a/sw/airborne/math/pprz_algebra_float.h +++ b/sw/airborne/math/pprz_algebra_float.h @@ -27,7 +27,7 @@ #include "pprz_algebra.h" -#include +#include "math.h" #include // for FLT_MIN struct FloatVect2 { diff --git a/sw/airborne/math/pprz_algebra_int.h b/sw/airborne/math/pprz_algebra_int.h index 32aed62e06..dfff54d18c 100644 --- a/sw/airborne/math/pprz_algebra_int.h +++ b/sw/airborne/math/pprz_algebra_int.h @@ -27,8 +27,8 @@ #include "std.h" -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_trig_int.h" #include struct Uint16Vect3 { diff --git a/sw/airborne/math/pprz_geodetic_double.c b/sw/airborne/math/pprz_geodetic_double.c index 4c2e1f64dd..c11b95243f 100644 --- a/sw/airborne/math/pprz_geodetic_double.c +++ b/sw/airborne/math/pprz_geodetic_double.c @@ -1,6 +1,6 @@ #include "pprz_geodetic_double.h" -#include +#include "math.h" void ltp_def_from_ecef_d(struct LtpDef_d* def, struct EcefCoor_d* ecef) { diff --git a/sw/airborne/math/pprz_geodetic_float.c b/sw/airborne/math/pprz_geodetic_float.c index 0df4c4f4a0..f3babd17de 100644 --- a/sw/airborne/math/pprz_geodetic_float.c +++ b/sw/airborne/math/pprz_geodetic_float.c @@ -1,7 +1,7 @@ #include "pprz_geodetic_float.h" #include "pprz_algebra_float.h" -#include +#include "math.h" void ltp_def_from_ecef_f(struct LtpDef_f* def, struct EcefCoor_f* ecef) { diff --git a/sw/airborne/math/pprz_simple_matrix.h b/sw/airborne/math/pprz_simple_matrix.h index 83427de1f0..215c483549 100644 --- a/sw/airborne/math/pprz_simple_matrix.h +++ b/sw/airborne/math/pprz_simple_matrix.h @@ -2,7 +2,7 @@ #define PPRZ_SIMPLE_MATRIX_H #include /* for FLT_EPSILON */ -#include +#include "math.h" #ifdef HAVE_STDIO #include /* for printf'ing warnings */ #define warn_message printf diff --git a/sw/airborne/math/pprz_trig_int.h b/sw/airborne/math/pprz_trig_int.h index 79c7ac96a0..354e07911b 100644 --- a/sw/airborne/math/pprz_trig_int.h +++ b/sw/airborne/math/pprz_trig_int.h @@ -25,7 +25,7 @@ #define PPRZ_TRIG_INT_H #include "std.h" -#include +#include "math/pprz_algebra_int.h" /* Allow makefile to define BOOZ_TRIG_CONST in case we want to make the trig tables const and store them in flash. diff --git a/sw/airborne/modules/cam_control/cam.c b/sw/airborne/modules/cam_control/cam.c index 56cd07a5b7..dfa36bdd19 100644 --- a/sw/airborne/modules/cam_control/cam.c +++ b/sw/airborne/modules/cam_control/cam.c @@ -26,7 +26,7 @@ * */ -#include +#include "math.h" #include "cam.h" #include "common_nav.h" #include "autopilot.h" diff --git a/sw/airborne/modules/cam_control/cam_roll.c b/sw/airborne/modules/cam_control/cam_roll.c index feab0bf050..9775637db2 100644 --- a/sw/airborne/modules/cam_control/cam_roll.c +++ b/sw/airborne/modules/cam_control/cam_roll.c @@ -26,7 +26,7 @@ * */ -#include +#include "math.h" #include "cam.h" #include "nav.h" #include "autopilot.h" diff --git a/sw/airborne/modules/cam_control/cam_track.h b/sw/airborne/modules/cam_control/cam_track.h index e703ce0f4a..5976485e24 100644 --- a/sw/airborne/modules/cam_control/cam_track.h +++ b/sw/airborne/modules/cam_control/cam_track.h @@ -31,7 +31,7 @@ #define CAM_TRACK_H #include -#include +#include "math/pprz_algebra_float.h" extern struct FloatVect3 target_pos_ned; extern struct FloatVect3 target_speed_ned; diff --git a/sw/airborne/modules/cam_control/point.c b/sw/airborne/modules/cam_control/point.c index 5e13c9abc5..e552f896b4 100644 --- a/sw/airborne/modules/cam_control/point.c +++ b/sw/airborne/modules/cam_control/point.c @@ -71,7 +71,7 @@ * */ -#include +#include "math.h" #include "point.h" typedef struct { diff --git a/sw/airborne/modules/ins/ins_vn100.h b/sw/airborne/modules/ins/ins_vn100.h index 9266484faa..1319a0a070 100644 --- a/sw/airborne/modules/ins/ins_vn100.h +++ b/sw/airborne/modules/ins/ins_vn100.h @@ -33,7 +33,7 @@ #include "std.h" #include "VN100.h" -#include +#include "math/pprz_algebra_float.h" /* state */ extern struct FloatEulers ins_eulers; diff --git a/sw/airborne/modules/multi/formation.c b/sw/airborne/modules/multi/formation.c index 90ebb6cf97..fc925025f4 100644 --- a/sw/airborne/modules/multi/formation.c +++ b/sw/airborne/modules/multi/formation.c @@ -4,7 +4,7 @@ #define FORMATION_C -#include +#include "math.h" #ifndef DOWNLINK_DEVICE #define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE diff --git a/sw/airborne/modules/multi/potential.c b/sw/airborne/modules/multi/potential.c index bebec53abb..32722c0f65 100644 --- a/sw/airborne/modules/multi/potential.c +++ b/sw/airborne/modules/multi/potential.c @@ -3,7 +3,7 @@ #define POTENTIAL_C -#include +#include "math.h" #ifndef DOWNLINK_DEVICE #define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE diff --git a/sw/airborne/modules/sensors/airspeed_ets.c b/sw/airborne/modules/sensors/airspeed_ets.c index 29939da85e..1fceb04675 100644 --- a/sw/airborne/modules/sensors/airspeed_ets.c +++ b/sw/airborne/modules/sensors/airspeed_ets.c @@ -36,7 +36,7 @@ */ #include "sensors/airspeed_ets.h" #include "estimator.h" -#include +#include "math.h" #define AIRSPEED_ETS_ADDR 0xEA #ifndef AIRSPEED_ETS_SCALE diff --git a/sw/airborne/modules/sensors/baro_ets.c b/sw/airborne/modules/sensors/baro_ets.c index 0d3064b11e..3b8ffdd4f1 100644 --- a/sw/airborne/modules/sensors/baro_ets.c +++ b/sw/airborne/modules/sensors/baro_ets.c @@ -38,7 +38,7 @@ #include "sensors/baro_ets.h" #include "i2c.h" #include "estimator.h" -#include +#include "math.h" #ifdef SITL #include "gps.h" diff --git a/sw/airborne/modules/vehicle_interface/vi.h b/sw/airborne/modules/vehicle_interface/vi.h index 0ae7715688..3b0bd27d92 100644 --- a/sw/airborne/modules/vehicle_interface/vi.h +++ b/sw/airborne/modules/vehicle_interface/vi.h @@ -29,7 +29,7 @@ #define VEHICLE_INTERFACE_H #include "std.h" -#include +#include "math/pprz_algebra_int.h" #include "firmwares/rotorcraft/autopilot.h" #include "firmwares/rotorcraft/stabilization.h" #include "firmwares/rotorcraft/guidance.h" diff --git a/sw/airborne/modules/vehicle_interface/vi_datalink.h b/sw/airborne/modules/vehicle_interface/vi_datalink.h index 77dffeac40..47cc5dc46e 100644 --- a/sw/airborne/modules/vehicle_interface/vi_datalink.h +++ b/sw/airborne/modules/vehicle_interface/vi_datalink.h @@ -26,7 +26,7 @@ #include "std.h" #include "modules/vehicle_interface/vi.h" -#include +#include "math/pprz_algebra_int.h" #ifndef VI_MAX_H_SPEED #define VI_MAX_H_SPEED 4. diff --git a/sw/airborne/modules/vehicle_interface/vi_overo_link.h b/sw/airborne/modules/vehicle_interface/vi_overo_link.h index 51dab45d4f..8ec10d6b41 100644 --- a/sw/airborne/modules/vehicle_interface/vi_overo_link.h +++ b/sw/airborne/modules/vehicle_interface/vi_overo_link.h @@ -26,7 +26,7 @@ #include "std.h" #include "modules/vehicle_interface/vi.h" -#include +#include "math/pprz_algebra_int.h" #include "lisa/lisa_overo_link.h" #define ViOveroLinkEvent() { \ diff --git a/sw/airborne/modules/vehicle_interface/vi_test_signal.c b/sw/airborne/modules/vehicle_interface/vi_test_signal.c index 1a03a59ffb..f266ffc0a4 100644 --- a/sw/airborne/modules/vehicle_interface/vi_test_signal.c +++ b/sw/airborne/modules/vehicle_interface/vi_test_signal.c @@ -24,7 +24,7 @@ #include "booz_fms.h" #include "firmwares/rotorcraft/ins.h" -#include +#include "math/pprz_algebra_int.h" #define FMS_TEST_SIGNAL_DEFAULT_MODE STEP_YAW #define FMS_TEST_SIGNAL_DEFAULT_PERIOD 40 diff --git a/sw/airborne/nav.c b/sw/airborne/nav.c index 81667148e8..db5525c803 100644 --- a/sw/airborne/nav.c +++ b/sw/airborne/nav.c @@ -28,7 +28,7 @@ #define NAV_C -#include +#include "math.h" #include "nav.h" #include "gps.h" diff --git a/sw/airborne/snav.c b/sw/airborne/snav.c index 0170bdb167..02027b1065 100644 --- a/sw/airborne/snav.c +++ b/sw/airborne/snav.c @@ -1,7 +1,7 @@ /* Smooth navigation to wp_a along an arc (around wp_cd), a segment (from wp_rd to wp_ta) and a second arc (around wp_ca) */ -#include +#include "math.h" #include "airframe.h" #include "snav.h" #include "estimator.h" diff --git a/sw/airborne/subsystems/ahrs.h b/sw/airborne/subsystems/ahrs.h index 199d46b22b..08f9f4f5e2 100644 --- a/sw/airborne/subsystems/ahrs.h +++ b/sw/airborne/subsystems/ahrs.h @@ -25,8 +25,8 @@ #define AHRS_H #include "std.h" -#include -#include +#include "math/pprz_algebra_int.h" +#include "math/pprz_algebra_float.h" #include "subsystems/ahrs/ahrs_aligner.h" #define AHRS_UNINIT 0 diff --git a/sw/airborne/subsystems/ahrs/ahrs_aligner.h b/sw/airborne/subsystems/ahrs/ahrs_aligner.h index ff791b02bc..5d024ca088 100644 --- a/sw/airborne/subsystems/ahrs/ahrs_aligner.h +++ b/sw/airborne/subsystems/ahrs/ahrs_aligner.h @@ -25,7 +25,7 @@ #define AHRS_ALIGNER_H #include "std.h" -#include +#include "math/pprz_algebra_int.h" #define AHRS_ALIGNER_UNINIT 0 #define AHRS_ALIGNER_RUNNING 1 diff --git a/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.c b/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.c index 8612c94b00..33273aa3a0 100644 --- a/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.c +++ b/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.c @@ -27,8 +27,8 @@ #include "subsystems/ahrs/ahrs_aligner.h" #include "airframe.h" -#include -#include +#include "math/pprz_trig_int.h" +#include "math/pprz_algebra_int.h" struct Int32Rates face_gyro_bias; diff --git a/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.h b/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.h index f06dffab69..57c9aeb0d2 100644 --- a/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.h +++ b/sw/airborne/subsystems/ahrs/ahrs_cmpl_euler.h @@ -26,7 +26,7 @@ #include "subsystems/ahrs.h" #include "std.h" -#include +#include "math/pprz_algebra_int.h" extern struct Int32Rates face_gyro_bias; extern struct Int32Eulers face_measure; diff --git a/sw/airborne/subsystems/ahrs/ahrs_float_ekf.c b/sw/airborne/subsystems/ahrs/ahrs_float_ekf.c index c2fb02803c..314e2e67f4 100644 --- a/sw/airborne/subsystems/ahrs/ahrs_float_ekf.c +++ b/sw/airborne/subsystems/ahrs/ahrs_float_ekf.c @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "math/pprz_algebra_float.h" /* our estimated attitude */ struct FloatQuat bafe_quat; diff --git a/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c b/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c index c010bc1c04..d0bb10a281 100644 --- a/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c +++ b/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c @@ -28,7 +28,7 @@ #include "subsystems/ahrs/ahrs_aligner.h" #include "airframe.h" -#include +#include "math/pprz_algebra_float.h" #include diff --git a/sw/airborne/subsystems/ahrs/ahrs_float_lkf.h b/sw/airborne/subsystems/ahrs/ahrs_float_lkf.h index a112a05464..d3961cd7b9 100644 --- a/sw/airborne/subsystems/ahrs/ahrs_float_lkf.h +++ b/sw/airborne/subsystems/ahrs/ahrs_float_lkf.h @@ -27,7 +27,7 @@ #include "subsystems/ahrs.h" #include "std.h" -#include +#include "math/pprz_algebra_int.h" extern struct FloatQuat bafl_quat; extern struct FloatRates bafl_bias; diff --git a/sw/airborne/subsystems/imu.h b/sw/airborne/subsystems/imu.h index be2bbf129e..45f0dc2ad9 100644 --- a/sw/airborne/subsystems/imu.h +++ b/sw/airborne/subsystems/imu.h @@ -24,8 +24,8 @@ #ifndef IMU_H #define IMU_H -#include -#include +#include "math/pprz_algebra_int.h" +#include "math/pprz_algebra_float.h" /* must be defined by underlying hardware */ extern void imu_impl_init(void); diff --git a/sw/airborne/test/peripherals/test_ami601.c b/sw/airborne/test/peripherals/test_ami601.c index f86a855991..6011d4549b 100644 --- a/sw/airborne/test/peripherals/test_ami601.c +++ b/sw/airborne/test/peripherals/test_ami601.c @@ -33,7 +33,7 @@ #include "i2c.h" #include "peripherals/ami601.h" -#include +#include "math/pprz_algebra_int.h" #include "interrupt_hw.h" #include "std.h" diff --git a/sw/airborne/test/test_algebra.c b/sw/airborne/test/test_algebra.c index dfdb069b5a..eb590b2f98 100644 --- a/sw/airborne/test/test_algebra.c +++ b/sw/airborne/test/test_algebra.c @@ -1,12 +1,12 @@ #include #include -#include +#include "math.h" #include "std.h" -#include -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_int.h" #include "pprz_algebra_print.h" static void test_1(void); diff --git a/sw/airborne/test/test_bla.c b/sw/airborne/test/test_bla.c index aea06f0c14..0852885134 100644 --- a/sw/airborne/test/test_bla.c +++ b/sw/airborne/test/test_bla.c @@ -3,13 +3,13 @@ #include #include -#include +#include "math.h" #include "std.h" -#include -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_int.h" #include "pprz_algebra_print.h" diff --git a/sw/airborne/test/test_geodetic.c b/sw/airborne/test/test_geodetic.c index 8d49978c5f..17d5705f2c 100644 --- a/sw/airborne/test/test_geodetic.c +++ b/sw/airborne/test/test_geodetic.c @@ -4,14 +4,14 @@ #include #include -#include +#include "math.h" #include "std.h" -#include -#include -#include -#include +#include "math/pprz_algebra_float.h" +#include "math/pprz_geodetic_double.h" +#include "math/pprz_geodetic_float.h" +#include "math/pprz_geodetic_int.h" //#define DEBUG 1 diff --git a/sw/airborne/test/test_matrix.c b/sw/airborne/test/test_matrix.c index c499ec0db3..1fe3728700 100644 --- a/sw/airborne/test/test_matrix.c +++ b/sw/airborne/test/test_matrix.c @@ -1,6 +1,6 @@ -#include +#include "math/pprz_simple_matrix.h" #include "pprz_simple_matrix_print.h" diff --git a/sw/airborne/vor/i86_vor_test_filters.c b/sw/airborne/vor/i86_vor_test_filters.c index 60374a2930..fb04bc2c27 100644 --- a/sw/airborne/vor/i86_vor_test_filters.c +++ b/sw/airborne/vor/i86_vor_test_filters.c @@ -1,4 +1,4 @@ -#include +#include "math.h" #include #include #include diff --git a/sw/airborne/vor/vor_float_demod.c b/sw/airborne/vor/vor_float_demod.c index 8beeebbf6e..04f596fdd8 100644 --- a/sw/airborne/vor/vor_float_demod.c +++ b/sw/airborne/vor/vor_float_demod.c @@ -1,7 +1,7 @@ #include "vor_float_demod.h" #include -#include +#include "math.h" #include "vor_float_filters.h" diff --git a/sw/airborne/vor/vor_int_demod.c b/sw/airborne/vor/vor_int_demod.c index f4d3dd200f..e2859cffac 100644 --- a/sw/airborne/vor/vor_int_demod.c +++ b/sw/airborne/vor/vor_int_demod.c @@ -34,7 +34,7 @@ #include "vor_int_demod.h" -#include +#include "math.h" #include "vor_int_filters.h" diff --git a/sw/ground_segment/cockpit/actuators.c b/sw/ground_segment/cockpit/actuators.c index 957a8a52da..59e2fa7516 100644 --- a/sw/ground_segment/cockpit/actuators.c +++ b/sw/ground_segment/cockpit/actuators.c @@ -1,13 +1,13 @@ #include #include -#include +#include "math.h" #include #include #include #include -#include +#include "math.h" gint ac_id = 42; GtkWidget *spin; /* awfull but a lot easier */ diff --git a/sw/ground_segment/cockpit/ant_track.c b/sw/ground_segment/cockpit/ant_track.c index 7e64fab315..7383560a1d 100644 --- a/sw/ground_segment/cockpit/ant_track.c +++ b/sw/ground_segment/cockpit/ant_track.c @@ -25,7 +25,7 @@ */ #include #include -#include +#include "math.h" #include #include diff --git a/sw/ground_segment/joystick/usb_stick.c b/sw/ground_segment/joystick/usb_stick.c index 87c7a3fab8..709c19eb24 100644 --- a/sw/ground_segment/joystick/usb_stick.c +++ b/sw/ground_segment/joystick/usb_stick.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/ground_segment/modem/main.c b/sw/ground_segment/modem/main.c index ed75ef3684..b0f1029485 100644 --- a/sw/ground_segment/modem/main.c +++ b/sw/ground_segment/modem/main.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include "math.h" #include "timer.h" diff --git a/sw/ground_segment/multimon/demod_afsk12.c b/sw/ground_segment/multimon/demod_afsk12.c index fa4d1a534f..fabc1c475a 100644 --- a/sw/ground_segment/multimon/demod_afsk12.c +++ b/sw/ground_segment/multimon/demod_afsk12.c @@ -23,7 +23,7 @@ #include "multimon.h" #include "filter.h" -#include +#include "math.h" #include /* ---------------------------------------------------------------------- */ diff --git a/sw/ground_segment/multimon/demod_afsk48p.c b/sw/ground_segment/multimon/demod_afsk48p.c index d9cc366366..c44ad7803b 100644 --- a/sw/ground_segment/multimon/demod_afsk48p.c +++ b/sw/ground_segment/multimon/demod_afsk48p.c @@ -24,7 +24,7 @@ #include "multimon.h" #include "filter.h" #include "pprz.h" -#include +#include "math.h" #include /* ---------------------------------------------------------------------- */ diff --git a/sw/ground_segment/multimon/demod_display.c b/sw/ground_segment/multimon/demod_display.c index 4362ef7d6c..a3e485c7e6 100644 --- a/sw/ground_segment/multimon/demod_display.c +++ b/sw/ground_segment/multimon/demod_display.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/ground_segment/multimon/mkcostab.c b/sw/ground_segment/multimon/mkcostab.c index 7991cb069b..061d763a91 100644 --- a/sw/ground_segment/multimon/mkcostab.c +++ b/sw/ground_segment/multimon/mkcostab.c @@ -21,7 +21,7 @@ /* ---------------------------------------------------------------------- */ -#include +#include "math.h" #include #include /* ---------------------------------------------------------------------- */ diff --git a/sw/ground_segment/multimon/pprzlib.c b/sw/ground_segment/multimon/pprzlib.c index caa9f83cfe..49edc12e89 100644 --- a/sw/ground_segment/multimon/pprzlib.c +++ b/sw/ground_segment/multimon/pprzlib.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/ground_segment/multimon/xdisplay.c b/sw/ground_segment/multimon/xdisplay.c index a9110039b3..11a9a7d778 100644 --- a/sw/ground_segment/multimon/xdisplay.c +++ b/sw/ground_segment/multimon/xdisplay.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/ground_segment/tmtc/gpsd2ivy.c b/sw/ground_segment/tmtc/gpsd2ivy.c index 9c2882ba58..2fe5d8ab2e 100644 --- a/sw/ground_segment/tmtc/gpsd2ivy.c +++ b/sw/ground_segment/tmtc/gpsd2ivy.c @@ -51,7 +51,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/include/std.h b/sw/include/std.h index a0dbe2e2cd..8ea2cc84c6 100644 --- a/sw/include/std.h +++ b/sw/include/std.h @@ -30,7 +30,7 @@ #include //#include -#include +#include "math.h" #ifndef FALSE #define FALSE 0 diff --git a/sw/logalizer/ahrs2fg.c b/sw/logalizer/ahrs2fg.c index 0aa02a3908..d2f44625f5 100644 --- a/sw/logalizer/ahrs2fg.c +++ b/sw/logalizer/ahrs2fg.c @@ -1,6 +1,6 @@ #include #include -#include +#include "math.h" #include #include "flight_gear.h" diff --git a/sw/logalizer/ahrsview.c b/sw/logalizer/ahrsview.c index 752fc8be8a..007c1699bf 100644 --- a/sw/logalizer/ahrsview.c +++ b/sw/logalizer/ahrsview.c @@ -1,6 +1,6 @@ #include #include -#include +#include "math.h" #include #include diff --git a/sw/logalizer/ctrlstick.c b/sw/logalizer/ctrlstick.c index d445722257..4acf5b99db 100644 --- a/sw/logalizer/ctrlstick.c +++ b/sw/logalizer/ctrlstick.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/logalizer/disp3d.c b/sw/logalizer/disp3d.c index 4a3ed71a81..ff112d522e 100644 --- a/sw/logalizer/disp3d.c +++ b/sw/logalizer/disp3d.c @@ -21,7 +21,7 @@ /* I apologize for horrible coding. */ -#include +#include "math.h" #include #include #include diff --git a/sw/logalizer/ffjoystick.c b/sw/logalizer/ffjoystick.c index bf9ba8783d..d40dc96367 100644 --- a/sw/logalizer/ffjoystick.c +++ b/sw/logalizer/ffjoystick.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include "math.h" #include #include #include diff --git a/sw/logalizer/imuview.c b/sw/logalizer/imuview.c index 07d3672442..7426808177 100644 --- a/sw/logalizer/imuview.c +++ b/sw/logalizer/imuview.c @@ -1,6 +1,6 @@ #include #include -#include +#include "math.h" #include #include diff --git a/sw/logalizer/motor_bench.c b/sw/logalizer/motor_bench.c index cbc79737d3..85feeb48a9 100644 --- a/sw/logalizer/motor_bench.c +++ b/sw/logalizer/motor_bench.c @@ -1,6 +1,6 @@ #include #include -#include +#include "math.h" #include #include diff --git a/sw/logalizer/plot3dparse.c b/sw/logalizer/plot3dparse.c index 82270439f4..0059f61ef7 100644 --- a/sw/logalizer/plot3dparse.c +++ b/sw/logalizer/plot3dparse.c @@ -27,7 +27,7 @@ pause -1 #include #include #include -#include +#include "math.h" #include int main( int argc, char* argv[] ) diff --git a/sw/logalizer/plot_roll_loop.c b/sw/logalizer/plot_roll_loop.c index 52a346dc7a..354c4522cf 100644 --- a/sw/logalizer/plot_roll_loop.c +++ b/sw/logalizer/plot_roll_loop.c @@ -1,6 +1,6 @@ #include #include -#include +#include "math.h" #include #include diff --git a/sw/logalizer/test_2.c b/sw/logalizer/test_2.c index 0c2af0f475..ee1bb5176c 100644 --- a/sw/logalizer/test_2.c +++ b/sw/logalizer/test_2.c @@ -1,4 +1,4 @@ -#include +#include "math.h" #include "ahrs_utils.h" diff --git a/sw/logalizer/utils.h b/sw/logalizer/utils.h index 056ad9560e..4fc0f34e1b 100644 --- a/sw/logalizer/utils.h +++ b/sw/logalizer/utils.h @@ -1,7 +1,7 @@ #ifndef UTILS_H #define UTILS_H -#include +#include "math.h" extern void htond (double *x); extern void htonf (float *x); diff --git a/sw/simulator/fg.c b/sw/simulator/fg.c index 77157ee975..f973136252 100644 --- a/sw/simulator/fg.c +++ b/sw/simulator/fg.c @@ -5,7 +5,7 @@ #include #include -#include +#include "math.h" #include #include "flight_gear.h" diff --git a/sw/simulator/nps/nps_autopilot_booz.c b/sw/simulator/nps/nps_autopilot_booz.c index 4cc6168062..81c892fa77 100644 --- a/sw/simulator/nps/nps_autopilot_booz.c +++ b/sw/simulator/nps/nps_autopilot_booz.c @@ -82,7 +82,7 @@ void nps_autopilot_run_step(double time __attribute__ ((unused))) { #include "nps_fdm.h" #include "subsystems/ahrs.h" -#include +#include "math/pprz_algebra.h" void sim_overwrite_ahrs(void) { EULERS_BFP_OF_REAL(ahrs.ltp_to_body_euler, fdm.ltp_to_body_eulers); diff --git a/sw/simulator/nps/nps_fdm.h b/sw/simulator/nps/nps_fdm.h index 5a9b76fa4e..159f230c7e 100644 --- a/sw/simulator/nps/nps_fdm.h +++ b/sw/simulator/nps/nps_fdm.h @@ -3,8 +3,8 @@ #include "std.h" -#include -#include +#include "math/pprz_geodetic_double.h" +#include "math/pprz_algebra_double.h" /* Notations for fdm variables diff --git a/sw/simulator/nps/nps_fdm_jsbsim.c b/sw/simulator/nps/nps_fdm_jsbsim.c index 31b1948603..6fecb8e085 100644 --- a/sw/simulator/nps/nps_fdm_jsbsim.c +++ b/sw/simulator/nps/nps_fdm_jsbsim.c @@ -6,11 +6,11 @@ #include "nps_fdm.h" #include "6dof.h" #include "airframe.h" -#include -#include -#include -#include -#include +#include "math/pprz_geodetic.h" +#include "math/pprz_geodetic_double.h" +#include "math/pprz_geodetic_float.h" +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_float.h" #define MetersOfFeet(_f) ((_f)/3.2808399) diff --git a/sw/simulator/nps/nps_flightgear.c b/sw/simulator/nps/nps_flightgear.c index 59083cca44..9d3d325f2b 100644 --- a/sw/simulator/nps/nps_flightgear.c +++ b/sw/simulator/nps/nps_flightgear.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "math.h" #include "std.h" diff --git a/sw/simulator/nps/nps_ivy.c b/sw/simulator/nps/nps_ivy.c index a1e63ead49..699a651096 100644 --- a/sw/simulator/nps/nps_ivy.c +++ b/sw/simulator/nps/nps_ivy.c @@ -5,7 +5,7 @@ #include #include "airframe.h" -#include +#include "math/pprz_algebra_double.h" #include "nps_autopilot.h" #include "nps_fdm.h" diff --git a/sw/simulator/nps/nps_random.c b/sw/simulator/nps/nps_random.c index 05315d483e..28ae6a1d10 100644 --- a/sw/simulator/nps/nps_random.c +++ b/sw/simulator/nps/nps_random.c @@ -1,7 +1,7 @@ #include "nps_random.h" -#include +#include "math.h" #include /* diff --git a/sw/simulator/nps/nps_random.h b/sw/simulator/nps/nps_random.h index 9e1469898c..bb430dfc05 100644 --- a/sw/simulator/nps/nps_random.h +++ b/sw/simulator/nps/nps_random.h @@ -1,7 +1,7 @@ #ifndef NPS_RANDOM_H #define NPS_RANDOM_H -#include +#include "math/pprz_algebra_double.h" extern double get_gaussian_noise(void); extern void double_vect3_add_gaussian_noise(struct DoubleVect3* vect, struct DoubleVect3* std_dev); diff --git a/sw/simulator/nps/nps_sensor_accel.c b/sw/simulator/nps/nps_sensor_accel.c index 9312d8afb5..90857ed03a 100644 --- a/sw/simulator/nps/nps_sensor_accel.c +++ b/sw/simulator/nps/nps_sensor_accel.c @@ -5,7 +5,7 @@ #include "nps_fdm.h" #include "nps_random.h" #include NPS_SENSORS_PARAMS -#include +#include "math/pprz_algebra_int.h" void nps_sensor_accel_init(struct NpsSensorAccel* accel, double time) { FLOAT_VECT3_ZERO(accel->value); diff --git a/sw/simulator/nps/nps_sensor_accel.h b/sw/simulator/nps/nps_sensor_accel.h index 607bcd1fbd..4b641994b2 100644 --- a/sw/simulator/nps/nps_sensor_accel.h +++ b/sw/simulator/nps/nps_sensor_accel.h @@ -1,9 +1,9 @@ #ifndef NPS_SENSOR_ACCEL_H #define NPS_SENSOR_ACCEL_H -#include -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_float.h" #include "std.h" struct NpsSensorAccel { diff --git a/sw/simulator/nps/nps_sensor_baro.h b/sw/simulator/nps/nps_sensor_baro.h index 1ca0ac7ffd..06630b066d 100644 --- a/sw/simulator/nps/nps_sensor_baro.h +++ b/sw/simulator/nps/nps_sensor_baro.h @@ -1,9 +1,9 @@ #ifndef NPS_SENSOR_BARO_H #define NPS_SENSOR_BARO_H -#include -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_float.h" #include "std.h" struct NpsSensorBaro { diff --git a/sw/simulator/nps/nps_sensor_gps.h b/sw/simulator/nps/nps_sensor_gps.h index 83cd7c7dcd..f632ea9abd 100644 --- a/sw/simulator/nps/nps_sensor_gps.h +++ b/sw/simulator/nps/nps_sensor_gps.h @@ -3,10 +3,10 @@ #include -#include -#include -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_float.h" +#include "math/pprz_geodetic_double.h" #include "std.h" diff --git a/sw/simulator/nps/nps_sensor_gyro.c b/sw/simulator/nps/nps_sensor_gyro.c index 10ccc3d1ad..9cffe9341b 100644 --- a/sw/simulator/nps/nps_sensor_gyro.c +++ b/sw/simulator/nps/nps_sensor_gyro.c @@ -3,7 +3,7 @@ #include "airframe.h" #include "nps_fdm.h" #include NPS_SENSORS_PARAMS -#include +#include "math/pprz_algebra_int.h" #include "nps_random.h" void nps_sensor_gyro_init(struct NpsSensorGyro* gyro, double time) { diff --git a/sw/simulator/nps/nps_sensor_gyro.h b/sw/simulator/nps/nps_sensor_gyro.h index 5c1b69928f..f6568b2518 100644 --- a/sw/simulator/nps/nps_sensor_gyro.h +++ b/sw/simulator/nps/nps_sensor_gyro.h @@ -1,9 +1,9 @@ #ifndef NPS_SENSOR_GYRO_H #define NPS_SENSOR_GYRO_H -#include -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_float.h" #include "std.h" struct NpsSensorGyro { diff --git a/sw/simulator/nps/nps_sensor_mag.c b/sw/simulator/nps/nps_sensor_mag.c index e63a31c5bd..8839f38433 100644 --- a/sw/simulator/nps/nps_sensor_mag.c +++ b/sw/simulator/nps/nps_sensor_mag.c @@ -3,7 +3,7 @@ #include "airframe.h" #include "nps_fdm.h" #include NPS_SENSORS_PARAMS -#include +#include "math/pprz_algebra_int.h" void nps_sensor_mag_init(struct NpsSensorMag* mag, double time) { VECT3_ASSIGN(mag->value, 0., 0., 0.); diff --git a/sw/simulator/nps/nps_sensor_mag.h b/sw/simulator/nps/nps_sensor_mag.h index 0374a6e250..8eda06160c 100644 --- a/sw/simulator/nps/nps_sensor_mag.h +++ b/sw/simulator/nps/nps_sensor_mag.h @@ -1,9 +1,9 @@ #ifndef NPS_SENSOR_MAG_H #define NPS_SENSOR_MAG_H -#include -#include -#include +#include "math/pprz_algebra.h" +#include "math/pprz_algebra_double.h" +#include "math/pprz_algebra_float.h" #include "std.h" struct NpsSensorMag { diff --git a/sw/simulator/nps/nps_sensors.h b/sw/simulator/nps/nps_sensors.h index c4a392bcb1..2a017cc780 100644 --- a/sw/simulator/nps/nps_sensors.h +++ b/sw/simulator/nps/nps_sensors.h @@ -1,7 +1,7 @@ #ifndef NPS_SENSORS_H #define NPS_SENSORS_H -#include +#include "math/pprz_algebra.h" #include "nps_sensor_gyro.h" #include "nps_sensor_accel.h" #include "nps_sensor_mag.h" diff --git a/sw/simulator/nps/nps_sensors_utils.c b/sw/simulator/nps/nps_sensors_utils.c index f338239d2a..7252ee61ec 100644 --- a/sw/simulator/nps/nps_sensors_utils.c +++ b/sw/simulator/nps/nps_sensors_utils.c @@ -2,7 +2,7 @@ //#include #include "6dof.h" -#include +#include "math/pprz_algebra.h" void UpdateSensorLatency(double time, gpointer cur_reading, GSList **history, double latency, gpointer sensor_reading) { /* add new reading */ diff --git a/sw/simulator/nps/nps_sensors_utils.h b/sw/simulator/nps/nps_sensors_utils.h index 7131a14b95..74b8545b3a 100644 --- a/sw/simulator/nps/nps_sensors_utils.h +++ b/sw/simulator/nps/nps_sensors_utils.h @@ -2,7 +2,7 @@ #define NPS_SENSORS_UTILS_H #include -#include +#include "math/pprz_algebra_double.h" struct BoozDatedSensor { struct DoubleVect3* value; diff --git a/sw/simulator/old_booz/booz_flight_model.c b/sw/simulator/old_booz/booz_flight_model.c index d65f1fa364..689700827c 100644 --- a/sw/simulator/old_booz/booz_flight_model.c +++ b/sw/simulator/old_booz/booz_flight_model.c @@ -50,7 +50,7 @@ } -#include +#include "math.h" #include "booz_flight_model_params.h" #include "booz_flight_model_utils.h" diff --git a/sw/simulator/old_booz/booz_flight_model_utils.c b/sw/simulator/old_booz/booz_flight_model_utils.c index 0ad50d91dd..a32e155cf0 100644 --- a/sw/simulator/old_booz/booz_flight_model_utils.c +++ b/sw/simulator/old_booz/booz_flight_model_utils.c @@ -1,6 +1,6 @@ #include "booz_flight_model_utils.h" -#include +#include "math.h" #include "6dof.h" void rk4(ode_fun f, VEC* x, VEC* u, double dt) { diff --git a/sw/simulator/old_booz/booz_flightgear.c b/sw/simulator/old_booz/booz_flightgear.c index 943895036f..e9b7da7add 100644 --- a/sw/simulator/old_booz/booz_flightgear.c +++ b/sw/simulator/old_booz/booz_flightgear.c @@ -8,7 +8,7 @@ #include #include -#include +#include "math.h" static int fg_socket; static struct sockaddr_in fg_addr; diff --git a/sw/simulator/old_booz/booz_randlcg.c b/sw/simulator/old_booz/booz_randlcg.c index ae28970b62..6bcfc444e8 100644 --- a/sw/simulator/old_booz/booz_randlcg.c +++ b/sw/simulator/old_booz/booz_randlcg.c @@ -3,7 +3,7 @@ */ -#include +#include "math.h" #include #define ALL_BITS 0xffffffff diff --git a/sw/simulator/old_booz/booz_sensors_model.c b/sw/simulator/old_booz/booz_sensors_model.c index 9bd0223111..b1d4fedf7c 100644 --- a/sw/simulator/old_booz/booz_sensors_model.c +++ b/sw/simulator/old_booz/booz_sensors_model.c @@ -1,7 +1,7 @@ #include "booz_sensors_model.h" #include BSM_PARAMS -#include +#include "math.h" #include "std.h" #include "booz_flight_model.h" diff --git a/sw/simulator/old_booz/booz_sensors_model_utils.c b/sw/simulator/old_booz/booz_sensors_model_utils.c index 29ba3f2530..2a66f37b1e 100644 --- a/sw/simulator/old_booz/booz_sensors_model_utils.c +++ b/sw/simulator/old_booz/booz_sensors_model_utils.c @@ -1,7 +1,7 @@ #include "booz_sensors_model_utils.h" #include "6dof.h" -#include +#include "math.h" void UpdateSensorLatency(double time, VEC* cur_reading, GSList **history, double latency, VEC* sensor_reading) {