modelec/modelec-marcel-ROS
1
0
Fork 0
mirror of https://github.com/modelec/modelec-marcel-ROS.git synced 2026-03-18 21:50:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fuck merge

Browse Source
This commit is contained in:
acki
2026-01-28 11:16:31 +01:00
parent f701c1e82f
commit 849712a902
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modelec_strat/src/missions/free_mission.cpp
View File

@@ -75,7 +75,7 @@ namespace Modelec {
auto currPos = nav_->GetCurrentPos();
auto dist = std::clamp(Point::distance(Point(currPos->x, currPos->y, currPos->theta),
nav_->GetClosestDepositeZone(nav_->GetCurrentPos())->GetPosition()), 0.0, 300.0);
nav_->GetClosestDepositeZone(nav_->GetCurrentPos())->GetPosition()), 0.0, 200.0);
target_deposite_zone_ = nav_->GetClosestDepositeZone(nav_->GetCurrentPos(), {}, true);
@@ -108,7 +108,6 @@ namespace Modelec {
deploy_time_ = node_->now();
}
step_ = FREE;
break;
case FREE:
{

2
src/modelec_strat/src/missions/take_mission.cpp
View File

@@ -74,8 +74,6 @@ namespace Modelec {
closestBox = nav_->GetClosestObstacle<BoxObstacle>(nav_->GetCurrentPos());
action_executor_->box_obstacles_[0] = closestBox;
action_executor_->box_obstacles_[front_] = closestBox;
auto pos = closestBox->GetOptimizedGetPos(nav_->GetCurrentPos()).GetTakeBasePosition();