Skip to content

Conversation

@Carter90
Copy link
Contributor

Proposed solution for issue #212 @wfvining

I alas do not have a Swarmie this turkey day eve, so I am unable to test.

Testing the run.sh changes:
From home you could run ./SwarmBaseCode-ROS/run.sh this will use dirname
From SwarmBaseCode-ROS/src/behaviours/src you could run it as ../../../run.sh this will use catkin locate

And essentially the same for both
misc/deploy.sh
misc/rover_launch_local.sh

…tkin locate and outside using dirname

Testing:
From home you could run `./SwarmBaseCode-ROS/run.sh` this will use dirname
From SwarmBaseCode-ROS/src/behaviours/src you could run it as ../../../run.sh this will use catkin locate
…e repo using catkin locate and outside using dirname
Copy link
Contributor

@wfvining wfvining left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good with a few changes; however, it may be incomplete.

  • The start_robots.sh script needs to be catkinized
  • as does stop_robots.sh

cd ..
dirPath="$(pwd)"
dirName="$(basename `pwd`)"
export dirPath="$(catkin locate)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be exported to the environment?

Suggested change
export dirPath="$(catkin locate)"
dirPath="$(catkin locate)"

@@ -1,3 +1,5 @@
#!/bin/bash
export SWARMATHON_APP_ROOT="$(catkin locate)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Suggested change
export SWARMATHON_APP_ROOT="$(catkin locate)"
SWARMATHON_APP_ROOT="$(catkin locate)"

export GAZEBO_MODEL_PATH="$PWD/simulation/models"
export GAZEBO_PLUGIN_PATH="$PWD/build/gazebo_plugins"
source "$PWD/devel/setup.bash"
export SWARMATHON_APP_ROOT="$(catkin locate)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Suggested change
export SWARMATHON_APP_ROOT="$(catkin locate)"
SWARMATHON_APP_ROOT="$(catkin locate)"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Carter90 awesome that you're working on this!

mike-matera pushed a commit to mike-matera/SwarmBaseCode-ROS that referenced this pull request Dec 31, 2019
Filter out poorly detected home tags during find home corner
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants