fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 06:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

move geo and geo_lookup to PX4/ecl

Browse Source
This commit is contained in:
Daniel Agar
2018-03-26 23:16:55 -04:00
parent 76bf9c6465
commit 29b3950747
87 changed files with 62 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
+2 -1
View File
@@ -40,7 +40,8 @@
*/
#include <drivers/drv_hrt.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <lib/ecl/geo_lookup/geo_mag_declination.h>
#include <mathlib/math/filter/LowPassFilter2p.hpp>
#include <mathlib/mathlib.h>
#include <px4_config.h>
src/modules/commander/accelerometer_calibration.cpp
+1 -1
View File
@@ -141,7 +141,7 @@
#include <string.h>
#include <drivers/drv_hrt.h>
#include <drivers/drv_accel.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <conversion/rotation.h>
#include <systemlib/param/param.h>
#include <systemlib/err.h>
src/modules/commander/calibration_routines.cpp
+1 -1
View File
@@ -48,7 +48,7 @@
#include <poll.h>
#include <drivers/drv_hrt.h>
#include <systemlib/mavlink_log.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <string.h>
#include <mathlib/mathlib.h>
src/modules/commander/commander.cpp
+1 -1
View File
@@ -65,7 +65,7 @@
#include <dataman/dataman.h>
#include <drivers/drv_hrt.h>
#include <drivers/drv_tone_alarm.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <navigator/navigation.h>
#include <px4_defines.h>
src/modules/ekf2/CMakeLists.txt
+3 -1
View File
@@ -37,9 +37,11 @@ px4_add_module(
-Wno-sign-compare # TODO: fix all sign-compare
STACK_MAIN 2500
STACK_MAX 4000
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
ekf2_main.cpp
DEPENDS
platforms__common
git_ecl
ecl
)
src/modules/fw_att_control/CMakeLists.txt
+1 -1
View File
@@ -38,5 +38,5 @@ px4_add_module(
DEPENDS
platforms__common
git_ecl
lib__ecl
ecl
)
src/modules/fw_att_control/FixedwingAttitudeControl.hpp
+1 -1
View File
@@ -37,7 +37,7 @@
#include <ecl/attitude_fw/ecl_roll_controller.h>
#include <ecl/attitude_fw/ecl_wheel_controller.h>
#include <ecl/attitude_fw/ecl_yaw_controller.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <px4_config.h>
#include <px4_defines.h>
src/modules/fw_pos_control_l1/CMakeLists.txt
+3 -2
View File
@@ -38,13 +38,14 @@ px4_add_module(
MODULE modules__fw_pos_control_l1
MAIN fw_pos_control_l1
STACK_MAIN 1200
COMPILE_FLAGS
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
FixedwingPositionControl.cpp
Landingslope.cpp
DEPENDS
git_ecl
lib__ecl
ecl
launchdetection
runway_takeoff
)
src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
+1 -1
View File
@@ -57,7 +57,7 @@
#include <drivers/drv_hrt.h>
#include <ecl/l1/ecl_l1_pos_controller.h>
#include <ecl/tecs/tecs.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <px4_config.h>
#include <px4_defines.h>
src/modules/gnd_att_control/CMakeLists.txt
+1 -3
View File
@@ -38,8 +38,6 @@ px4_add_module(
SRCS
GroundRoverAttitudeControl.cpp
DEPENDS
platforms__common
git_ecl
lib__ecl
ecl
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
src/modules/gnd_pos_control/CMakeLists.txt
+3 -3
View File
@@ -35,11 +35,11 @@ px4_add_module(
MAIN gnd_pos_control
STACK_MAIN 1200
COMPILE_FLAGS
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
GroundRoverPositionControl.cpp
DEPENDS
platforms__common
git_ecl
lib__ecl
ecl
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
src/modules/gnd_pos_control/GroundRoverPositionControl.hpp
+1 -1
View File
@@ -50,7 +50,7 @@
#include <drivers/drv_hrt.h>
#include <ecl/l1/ecl_l1_pos_controller.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <systemlib/perf_counter.h>
#include <systemlib/pid/pid.h>
src/modules/local_position_estimator/BlockLocalPositionEstimator.hpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <px4_module_params.h>
#include <controllib/blocks.hpp>
#include <mathlib/mathlib.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <matrix/Matrix.hpp>
// uORB Subscriptions
src/modules/mavlink/mavlink_main.cpp
+1 -1
View File
@@ -69,7 +69,7 @@
#include <systemlib/perf_counter.h>
#include <systemlib/systemlib.h>
#include <systemlib/mavlink_log.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <dataman/dataman.h>
#include <version/version.h>
src/modules/mavlink/mavlink_messages.cpp
+1 -1
View File
@@ -49,7 +49,7 @@
#include <commander/px4_custom_mode.h>
#include <drivers/drv_pwm_output.h>
#include <drivers/drv_rc_input.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <px4_time.h>
#include <systemlib/err.h>
src/modules/mavlink/mavlink_mission.cpp
+1 -1
View File
@@ -45,7 +45,7 @@
#include <errno.h>
#include <math.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <systemlib/err.h>
#include <drivers/drv_hrt.h>
#include <px4_defines.h>
src/modules/mavlink/mavlink_receiver.cpp
+1 -1
View File
@@ -81,7 +81,7 @@
#include <systemlib/err.h>
#include <systemlib/airspeed.h>
#include <commander/px4_custom_mode.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <uORB/topics/vehicle_command_ack.h>
src/modules/mc_att_control/mc_att_control_main.cpp
+1 -1
View File
@@ -47,7 +47,7 @@
#include <conversion/rotation.h>
#include <drivers/drv_hrt.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <systemlib/circuit_breaker.h>
#include <mathlib/math/Limits.hpp>
#include <mathlib/math/Functions.hpp>
src/modules/mc_pos_control/mc_pos_control_main.cpp
+1 -1
View File
@@ -69,7 +69,7 @@
#include <uORB/topics/vehicle_status.h>
#include <float.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <systemlib/mavlink_log.h>
src/modules/navigator/datalinkloss.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
#include <systemlib/mavlink_log.h>
#include <systemlib/err.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <navigator/navigation.h>
#include <uORB/uORB.h>
src/modules/navigator/enginefailure.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
#include <systemlib/mavlink_log.h>
#include <systemlib/err.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <navigator/navigation.h>
#include <uORB/uORB.h>
src/modules/navigator/follow_target.cpp
+1 -1
View File
@@ -51,7 +51,7 @@
#include <uORB/uORB.h>
#include <uORB/topics/position_setpoint_triplet.h>
#include <uORB/topics/follow_target.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <lib/mathlib/math/Limits.hpp>
#include "navigator.h"
src/modules/navigator/geofence.cpp
+1 -1
View File
@@ -45,7 +45,7 @@
#include <dataman/dataman.h>
#include <drivers/drv_hrt.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <systemlib/mavlink_log.h>
#include "navigator.h"
src/modules/navigator/geofence.h
+1 -1
View File
@@ -44,7 +44,7 @@
#include <px4_module_params.h>
#include <drivers/drv_hrt.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <px4_defines.h>
#include <uORB/topics/sensor_combined.h>
#include <uORB/topics/vehicle_global_position.h>
src/modules/navigator/gpsfailure.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
#include "navigator.h"
#include <systemlib/mavlink_log.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <navigator/navigation.h>
#include <uORB/uORB.h>
#include <uORB/topics/mission.h>
src/modules/navigator/mission.cpp
+1 -1
View File
@@ -52,7 +52,7 @@
#include <dataman/dataman.h>
#include <systemlib/mavlink_log.h>
#include <systemlib/err.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <lib/mathlib/mathlib.h>
#include <navigator/navigation.h>
#include <uORB/uORB.h>
src/modules/navigator/mission_block.cpp
+1 -1
View File
@@ -46,7 +46,7 @@
#include <math.h>
#include <float.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <systemlib/mavlink_log.h>
#include <mathlib/mathlib.h>
#include <uORB/uORB.h>
src/modules/navigator/mission_feasibility_checker.cpp
+1 -1
View File
@@ -46,7 +46,7 @@
#include <drivers/drv_pwm_output.h>
#include <fw_pos_control_l1/Landingslope.hpp>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <systemlib/mavlink_log.h>
src/modules/navigator/navigator_main.cpp
+1 -1
View File
@@ -52,7 +52,7 @@
#include <dataman/dataman.h>
#include <drivers/drv_hrt.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <mathlib/mathlib.h>
#include <px4_config.h>
#include <px4_defines.h>
src/modules/navigator/precland.h
+1 -1
View File
@@ -41,7 +41,7 @@
#pragma once
#include <matrix/math.hpp>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <px4_module_params.h>
#include <uORB/topics/landing_target_pose.h>
src/modules/navigator/rcloss.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
#include <systemlib/mavlink_log.h>
#include <systemlib/err.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <uORB/uORB.h>
#include <navigator/navigation.h>
src/modules/position_estimator_inav/position_estimator_inav_main.cpp
+1 -1
View File
@@ -66,7 +66,7 @@
#include <poll.h>
#include <systemlib/err.h>
#include <systemlib/mavlink_log.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <drivers/drv_hrt.h>
#include <platforms/px4_defines.h>
src/modules/simulator/simulator.h
+1 -1
View File
@@ -61,7 +61,7 @@
#include <uORB/topics/distance_sensor.h>
#include <v2.0/mavlink_types.h>
#include <v2.0/common/mavlink.h>
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
namespace simulator
{
src/modules/simulator/simulator_mavlink.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#include "simulator.h"
#include <simulator_config.h>
#include "errno.h"
#include <geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <drivers/drv_pwm_output.h>
#include <sys/socket.h>
#include <netinet/in.h>
src/modules/systemlib/airspeed.c
+4 -4
View File
@@ -40,11 +40,11 @@
*
*/
#include <stdio.h>
#include <math.h>
#include <geo/geo.h>
#include "airspeed.h"
#include <px4_defines.h>
#include <lib/ecl/geo/geo.h>
/**
* Calculate indicated airspeed.
*
@@ -121,7 +121,7 @@ float calc_indicated_airspeed_corrected(enum AIRSPEED_COMPENSATION_MODEL pmodel,
// check if the tube diameter and dp is nonzero to avoid division by 0
if ((tube_dia_mm > 0.0f) && (dp > 0.0f)) {
const float d_tubePow4 = powf(tube_dia_mm * 1e-3f, 4);
const float denominator = (float)M_PI * d_tubePow4 * rho_air * dp;
const float denominator = M_PI_F * d_tubePow4 * rho_air * dp;
// avoid division by 0
float eps = 0.0f;
src/modules/vtol_att_control/vtol_att_control_main.h
+1 -1
View File
@@ -57,7 +57,7 @@
#include <arch/board/board.h>
#include <drivers/drv_hrt.h>
#include <drivers/drv_pwm_output.h>
#include <lib/geo/geo.h>
#include <lib/ecl/geo/geo.h>
#include <lib/mathlib/mathlib.h>
#include <systemlib/param/param.h>