Skip to content

Merge from master #621

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Sep 23, 2020
Merged

Merge from master #621

merged 1 commit into from
Sep 23, 2020

Conversation

caguero
Copy link
Contributor

@caguero caguero commented Sep 23, 2020

Sync from master.

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
@nkoenig nkoenig merged commit 55e1496 into citadel Sep 23, 2020
@caguero caguero deleted the master_to_citadel branch September 23, 2020 18:42
nkoenig added a commit that referenced this pull request Dec 17, 2020
* bump to citadel, update comms visualization

* Adding breadcrumbs to x1 config 7 & 8

* Added additional breadcrumbs

* Update to citadel

* Prevent breadcrumb topics

* Added breadcrumb handling to more launch files

* Apply patch

* Adjust spawn location of the breadcrumbs

* Update cave_circuit.ign to call the corect spawner method (#409)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Add disable_physics_time param to breadcrumb plugin to auto disable them

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Adding team base

* One team base only

* Cleanup after move from bitbucket

* Cleanup

* Remove extra whitespace

* Use https for git

* Cave Qual release

* Update Citadel and Urban Circuit

* Update Citadel and Urban Circuit

* bump to citadel, update comms visualization

* Update to citadel

* bump to citadel, update comms visualization

* Cleanup after rebase

* Updates based on review

* Missed one pose publisher

* one more RawPose

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Minor cmake tweaks

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Change colors for comms visualization.

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix docs

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Azeey/marsupial (#424)

* Add marsupial robots for cave_circuit

* Update example command

* Apply spawnWorldYaw to marsupial offsets

* Add marsupial vehicle support to cloudsim

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Update cloudsim_bridge and json2docker

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Suppress DetachableJoint missing child warning

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Added platform

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix platform position

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Combined spawn

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update submitted models

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Add missing changes from PRs #402 and #403

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Adjust platform height

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix deprecation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update to visibility RF model (#440)

* Testing.

* Remove debug code.

* Update to visibility RF model to account for radio characteristics and message size.

* Updated the static number of bytes in a message for communication visualization from 5 to 100.

Co-authored-by: Carlos Aguero <caguero@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>

* citadel dockerfiles

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged with master

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix dependencies

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Download models

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Path tracer (#545)

* Added a path tracer program that visualizes robot paths, artifacts, and artifact reports.

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added path tracer files

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup build and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Break out model download into separate docker image.

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update docker image name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating docker

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed merge

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Handle log files with no events.yml file, and also handle an error case in events.yml (#565)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Path tracer rtf (#596)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added more output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Account for time required to process the step

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Path tracer colors (#599)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Start of path tracer color yaml configuration

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Support yaml configuration for colors and rtf

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update to use DRY suggestion

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update subt_ign/src/path_tracer.cc

Co-authored-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>

* Merge from master (#621)

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>

* Missing include

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged with master

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Disable truth_controller

* Update to use Ignition Dome

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating dockerfiles

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating subt_sim_entry dockerfile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating model download

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update dockerfile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update dockefile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update subt_sim_entry

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update docker

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixing docker

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Improve git clone

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add back in ros_ign bridge to cloudsim_sim dockerfile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update all urban .dat files. (#721)

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>

* Update all tunnel .dat files. (#723)

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>

* Update dockerfiles

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Addisu Taddese <addisu@openrobotics.org>
Co-authored-by: acschang <61025344+acschang@users.noreply.github.com>
Co-authored-by: Carlos Aguero <caguero@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Carlos Agüero <caguero@osrfoundation.org>
nkoenig added a commit that referenced this pull request Jan 5, 2021
* bump to citadel, update comms visualization

* Adding breadcrumbs to x1 config 7 & 8

* Added additional breadcrumbs

* Update to citadel

* Prevent breadcrumb topics

* Added breadcrumb handling to more launch files

* Apply patch

* Adjust spawn location of the breadcrumbs

* Update cave_circuit.ign to call the corect spawner method (#409)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Add disable_physics_time param to breadcrumb plugin to auto disable them

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Adding team base

* One team base only

* Cleanup after move from bitbucket

* Cleanup

* Remove extra whitespace

* Use https for git

* Cave Qual release

* Update Citadel and Urban Circuit

* Update Citadel and Urban Circuit

* bump to citadel, update comms visualization

* Update to citadel

* bump to citadel, update comms visualization

* Cleanup after rebase

* Updates based on review

* Missed one pose publisher

* one more RawPose

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Minor cmake tweaks

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Change colors for comms visualization.

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix docs

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Azeey/marsupial (#424)

* Add marsupial robots for cave_circuit

* Update example command

* Apply spawnWorldYaw to marsupial offsets

* Add marsupial vehicle support to cloudsim

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Update cloudsim_bridge and json2docker

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Suppress DetachableJoint missing child warning

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Added platform

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix platform position

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Combined spawn

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update submitted models

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Add missing changes from PRs #402 and #403

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Adjust platform height

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix deprecation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update to visibility RF model (#440)

* Testing.

* Remove debug code.

* Update to visibility RF model to account for radio characteristics and message size.

* Updated the static number of bytes in a message for communication visualization from 5 to 100.

Co-authored-by: Carlos Aguero <caguero@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>

* citadel dockerfiles

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged with master

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix dependencies

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Download models

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Path tracer (#545)

* Added a path tracer program that visualizes robot paths, artifacts, and artifact reports.

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added path tracer files

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup build and address comments

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Break out model download into separate docker image.

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update docker image name

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating docker

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed merge

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Handle log files with no events.yml file, and also handle an error case in events.yml (#565)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Path tracer rtf (#596)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added more output

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Account for time required to process the step

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

* Path tracer colors (#599)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Start of path tracer color yaml configuration

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Support yaml configuration for colors and rtf

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update to use DRY suggestion

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update subt_ign/src/path_tracer.cc

Co-authored-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>

* Merge from master (#621)

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>

* Missing include

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Merged with master

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Disable truth_controller

* Update to use Ignition Dome

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating dockerfiles

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating subt_sim_entry dockerfile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updating model download

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update dockerfile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update dockefile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update subt_sim_entry

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update docker

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixing docker

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Improve git clone

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add back in ros_ign bridge to cloudsim_sim dockerfile

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Tunnel connection points

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* added subt_tunnel_staging_area

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed connection points

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Addisu Taddese <addisu@openrobotics.org>
Co-authored-by: acschang <61025344+acschang@users.noreply.github.com>
Co-authored-by: Carlos Aguero <caguero@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Carlos Agüero <caguero@osrfoundation.org>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants