Skip to content

Commit

Permalink
refactored safety area
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Oct 30, 2023
1 parent 208ebb3 commit 321caa0
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 418 deletions.
5 changes: 2 additions & 3 deletions include/mrs_uav_managers/control_manager/common_handlers.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ namespace control_manager

/* safety area handler //{ */

typedef boost::function<bool(const mrs_msgs::ReferenceStamped point)> isPointInSafetyArea3d_t;
typedef boost::function<bool(const mrs_msgs::ReferenceStamped point)> isPointInSafetyArea2d_t;
typedef boost::function<bool(const mrs_msgs::ReferenceStamped &point)> isPointInSafetyArea3d_t;
typedef boost::function<bool(const mrs_msgs::ReferenceStamped &point)> isPointInSafetyArea2d_t;
typedef boost::function<double(const std::string &frame_id)> getMaxZ_t;
typedef boost::function<double(const std::string &frame_id)> getMinZ_t;

Expand All @@ -24,7 +24,6 @@ struct SafetyArea_t
mrs_uav_managers::control_manager::isPointInSafetyArea2d_t isPointInSafetyArea2d;
mrs_uav_managers::control_manager::getMaxZ_t getMaxZ;
mrs_uav_managers::control_manager::getMinZ_t getMinZ;
std::string frame_id;
bool use_safety_area;
};

Expand Down
Loading

0 comments on commit 321caa0

Please sign in to comment.