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

remove some pot cause of the banner

Browse Source
This commit is contained in:
acki
2025-05-28 07:11:58 -04:00
parent 9c01e39274
commit 03ecb3acff
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modelec_strat/data/deposite_zone.xml
View File

@@ -7,11 +7,11 @@
</PotPos> </PotPos>
</DepositeZone> </DepositeZone>
<DepositeZone id="101" team="0" max_pot="3"> <DepositeZone id="101" team="0" max_pot="2">
<Pos x="1225" y="225" theta="1.5708" w="450" h="450" /> <Pos x="1225" y="225" theta="1.5708" w="450" h="450" />
<PotPos> <PotPos>
<Pos x="1225" y="75" theta="1.5708" /> <!--<Pos x="1225" y="125" theta="1.5708" />-->
<Pos x="1225" y="225" theta="1.5708" /> <Pos x="1225" y="200" theta="1.5708" />
<Pos x="1225" y="400" theta="1.5708" /> <Pos x="1225" y="400" theta="1.5708" />
</PotPos> </PotPos>
</DepositeZone> </DepositeZone>
@@ -40,11 +40,11 @@
</PotPos> </PotPos>
</DepositeZone> </DepositeZone>
<DepositeZone id="111" team="1" max_pot="3"> <DepositeZone id="111" team="1" max_pot="2">
<Pos x="1775" y="225" theta="1.5708" w="450" h="450" /> <Pos x="1775" y="225" theta="1.5708" w="450" h="450" />
<PotPos> <PotPos>
<Pos x="1775" y="75" theta="1.5708" /> <!--<Pos x="1775" y="75" theta="1.5708" />-->
<Pos x="1775" y="225" theta="1.5708" /> <Pos x="1775" y="200" theta="1.5708" />
<Pos x="1775" y="400" theta="1.5708" /> <Pos x="1775" y="400" theta="1.5708" />
</PotPos> </PotPos>
</DepositeZone> </DepositeZone>

4
src/modelec_strat/src/missions/prepare_concert_mission.cpp
View File

@@ -90,7 +90,7 @@ namespace Modelec
case GO_TO_COLUMN: case GO_TO_COLUMN:
{ {
auto pos = column_->GetOptimizedGetPos(nav_->GetCurrentPos()).GetTakeClosePosition(); auto pos = column_->GetOptimizedGetPos(nav_->GetCurrentPos()).GetTakeClosePosition();
nav_->GoTo(pos, true, Pathfinding::FREE | Pathfinding::WALL); nav_->GoTo(pos, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE);
} }
step_ = GO_CLOSE_TO_COLUMN; step_ = GO_CLOSE_TO_COLUMN;
@@ -184,7 +184,7 @@ namespace Modelec
case GO_TO_PLATFORM: case GO_TO_PLATFORM:
{ {
auto p = closestDepoZonePoint_.GetTakeClosePosition(); auto p = closestDepoZonePoint_.GetTakeClosePosition();
nav_->GoTo(p.x, p.y, p.theta, true); nav_->GoTo(p.x, p.y, p.theta, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE);
} }
step_ = GO_CLOSE_TO_PLATFORM; step_ = GO_CLOSE_TO_PLATFORM;