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

Merge pull request #2 from modelec/develop

Browse Source 
Develop
This commit is contained in:
Ackimixs
2025-11-26 18:56:15 +01:00
committed by GitHub
parent a2e190dbc0 abb10a635f
commit d731e367a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.rasp.sh Normal file → Executable file
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
MAKEFLAGS="-j1" colcon build --symlink-install --executor sequential --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug MAKEFLAGS="-j1" colcon build --symlink-install --executor sequential --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON # -DCMAKE_BUILD_TYPE=Debug
source install/setup.bash source install/setup.bash

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

@@ -10,7 +10,7 @@ namespace Modelec {
node_ = node; node_ = node;
nav_->GoTo(2500, 1200, M_PI_2, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE); nav_->GoToRotateFirst(2500, 1200, M_PI_2, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE);
go_timeout_ = node_->now(); go_timeout_ = node_->now();
@@ -49,7 +49,7 @@ namespace Modelec {
break; break;
case WAIT_5S: case WAIT_5S:
go_timeout_ = node_->now(); go_timeout_ = node_->now();
nav_->GoTo(2000, 700, 0, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE); nav_->GoToRotateFirst(2000, 700, 0, true, Pathfinding::FREE | Pathfinding::WALL | Pathfinding::OBSTACLE);
step_ = GO_TO_SEND; step_ = GO_TO_SEND;
break; break;