lib/geo: move from ecl

src/modules/angular_velocity_controller/AngularVelocityController.cpp

@@ -37,7 +37,7 @@
 #include <circuit_breaker/circuit_breaker.h>
 #include <mathlib/math/Limits.hpp>
 #include <mathlib/math/Functions.hpp>
-#include <ecl/geo/geo.h>
+#include <geo/geo.h>
 
 using namespace matrix;
 using namespace time_literals;

src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp

@@ -42,7 +42,7 @@
 #include <float.h>
 
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/world_magnetic_model/geo_mag_declination.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/parameters/param.h>

src/modules/commander/CMakeLists.txt

@@ -57,7 +57,7 @@ px4_add_module(
 	DEPENDS
 		circuit_breaker
 		failure_detector
-		ecl_geo
+		geo
 		hysteresis
 		PreFlightCheck
 		ArmAuthorization

src/modules/commander/Commander.cpp

@@ -57,7 +57,7 @@
 #include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_tone_alarm.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <mathlib/mathlib.h>
 #include <navigator/navigation.h>
 #include <px4_platform_common/px4_config.h>

src/modules/commander/accelerometer_calibration.cpp

@@ -134,7 +134,7 @@
 #include <lib/sensor_calibration/Accelerometer.hpp>
 #include <lib/sensor_calibration/Utilities.hpp>
 #include <lib/mathlib/mathlib.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <matrix/math.hpp>
 #include <lib/conversion/rotation.h>
 #include <lib/parameters/param.h>

src/modules/commander/calibration_routines.cpp

@@ -45,7 +45,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_tone_alarm.h>
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/systemlib/mavlink_log.h>
 #include <matrix/math.hpp>

src/modules/commander/level_calibration.cpp

@@ -42,7 +42,7 @@
 
 #include <drivers/drv_hrt.h>
 #include <lib/mathlib/mathlib.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <matrix/math.hpp>
 #include <lib/conversion/rotation.h>
 #include <lib/parameters/param.h>

src/modules/ekf2/CMakeLists.txt

@@ -45,7 +45,7 @@ px4_add_module(
 		EKF2Selector.hpp
 	DEPENDS
 		ecl_EKF
-		ecl_geo
+		geo
 		perf
 		EKF2Utility
 		px4_work_queue

src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.hpp

@@ -45,7 +45,7 @@
 #include <uORB/topics/home_position.h>
 #include <uORB/topics/manual_control_setpoint.h>
 #include <uORB/topics/vehicle_status.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 // TODO: make this switchable in the board config, like a module
 #if CONSTRAINED_FLASH

src/modules/flight_mode_manager/tasks/FlightTask/FlightTask.cpp

@@ -1,6 +1,6 @@
 #include "FlightTask.hpp"
 #include <mathlib/mathlib.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 constexpr uint64_t FlightTask::_timeout;
 // First index of empty_setpoint corresponds to time-stamp and requires a finite number.

src/modules/flight_mode_manager/tasks/FlightTask/FlightTask.hpp

@@ -53,7 +53,7 @@
 #include <uORB/topics/vehicle_attitude.h>
 #include <uORB/topics/vehicle_trajectory_waypoint.h>
 #include <uORB/topics/home_position.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/weather_vane/WeatherVane.hpp>
 
 struct ekf_reset_counters_s {

src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.cpp

@@ -38,7 +38,7 @@
 #include "FlightTaskManualAltitude.hpp"
 #include <float.h>
 #include <mathlib/mathlib.h>
-#include <ecl/geo/geo.h>
+#include <geo/geo.h>
 
 using namespace matrix;
 

src/modules/flight_mode_manager/tasks/Orbit/FlightTaskOrbit.cpp

@@ -38,7 +38,7 @@
 #include "FlightTaskOrbit.hpp"
 
 #include <mathlib/mathlib.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 using namespace matrix;
 

src/modules/flight_mode_manager/tasks/Utility/StickAccelerationXY.cpp

@@ -37,7 +37,7 @@
 
 #include "StickAccelerationXY.hpp"
 
-#include <ecl/geo/geo.h>
+#include <geo/geo.h>
 #include "Sticks.hpp"
 
 using namespace matrix;

src/modules/fw_att_control/FixedwingAttitudeControl.hpp

@@ -36,7 +36,7 @@
 #include "ecl_roll_controller.h"
 #include "ecl_wheel_controller.h"
 #include "ecl_yaw_controller.h"
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/parameters/param.h>
 #include <lib/perf/perf_counter.h>

src/modules/fw_att_control/ecl_pitch_controller.cpp

@@ -40,7 +40,7 @@
 
 #include "ecl_pitch_controller.h"
 #include <float.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <mathlib/mathlib.h>
 
 float ECL_PitchController::control_attitude(const float dt, const ECL_ControlData &ctl_data)

src/modules/fw_att_control/ecl_roll_controller.cpp

@@ -40,7 +40,7 @@
 
 #include "ecl_roll_controller.h"
 #include <float.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <mathlib/mathlib.h>
 
 float ECL_RollController::control_attitude(const float dt, const ECL_ControlData &ctl_data)

src/modules/fw_att_control/ecl_wheel_controller.cpp

@@ -40,7 +40,7 @@
 
 #include "ecl_wheel_controller.h"
 #include <float.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
 

src/modules/fw_att_control/ecl_yaw_controller.cpp

@@ -40,7 +40,7 @@
 
 #include "ecl_yaw_controller.h"
 #include <float.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <mathlib/mathlib.h>
 
 float ECL_YawController::control_attitude(const float dt, const ECL_ControlData &ctl_data)

src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp

@@ -54,7 +54,7 @@
 #include <float.h>
 
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/l1/ECL_L1_Pos_Controller.hpp>
 #include <lib/tecs/TECS.hpp>
 #include <lib/landing_slope/Landingslope.hpp>

src/modules/gyro_calibration/GyroCalibration.cpp

@@ -33,7 +33,7 @@
 
 #include "GyroCalibration.hpp"
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 using namespace time_literals;
 using matrix::Vector3f;

src/modules/local_position_estimator/BlockLocalPositionEstimator.hpp

@@ -5,7 +5,7 @@
 #include <px4_platform_common/module_params.h>
 #include <px4_platform_common/posix.h>
 #include <lib/controllib/blocks.hpp>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <matrix/Matrix.hpp>
 

src/modules/local_position_estimator/CMakeLists.txt

@@ -49,6 +49,6 @@ px4_add_module(
 		sensors/landing_target.cpp
 	DEPENDS
 		controllib
-		ecl_geo
+		geo
 		px4_work_queue
 	)

src/modules/mavlink/CMakeLists.txt

@@ -72,7 +72,7 @@ px4_add_module(
 		drivers_magnetometer
 		git_mavlink_v2
 		conversion
-		ecl_geo
+		geo
 		version
 	UNITY_BUILD
 	)

src/modules/mavlink/mavlink_main.cpp

@@ -49,7 +49,7 @@
 #endif
 
 #include <containers/LockGuard.hpp>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/systemlib/mavlink_log.h>
 #include <lib/version/version.h>

src/modules/mavlink/mavlink_messages.cpp

@@ -46,7 +46,7 @@
 
 #include <drivers/drv_pwm_output.h>
 #include <lib/conversion/rotation.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/matrix/matrix/math.hpp>
 #include <px4_platform_common/time.h>

src/modules/mavlink/mavlink_mission.cpp

@@ -43,7 +43,7 @@
 #include "mavlink_mission.h"
 #include "mavlink_main.h"
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <systemlib/err.h>
 #include <drivers/drv_hrt.h>
 #include <px4_platform_common/defines.h>

src/modules/mavlink/mavlink_receiver.cpp

@@ -43,7 +43,7 @@
 #include <airspeed/airspeed.h>
 #include <conversion/rotation.h>
 #include <drivers/drv_rc_input.h>
-#include <ecl/geo/geo.h>
+#include <geo/geo.h>
 #include <systemlib/px4_macros.h>
 
 #include <math.h>

src/modules/mavlink/streams/HIGH_LATENCY2.hpp

@@ -34,7 +34,7 @@
 #ifndef HIGH_LATENCY2_HPP
 #define HIGH_LATENCY2_HPP
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/matrix/matrix/math.hpp>
 

src/modules/mavlink/streams/SCALED_IMU.hpp

@@ -34,7 +34,7 @@
 #ifndef SCALED_IMU_HPP
 #define SCALED_IMU_HPP
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/matrix/matrix/math.hpp>
 
 #include <uORB/topics/sensor_mag.h>

src/modules/mavlink/streams/SCALED_IMU2.hpp

@@ -34,7 +34,7 @@
 #ifndef SCALED_IMU2_HPP
 #define SCALED_IMU2_HPP
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/matrix/matrix/math.hpp>
 
 #include <uORB/topics/sensor_mag.h>

src/modules/mavlink/streams/SCALED_IMU3.hpp

@@ -34,7 +34,7 @@
 #ifndef SCALED_IMU3_HPP
 #define SCALED_IMU3_HPP
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/matrix/matrix/math.hpp>
 
 #include <uORB/topics/sensor_mag.h>

src/modules/mc_hover_thrust_estimator/zero_order_hover_thrust_ekf.hpp

@@ -64,7 +64,7 @@
 #pragma once
 
 #include <matrix/matrix/math.hpp>
-#include <ecl/geo/geo.h>
+#include <geo/geo.h>
 #include <mathlib/mathlib.h>
 
 class ZeroOrderHoverThrustEkf

src/modules/mc_pos_control/CMakeLists.txt

@@ -45,6 +45,6 @@ px4_add_module(
 		PositionControl
 		Takeoff
 		controllib
-		ecl_geo
+		geo
 		SlewRate
 	)

src/modules/mc_pos_control/PositionControl/PositionControl.cpp

@@ -40,7 +40,7 @@
 #include <float.h>
 #include <mathlib/mathlib.h>
 #include <px4_platform_common/defines.h>
-#include <ecl/geo/geo.h>
+#include <geo/geo.h>
 
 using namespace matrix;
 

src/modules/mc_pos_control/Takeoff/Takeoff.cpp

@@ -37,7 +37,7 @@
 
 #include "Takeoff.hpp"
 #include <mathlib/mathlib.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 void Takeoff::generateInitialRampValue(float velocity_p_gain)
 {

src/modules/mc_pos_control/Takeoff/TakeoffTest.cpp

@@ -34,7 +34,7 @@
 #include <gtest/gtest.h>
 #include <Takeoff.hpp>
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 TEST(TakeoffTest, Initialization)
 {

src/modules/navigator/CMakeLists.txt

@@ -52,7 +52,7 @@ px4_add_module(
 		gpsfailure.cpp
 		follow_target.cpp
 	DEPENDS
-		ecl_geo
+		geo
 		landing_slope
 		geofence_breach_avoidance
 		motion_planning

src/modules/navigator/GeofenceBreachAvoidance/CMakeLists.txt

@@ -36,4 +36,4 @@ px4_add_library(geofence_breach_avoidance
 	geofence_breach_avoidance.h
 )
 
-px4_add_functional_gtest(SRC GeofenceBreachAvoidanceTest.cpp LINKLIBS geofence_breach_avoidance modules__navigator ecl_geo motion_planning)
+px4_add_functional_gtest(SRC GeofenceBreachAvoidanceTest.cpp LINKLIBS geofence_breach_avoidance modules__navigator motion_planning)

src/modules/navigator/GeofenceBreachAvoidance/geofence_breach_avoidance.cpp

@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include "geofence_breach_avoidance.h"
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <motion_planning/VelocitySmoothing.hpp>
 
 using Vector2d = matrix::Vector2<double>;

src/modules/navigator/enginefailure.cpp

@@ -43,7 +43,7 @@
 
 #include <systemlib/mavlink_log.h>
 #include <systemlib/err.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <navigator/navigation.h>
 
 #include <uORB/uORB.h>

src/modules/navigator/follow_target.cpp

@@ -51,7 +51,7 @@
 #include <uORB/uORB.h>
 #include <uORB/topics/position_setpoint_triplet.h>
 #include <uORB/topics/follow_target.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/math/Limits.hpp>
 
 #include "navigator.h"

src/modules/navigator/geofence.cpp

@@ -45,7 +45,7 @@
 
 #include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <systemlib/mavlink_log.h>
 
 #include "navigator.h"

src/modules/navigator/geofence.h

@@ -45,7 +45,7 @@
 #include <lib/mathlib/mathlib.h>
 #include <px4_platform_common/module_params.h>
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <px4_platform_common/defines.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/home_position.h>

src/modules/navigator/gpsfailure.cpp

@@ -41,7 +41,7 @@
 #include "navigator.h"
 
 #include <systemlib/mavlink_log.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <navigator/navigation.h>
 #include <uORB/uORB.h>
 #include <uORB/topics/mission.h>

src/modules/navigator/mission.cpp

@@ -53,7 +53,7 @@
 #include <dataman/dataman.h>
 #include <systemlib/mavlink_log.h>
 #include <systemlib/err.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <navigator/navigation.h>
 #include <uORB/uORB.h>
 #include <uORB/topics/mission.h>

src/modules/navigator/mission_block.cpp

@@ -46,7 +46,7 @@
 #include <math.h>
 #include <float.h>
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <systemlib/mavlink_log.h>
 #include <mathlib/mathlib.h>
 #include <uORB/uORB.h>

src/modules/navigator/mission_feasibility_checker.cpp

@@ -46,7 +46,7 @@
 #include "navigator.h"
 
 #include <drivers/drv_pwm_output.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/landing_slope/Landingslope.hpp>
 #include <systemlib/mavlink_log.h>

src/modules/navigator/navigator_main.cpp

@@ -50,7 +50,7 @@
 
 #include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>

src/modules/navigator/precland.h

@@ -41,7 +41,7 @@
 #pragma once
 
 #include <matrix/math.hpp>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <px4_platform_common/module_params.h>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/landing_target_pose.h>

src/modules/navigator/rtl.cpp

@@ -45,7 +45,7 @@
 #include <dataman/dataman.h>
 #include <px4_platform_common/events.h>
 
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 
 static constexpr float DELAY_SIGMA = 0.01f;

src/modules/navigator/rtl.h

@@ -52,7 +52,7 @@
 #include <uORB/topics/vehicle_status.h>
 #include <uORB/topics/wind.h>
 #include <matrix/math.hpp>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 class Navigator;
 

src/modules/rover_pos_control/RoverPositionControl.cpp

@@ -43,7 +43,7 @@
 
 
 #include "RoverPositionControl.hpp"
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 #define ACTUATOR_PUBLISH_PERIOD_MS 4
 

src/modules/rover_pos_control/RoverPositionControl.hpp

@@ -44,7 +44,7 @@
 #include <float.h>
 
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/l1/ECL_L1_Pos_Controller.hpp>
 #include <lib/mathlib/mathlib.h>
 #include <lib/perf/perf_counter.h>

src/modules/sensors/vehicle_air_data/VehicleAirData.cpp

@@ -34,7 +34,7 @@
 #include "VehicleAirData.hpp"
 
 #include <px4_platform_common/log.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 namespace sensors
 {

src/modules/sensors/vehicle_gps_position/CMakeLists.txt

@@ -37,6 +37,10 @@ px4_add_library(vehicle_gps_position
 	gps_blending.cpp
 	gps_blending.hpp
 )
-target_link_libraries(vehicle_gps_position PRIVATE ecl_geo px4_work_queue)
+target_link_libraries(vehicle_gps_position
+	PRIVATE
+		geo
+		px4_work_queue
+)
 
-px4_add_functional_gtest(SRC gps_blending_test.cpp LINKLIBS vehicle_gps_position ecl_geo)
+px4_add_functional_gtest(SRC gps_blending_test.cpp LINKLIBS vehicle_gps_position)

src/modules/sensors/vehicle_gps_position/VehicleGPSPosition.cpp

@@ -34,7 +34,7 @@
 #include "VehicleGPSPosition.hpp"
 
 #include <px4_platform_common/log.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 
 namespace sensors

src/modules/sensors/vehicle_gps_position/gps_blending.hpp

@@ -43,7 +43,7 @@
 #include <uORB/topics/sensor_gps.h>
 
 #include <float.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 
 using matrix::Vector2f;

src/modules/sensors/vehicle_magnetometer/VehicleMagnetometer.cpp

@@ -34,7 +34,7 @@
 #include "VehicleMagnetometer.hpp"
 
 #include <px4_platform_common/log.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 namespace sensors
 {

src/modules/sensors/voted_sensors_update.cpp

@@ -40,7 +40,7 @@
 #include "voted_sensors_update.h"
 
 #include <lib/sensor_calibration/Utilities.hpp>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/systemlib/mavlink_log.h>
 #include <uORB/Subscription.hpp>
 

src/modules/sih/sih.hpp

@@ -40,7 +40,7 @@
 
 #include <matrix/matrix/math.hpp>   // matrix, vectors, dcm, quaterions
 #include <conversion/rotation.h>    // math::radians,
-#include <lib/ecl/geo/geo.h>        // to get the physical constants
+#include <lib/geo/geo.h>        // to get the physical constants
 #include <drivers/drv_hrt.h>        // to get the real time
 #include <lib/drivers/accelerometer/PX4Accelerometer.hpp>
 #include <lib/drivers/barometer/PX4Barometer.hpp>

src/modules/simulator/CMakeLists.txt

@@ -67,7 +67,7 @@ px4_add_module(
 	DEPENDS
 		git_mavlink_v2
 		conversion
-		ecl_geo
+		geo
 		drivers_accelerometer
 		drivers_barometer
 		drivers_gyroscope

src/modules/simulator/simulator.h

@@ -48,7 +48,7 @@
 #include <lib/drivers/barometer/PX4Barometer.hpp>
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <lib/drivers/magnetometer/PX4Magnetometer.hpp>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_platform_common/atomic.h>
 #include <px4_platform_common/bitmask.h>

src/modules/simulator/simulator_mavlink.cpp

@@ -39,7 +39,7 @@
 #include <px4_platform_common/log.h>
 #include <px4_platform_common/time.h>
 #include <px4_platform_common/tasks.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <drivers/device/Device.hpp>
 #include <drivers/drv_pwm_output.h>
 #include <conversion/rotation.h>

src/modules/uuv_att_control/uuv_att_control.hpp

@@ -46,7 +46,7 @@
 #include <float.h>
 
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/perf/perf_counter.h>
 #include <lib/pid/pid.h>

src/modules/uuv_pos_control/uuv_pos_control.hpp

@@ -45,7 +45,7 @@
 #include <float.h>
 
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/perf/perf_counter.h>
 #include <lib/pid/pid.h>

src/modules/vmount/CMakeLists.txt

@@ -44,6 +44,6 @@ px4_add_module(
 		output_rc.cpp
 		vmount.cpp
 	DEPENDS
-		ecl_geo
+		geo
 	)
 

src/modules/vmount/input_mavlink.h

@@ -51,7 +51,7 @@
 #include <uORB/topics/vehicle_command.h>
 #include <uORB/topics/vehicle_roi.h>
 #include <uORB/topics/vehicle_global_position.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 
 
 namespace vmount

src/modules/vmount/output.cpp

@@ -46,7 +46,7 @@
 #include <uORB/topics/vehicle_global_position.h>
 #include <uORB/topics/mount_orientation.h>
 #include <px4_platform_common/defines.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <math.h>
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>

src/modules/vmount/output.h

@@ -41,7 +41,7 @@
 
 #include "common.h"
 #include <drivers/drv_hrt.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <uORB/Publication.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/mount_orientation.h>

src/modules/vtol_att_control/vtol_att_control_main.h

@@ -51,7 +51,7 @@
 
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_pwm_output.h>
-#include <lib/ecl/geo/geo.h>
+#include <lib/geo/geo.h>
 #include <lib/mathlib/mathlib.h>
 #include <lib/parameters/param.h>
 #include <lib/perf/perf_counter.h>