-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Azeey/marsupial #424
Merged
Merged
Azeey/marsupial #424
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Can you try again with: 4889d0f, and also get the latest version of: https://app.ignitionrobotics.org/OpenRobotics/fuel/models/DronePlatformX1 |
I see. I'll have to create new models for each of the X1 models. |
Signed-off-by: Nate Koenig <[email protected]>
I've update this PR to spawn all vehicles at once. This now depends on: |
azeey
reviewed
May 20, 2020
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
…ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]>
azeey
reviewed
May 20, 2020
azeey
reviewed
May 20, 2020
azeey
approved these changes
May 20, 2020
nkoenig
added a commit
that referenced
this pull request
May 25, 2020
* Adding breadcrumbs to x1 config 7 & 8 * Added additional breadcrumbs * 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 <[email protected]> * Add disable_physics_time param to breadcrumb plugin to auto disable them Signed-off-by: Ian Chen <[email protected]> * Adding team base * One team base only * Updates based on review * Missed one pose publisher * 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 <[email protected]> * Update cloudsim_bridge and json2docker Signed-off-by: Addisu Z. Taddese <[email protected]> * Suppress DetachableJoint missing child warning Signed-off-by: Addisu Z. Taddese <[email protected]> * Added platform Signed-off-by: Nate Koenig <[email protected]> * Fix platform position Signed-off-by: Nate Koenig <[email protected]> * Combined spawn Signed-off-by: Nate Koenig <[email protected]> * Update submitted models Signed-off-by: Nate Koenig <[email protected]> * Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add missing changes from PRs #402 and #403 Signed-off-by: Addisu Z. Taddese <[email protected]> * Adjust platform height Signed-off-by: Nate Koenig <[email protected]> * Add level generator (#416) * add level generator Signed-off-by: Ian Chen <[email protected]> * comment and simplify code Signed-off-by: Ian Chen <[email protected]> * Tweaks to the level generator (#423) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> * fix typo Signed-off-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * worlds Signed-off-by: Nate Koenig <[email protected]> * Update tile_22 Signed-off-by: Nate Koenig <[email protected]> * openrobotics to OpenRobotics Signed-off-by: Nate Koenig <[email protected]> * Missed a few Signed-off-by: Nate Koenig <[email protected]> * Fix download_models Signed-off-by: Nate Koenig <[email protected]> * Remove std::regex from CommsBrokerPlugin. (#430) Signed-off-by: Carlos Aguero <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> * tweaks Signed-off-by: Nate Koenig <[email protected]> * remove transport unlimited buffers Signed-off-by: Nate Koenig <[email protected]> * all caps teambase Signed-off-by: Nate Koenig <[email protected]> * Uppercase Signed-off-by: Nate Koenig <[email protected]> * fix Signed-off-by: Nate Koenig <[email protected]> * fix capitalization Signed-off-by: Nate Koenig <[email protected]> * Fix deadlock Signed-off-by: Nate Koenig <[email protected]> * teambase update Signed-off-by: Nate Koenig <[email protected]> * teambase update Signed-off-by: Nate Koenig <[email protected]> * Fix a deadlock (#431) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Graceful fail if teambase is used multiple times in the config Signed-off-by: Nate Koenig <[email protected]> * Update gitignore Signed-off-by: Nate Koenig <[email protected]> * Fix docker Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Carlos Agüero <[email protected]> Co-authored-by: Carlos Aguero <[email protected]>
mjcarroll
added a commit
that referenced
this pull request
Jun 19, 2020
commit 3745fc5 Author: Nate Koenig <[email protected]> Date: Thu Jun 18 11:51:33 2020 -0700 Model submission for Freyja sensor configuration 1 from Robotika (#382) * Model submission for Freyja sensor configuration 1 from Robotika * Model submission for Freyja sensor configuration 1 from Robotika (FIXUP specification.md) * Update info about Freyja communication (LoRa) * Freyja - fix camera center * Robotika Freyja - fix filename model.urdf * Robotika Freyja - fix materials to be in parameters in range 0..1 * Robotika Freyja - fix mount parts of the wheel * Branch for pull request #423 * Virtual Freyja fixes * Virtual Freyja - fix power_load to reflect much longer durability * Adjustment of battery life to 240 minutes. * update model to use tf2 static pose messages, and added a better xacro file Signed-off-by: Nate Koenig <[email protected]> * spacing Signed-off-by: Nate Koenig <[email protected]> * Download model Signed-off-by: Nate Koenig <[email protected]> * Updated thumbnails and battery life Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: md <devnull@localhost> Co-authored-by: Martin Dlouhy <[email protected]> Co-authored-by: acschang <[email protected]> Co-authored-by: Arthur Schang <[email protected]> Co-authored-by: Nate Koenig <[email protected]> commit b8d43cb Author: Nate Koenig <[email protected]> Date: Thu Jun 18 11:27:16 2020 -0700 Submitted models/robotika kloubak sensor config 1 (#381) * Model submission for Kloubak sensor configuration 1 from Robotika * Kloubak URDF ver0 * Robotika Kloubak URDF ver1 * Robotika Kloubak - scale material parameters to 0..1 * Kloubak specification.md ver0 * Robotika Kloubak - update specification.md * Robotika Kloubak - fix also urdf/model.xacro (range 0..1) * Branch for pull request #431 * Robotika Kloubak K2 - fixes (lidar, odometry, battery power_load, ...) * Adjustment to route front and rear DiffDrive odometry to the appropriate topics. * Robotika Kloubak K2 - update specification * Robotika Kloubak K2 - update specification2 * Robotika Kloubak K2 - update specification3 * Update specifications.md with magnetometer and added optical frame publishers Signed-off-by: Nate Koenig <[email protected]> * Updating tf Signed-off-by: Nate Koenig <[email protected]> * Fix spawning Signed-off-by: Nate Koenig <[email protected]> * Updated to use photogrammetry meshes Signed-off-by: Nate Koenig <[email protected]> * Download model Signed-off-by: Nate Koenig <[email protected]> * 60 minutes of charge Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: md <devnull@localhost> Co-authored-by: Martin Dlouhy <[email protected]> Co-authored-by: acschang <[email protected]> Co-authored-by: Arthur Schang <[email protected]> Co-authored-by: Nate Koenig <[email protected]> commit 802628d Author: Nate Koenig <[email protected]> Date: Wed Jun 10 19:36:18 2020 -0700 Add falling rocks Signed-off-by: Nate Koenig <[email protected]> commit 9c1cd67 Author: Nate Koenig <[email protected]> Date: Wed Jun 10 19:34:26 2020 -0700 Add rock falls Signed-off-by: Nate Koenig <[email protected]> commit db5344b Author: Nate Koenig <[email protected]> Date: Wed Jun 10 13:05:42 2020 -0700 Cave feature release2 (#462) * Add falling rocks to cave practice circuit 1 (#446) * Add rock fall 1 Signed-off-by: Addisu Z. Taddese <[email protected]> * Add rock fall 2 Signed-off-by: Addisu Z. Taddese <[email protected]> * Add rock fall 3 Signed-off-by: Addisu Z. Taddese <[email protected]> * Change small rock fall to medium, update positions of large rock falls Signed-off-by: Addisu Z. Taddese <[email protected]> * Add falling rocks to cave practice circuit 2 (#447) * Adjustment of fading exponent from 2.5 to 1.5 for the cave circuit. * Add fading exponent to cloudsim launch files Signed-off-by: Nate Koenig <[email protected]> * Added dynamic rocks to cave practice world 2 Signed-off-by: Nate Koenig <[email protected]> * Remove debug output Signed-off-by: Nate Koenig <[email protected]> * Fix rock fall positions and types Signed-off-by: Nate Koenig <[email protected]> * Comments Signed-off-by: Nate Koenig <[email protected]> * Fix medium rock placements Signed-off-by: Nate Koenig <[email protected]> * Added rock fall, moved rocks out of collision Signed-off-by: Nate Koenig <[email protected]> * Doubled two rock falls, and reduced one to 3 deployments Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Arthur Schang <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add falling rocks to cave practice 3 (#448) * Add falling rocks to cave practice 3 Signed-off-by: Nate Koenig <[email protected]> * Comments Signed-off-by: Nate Koenig <[email protected]> * Move rocks out of collision Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Fix levels Signed-off-by: Nate Koenig <[email protected]> * Build the connection validator test (#455) * Build the connection validator test Signed-off-by: Nate Koenig <[email protected]> * Improve debug message Signed-off-by: Nate Koenig <[email protected]> * Removed probably Signed-off-by: Nate Koenig <[email protected]> * Make connection validator an executable Signed-off-by: Nate Koenig <[email protected]> * Update subt_ign/src/ConnectionValidatorPrivate.cc Co-authored-by: Michael Carroll <[email protected]> * Use a wider cap tolerance as a fallback This is because some of the cave caps have a non-zero connection point, but we do not propagate enough information to be able to compute the true connection point at this time. Signed-off-by: Michael Carroll <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: Arthur Schang <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> commit 69a4364 Author: Nate Koenig <[email protected]> Date: Thu Jun 4 12:03:28 2020 -0700 Support aws cli version 2 (#435) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> commit d62b4ab Author: acschang <[email protected]> Date: Wed Jun 3 19:30:52 2020 -0400 Cave Circuit Communication Adjustment (#441) * Adjustment of fading exponent from 2.5 to 1.5 for the cave circuit. * Add fading exponent to cloudsim launch files Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> commit d6d35eb Author: Nate Koenig <[email protected]> Date: Mon May 25 13:02:28 2020 -0700 Fix tiles Signed-off-by: Nate Koenig <[email protected]> commit 03baf43 Author: Nate Koenig <[email protected]> Date: Mon May 25 09:48:28 2020 -0700 Cave feature release1 (#426) * Adding breadcrumbs to x1 config 7 & 8 * Added additional breadcrumbs * 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 <[email protected]> * Add disable_physics_time param to breadcrumb plugin to auto disable them Signed-off-by: Ian Chen <[email protected]> * Adding team base * One team base only * Updates based on review * Missed one pose publisher * 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 <[email protected]> * Update cloudsim_bridge and json2docker Signed-off-by: Addisu Z. Taddese <[email protected]> * Suppress DetachableJoint missing child warning Signed-off-by: Addisu Z. Taddese <[email protected]> * Added platform Signed-off-by: Nate Koenig <[email protected]> * Fix platform position Signed-off-by: Nate Koenig <[email protected]> * Combined spawn Signed-off-by: Nate Koenig <[email protected]> * Update submitted models Signed-off-by: Nate Koenig <[email protected]> * Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add missing changes from PRs #402 and #403 Signed-off-by: Addisu Z. Taddese <[email protected]> * Adjust platform height Signed-off-by: Nate Koenig <[email protected]> * Add level generator (#416) * add level generator Signed-off-by: Ian Chen <[email protected]> * comment and simplify code Signed-off-by: Ian Chen <[email protected]> * Tweaks to the level generator (#423) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> * fix typo Signed-off-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * worlds Signed-off-by: Nate Koenig <[email protected]> * Update tile_22 Signed-off-by: Nate Koenig <[email protected]> * openrobotics to OpenRobotics Signed-off-by: Nate Koenig <[email protected]> * Missed a few Signed-off-by: Nate Koenig <[email protected]> * Fix download_models Signed-off-by: Nate Koenig <[email protected]> * Remove std::regex from CommsBrokerPlugin. (#430) Signed-off-by: Carlos Aguero <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> * tweaks Signed-off-by: Nate Koenig <[email protected]> * remove transport unlimited buffers Signed-off-by: Nate Koenig <[email protected]> * all caps teambase Signed-off-by: Nate Koenig <[email protected]> * Uppercase Signed-off-by: Nate Koenig <[email protected]> * fix Signed-off-by: Nate Koenig <[email protected]> * fix capitalization Signed-off-by: Nate Koenig <[email protected]> * Fix deadlock Signed-off-by: Nate Koenig <[email protected]> * teambase update Signed-off-by: Nate Koenig <[email protected]> * teambase update Signed-off-by: Nate Koenig <[email protected]> * Fix a deadlock (#431) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Graceful fail if teambase is used multiple times in the config Signed-off-by: Nate Koenig <[email protected]> * Update gitignore Signed-off-by: Nate Koenig <[email protected]> * Fix docker Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Carlos Agüero <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> commit 54b4b1e Author: Nate Koenig <[email protected]> Date: Thu May 21 13:32:24 2020 -0700 Fix validator to use TF2 (#428) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> commit 76a1587 Author: Addisu Taddese <[email protected]> Date: Wed May 20 17:58:03 2020 -0500 Fixes a segfault during exit of SubT simulation (#427) Making an ign-transport request from withing a destructor context seems to cause a segfault. This replaces the request with an event. Signed-off-by: Addisu Z. Taddese <[email protected]> commit 6d91304 Author: Nate Koenig <[email protected]> Date: Wed May 20 15:35:54 2020 -0700 Cave Type A tiles (#422) * Cave Type A tiles Signed-off-by: Nate Koenig <[email protected]> * Added DronePlatformX1 Signed-off-by: Nate Koenig <[email protected]> * Added Type A light tiles Signed-off-by: Nate Koenig <[email protected]> * Reorder Signed-off-by: Nate Koenig <[email protected]> * Added transition tile Signed-off-by: Nate Koenig <[email protected]> * Removed old transition tile Signed-off-by: Nate Koenig <[email protected]> * sync changes Signed-off-by: Ian Chen <[email protected]> * fix cave elevation straight lights connection point Signed-off-by: Ian Chen <[email protected]> * Added transition tile with lights Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> commit f869fb0 Merge: 0eed307 86fa520 Author: Nate Koenig <[email protected]> Date: Tue May 19 15:49:24 2020 -0700 Merge pull request #419 from osrf/typeb Switch to Type B tiles commit 86fa520 Author: Nate Koenig <[email protected]> Date: Tue May 19 09:06:23 2020 -0700 Fix tsv files Signed-off-by: Nate Koenig <[email protected]> commit 11bba64 Author: Nate Koenig <[email protected]> Date: Fri May 15 05:53:49 2020 -0700 Switch to Type B tiles Signed-off-by: Nate Koenig <[email protected]> commit 0eed307 Author: iche033 <[email protected]> Date: Thu May 14 13:54:17 2020 -0700 Add optical frame publisher (#413) * check topic heartbeat and log /X*/pose topics * use pose_v and subt to pose_static * cleanup * Rename parameters * move heartbeat check into its own thread * add optical frame publisher and update vehicle topics Signed-off-by: Ian Chen <[email protected]> * fix rotation Signed-off-by: Ian Chen <[email protected]> * update optical frame publisher args Signed-off-by: Ian Chen <[email protected]> * lazy subscription Signed-off-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> commit e615b31 Author: iche033 <[email protected]> Date: Thu May 14 13:46:27 2020 -0700 Reduce /<robot_name>/pose topic bandwidth (#402) * check topic heartbeat and log /X*/pose topics * use pose_v and subt to pose_static * cleanup * Rename parameters * move heartbeat check into its own thread Co-authored-by: Nate Koenig <[email protected]> commit 9132c0c Merge: 4510ab2 da4ba98 Author: Nate Koenig <[email protected]> Date: Wed Apr 22 14:43:47 2020 -0700 Merge pull request #405 from osrf/cave_qual_release Cave Qual release commit da4ba98 Author: Nate Koenig <[email protected]> Date: Mon Apr 20 15:57:39 2020 -0700 Cave Qual release commit 4510ab2 Merge: b6136bb 0a4d7d0 Author: Nate Koenig <[email protected]> Date: Mon Apr 20 10:49:59 2020 -0700 Merge pull request #392 from osrf/cave_prep Cave prep commit 0a4d7d0 Author: Nate Koenig <[email protected]> Date: Tue Apr 14 14:37:58 2020 -0700 Use https for git commit 51d05fa Author: Nate Koenig <[email protected]> Date: Tue Apr 14 05:53:07 2020 -0700 Remove extra whitespace commit 388b133 Author: Nate Koenig <[email protected]> Date: Tue Apr 14 05:51:14 2020 -0700 Cleanup commit 16d3d6a Author: Nate Koenig <[email protected]> Date: Tue Apr 14 05:50:41 2020 -0700 Cleanup after move from bitbucket commit b6136bb Merge: 0f9d2cf 5064c01 Author: Nate Koenig <[email protected]> Date: Tue Apr 14 05:23:27 2020 -0700 Merge pull request #391 from osrf/connection_helper_lights Add cave tile with lights to connection helper commit 0f9d2cf Merge: 82f6982 1d1c233 Author: Nate Koenig <[email protected]> Date: Tue Apr 14 05:22:29 2020 -0700 Merge pull request #390 from osrf/connection_validator_helper Reuse ConnectionHelper code in ConnectionValidator commit 5064c01 Author: Ian Chen <[email protected]> Date: Mon Apr 13 21:33:29 2020 -0700 add cave tile with lights to connection helper commit 1d1c233 Author: Ian Chen <[email protected]> Date: Fri Apr 10 20:33:38 2020 -0700 reuse connection helper code in connection validator commit 82f6982 Author: Nate Koenig <[email protected]> Date: Thu Apr 9 12:35:07 2020 -0700 README update commit 00c610d Author: Nate Koenig <[email protected]> Date: Thu Apr 9 12:17:11 2020 -0700 Migration commit 2f63e31 Merge: aeabab7 8a476fc Author: Nate Koenig <[email protected]> Date: Wed Apr 8 20:14:30 2020 +0000 Merged in dot_generator (pull request #437) Generate DOT from SDF Approved-by: Ashton Larkin <[email protected]> Approved-by: Nate Koenig <[email protected]> commit 8a476fc Author: Nate Koenig <[email protected]> Date: Wed Apr 8 20:14:30 2020 +0000 Close branch dot_generator commit 87c9e6c Author: Nate Koenig <[email protected]> Date: Wed Apr 8 06:50:50 2020 -0700 Reduce diffs, and make staging area connections cost 1 commit b6932f2 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 06:33:21 2020 -0700 Change cost of stairwell platform commit 6ad2b7d Author: Nate Koenig <[email protected]> Date: Wed Apr 8 06:23:35 2020 -0700 Make the vertex numbers match the old dot files commit 31bf464 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 06:05:00 2020 -0700 Altered output to reduce diff with old dot files commit 4f2e14c Merge: 6d5d77d d49b827 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 05:35:41 2020 -0700 merged commit 6d5d77d Merge: 5365fbc aeabab7 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 05:35:31 2020 -0700 merged with default commit aeabab7 Merge: dd2d147 0ed9e69 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 12:34:59 2020 +0000 Merged in breadcrumb_comms_part2 (pull request #422) Communication support for breadcrumbs - part 2 Approved-by: Nate Koenig <[email protected]> commit 0ed9e69 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 12:34:59 2020 +0000 Close branch breadcrumb_comms_part2 commit c71ebc0 Author: Nate Koenig <[email protected]> Date: Wed Apr 8 05:34:37 2020 -0700 Removed breadcrumbs from the current models commit d49b827 Author: Ian Chen <[email protected]> Date: Tue Apr 7 21:51:06 2020 -0700 style commit 16844b8 Author: Nate Koenig <[email protected]> Date: Tue Apr 7 16:18:01 2020 -0700 Added placeholder breadcrumb model commit d93c0f9 Merge: db8a8e0 71a1922 Author: Nate Koenig <[email protected]> Date: Tue Apr 7 15:45:35 2020 -0700 Merged with default commit 71a1922 Author: Nate Koenig <[email protected]> Date: Tue Apr 7 15:45:17 2020 -0700 remove garbage commit db8a8e0 Merge: cedcaa8 d3ad089 Author: Nate Koenig <[email protected]> Date: Tue Apr 7 15:35:17 2020 -0700 Merged with default commit 5365fbc Author: Ian Chen <[email protected]> Date: Mon Apr 6 13:01:07 2020 -0700 add connection helper and update cmake commit 3f03162 Author: Nate Koenig <[email protected]> Date: Mon Apr 6 09:37:11 2020 -0700 Sdf to Dot generator commit dd2d147 Merge: 108a603 9108050 Author: Nate Koenig <[email protected]> Date: Mon Apr 6 16:17:18 2020 +0000 Merged in connection_validator (pull request #436) Connection validator Approved-by: Michael Carroll <[email protected]> commit 9108050 Author: Nate Koenig <[email protected]> Date: Mon Apr 6 16:17:18 2020 +0000 Close branch connection_validator commit 7313fd1 Author: Nate Koenig <[email protected]> Date: Mon Apr 6 07:48:44 2020 -0700 Connection validator commit 108a603 Merge: 3d8cdee d442fc3 Author: Nate Koenig <[email protected]> Date: Mon Apr 6 13:31:20 2020 +0000 Merged in rostopic_stats_logger (pull request #433) ROS topic statistics logger Approved-by: Nate Koenig <[email protected]> commit d442fc3 Author: Nate Koenig <[email protected]> Date: Mon Apr 6 13:31:20 2020 +0000 Close branch rostopic_stats_logger commit 3d8cdee Merge: 9da2c21 123bd7b Author: Nate Koenig <[email protected]> Date: Mon Apr 6 13:30:51 2020 +0000 Merged in atop (pull request #435) Add atop process monitoring Approved-by: Nate Koenig <[email protected]> commit 123bd7b Author: Nate Koenig <[email protected]> Date: Mon Apr 6 13:30:51 2020 +0000 Close branch atop commit 8f26930 Author: Ian Chen <[email protected]> Date: Thu Apr 2 15:50:56 2020 -0700 add atop process monitoring commit 3a07c42 Author: Ian Chen <[email protected]> Date: Tue Mar 31 16:35:19 2020 -0700 add script commit a610ef5 Author: Ian Chen <[email protected]> Date: Tue Mar 31 16:31:30 2020 -0700 add rostopic_stats_logger commit cedcaa8 Author: Addisu Z. Taddese <[email protected]> Date: Tue Mar 31 12:32:31 2020 -0500 Fix string comparison commit e09d5cf Author: Addisu Z. Taddese <[email protected]> Date: Tue Mar 31 12:29:40 2020 -0500 Fix calculation of vertex IDs for relays commit d3ad089 Merge: 0d2c76a febd6e0 Author: Neil Johnson <[email protected]> Date: Thu Mar 26 14:00:54 2020 -0600 Merged osrf/subt into default commit 60dceb0 Author: Carlos Aguero <[email protected]> Date: Sun Mar 22 16:08:58 2020 +0100 Use breadcrumb model. commit 8af95d6 Author: Carlos Aguero <[email protected]> Date: Sat Mar 21 17:15:57 2020 +0100 Adding ROS API to breadcrumbs commit d228a87 Author: Carlos Aguero <[email protected]> Date: Fri Mar 20 22:39:27 2020 +0100 Enable breadcrumbs for X1 and X2. commit 0d2c76a Author: bfotheri <[email protected]> Date: Tue Mar 17 10:57:15 2020 -0600 Made marble folder commit d83fdd5 Author: bfotheri <[email protected]> Date: Tue Mar 17 10:49:05 2020 -0600 testing to see if I brett can commit a dummy file Signed-off-by: Michael Carroll <[email protected]>
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 <[email protected]> * Add disable_physics_time param to breadcrumb plugin to auto disable them Signed-off-by: Ian Chen <[email protected]> * 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 <[email protected]> * Minor cmake tweaks Signed-off-by: Nate Koenig <[email protected]> * Change colors for comms visualization. Signed-off-by: Nate Koenig <[email protected]> * Fix docs Signed-off-by: Nate Koenig <[email protected]> * 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 <[email protected]> * Update cloudsim_bridge and json2docker Signed-off-by: Addisu Z. Taddese <[email protected]> * Suppress DetachableJoint missing child warning Signed-off-by: Addisu Z. Taddese <[email protected]> * Added platform Signed-off-by: Nate Koenig <[email protected]> * Fix platform position Signed-off-by: Nate Koenig <[email protected]> * Combined spawn Signed-off-by: Nate Koenig <[email protected]> * Update submitted models Signed-off-by: Nate Koenig <[email protected]> * Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add missing changes from PRs #402 and #403 Signed-off-by: Addisu Z. Taddese <[email protected]> * Adjust platform height Signed-off-by: Nate Koenig <[email protected]> * Fix deprecation Signed-off-by: Nate Koenig <[email protected]> * Fix build Signed-off-by: Nate Koenig <[email protected]> * 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 <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * citadel dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Fix dependencies Signed-off-by: Nate Koenig <[email protected]> * Download models Signed-off-by: Nate Koenig <[email protected]> * Path tracer (#545) * Added a path tracer program that visualizes robot paths, artifacts, and artifact reports. Signed-off-by: Nate Koenig <[email protected]> * Added path tracer files Signed-off-by: Nate Koenig <[email protected]> * Cleanup build and address comments Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Break out model download into separate docker image. Signed-off-by: Nate Koenig <[email protected]> * Cleanup Signed-off-by: Nate Koenig <[email protected]> * Update docker image name Signed-off-by: Nate Koenig <[email protected]> * Updating docker Signed-off-by: Nate Koenig <[email protected]> * Fixed merge Signed-off-by: Nate Koenig <[email protected]> * Handle log files with no events.yml file, and also handle an error case in events.yml (#565) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer rtf (#596) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Added more output Signed-off-by: Nate Koenig <[email protected]> * Account for time required to process the step Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer colors (#599) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Start of path tracer color yaml configuration Signed-off-by: Nate Koenig <[email protected]> * Support yaml configuration for colors and rtf Signed-off-by: Nate Koenig <[email protected]> * Update to use DRY suggestion Signed-off-by: Nate Koenig <[email protected]> * Update subt_ign/src/path_tracer.cc Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> * Merge from master (#621) Signed-off-by: Carlos Agüero <[email protected]> * Missing include Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Disable truth_controller * Update to use Ignition Dome Signed-off-by: Nate Koenig <[email protected]> * Updating dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Updating subt_sim_entry dockerfile Signed-off-by: Nate Koenig <[email protected]> * Updating model download Signed-off-by: Nate Koenig <[email protected]> * Update dockerfile Signed-off-by: Nate Koenig <[email protected]> * Update dockefile Signed-off-by: Nate Koenig <[email protected]> * Update subt_sim_entry Signed-off-by: Nate Koenig <[email protected]> * Update docker Signed-off-by: Nate Koenig <[email protected]> * Fixing docker Signed-off-by: Nate Koenig <[email protected]> * Improve git clone Signed-off-by: Nate Koenig <[email protected]> * Add back in ros_ign bridge to cloudsim_sim dockerfile Signed-off-by: Nate Koenig <[email protected]> * Update all urban .dat files. (#721) Signed-off-by: Carlos Agüero <[email protected]> * Update all tunnel .dat files. (#723) Signed-off-by: Carlos Agüero <[email protected]> * Update dockerfiles Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: acschang <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Carlos Agüero <[email protected]>
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 <[email protected]> * Add disable_physics_time param to breadcrumb plugin to auto disable them Signed-off-by: Ian Chen <[email protected]> * 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 <[email protected]> * Minor cmake tweaks Signed-off-by: Nate Koenig <[email protected]> * Change colors for comms visualization. Signed-off-by: Nate Koenig <[email protected]> * Fix docs Signed-off-by: Nate Koenig <[email protected]> * 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 <[email protected]> * Update cloudsim_bridge and json2docker Signed-off-by: Addisu Z. Taddese <[email protected]> * Suppress DetachableJoint missing child warning Signed-off-by: Addisu Z. Taddese <[email protected]> * Added platform Signed-off-by: Nate Koenig <[email protected]> * Fix platform position Signed-off-by: Nate Koenig <[email protected]> * Combined spawn Signed-off-by: Nate Koenig <[email protected]> * Update submitted models Signed-off-by: Nate Koenig <[email protected]> * Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Add missing changes from PRs #402 and #403 Signed-off-by: Addisu Z. Taddese <[email protected]> * Adjust platform height Signed-off-by: Nate Koenig <[email protected]> * Fix deprecation Signed-off-by: Nate Koenig <[email protected]> * Fix build Signed-off-by: Nate Koenig <[email protected]> * 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 <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * citadel dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Fix dependencies Signed-off-by: Nate Koenig <[email protected]> * Download models Signed-off-by: Nate Koenig <[email protected]> * Path tracer (#545) * Added a path tracer program that visualizes robot paths, artifacts, and artifact reports. Signed-off-by: Nate Koenig <[email protected]> * Added path tracer files Signed-off-by: Nate Koenig <[email protected]> * Cleanup build and address comments Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Break out model download into separate docker image. Signed-off-by: Nate Koenig <[email protected]> * Cleanup Signed-off-by: Nate Koenig <[email protected]> * Update docker image name Signed-off-by: Nate Koenig <[email protected]> * Updating docker Signed-off-by: Nate Koenig <[email protected]> * Fixed merge Signed-off-by: Nate Koenig <[email protected]> * Handle log files with no events.yml file, and also handle an error case in events.yml (#565) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer rtf (#596) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Added more output Signed-off-by: Nate Koenig <[email protected]> * Account for time required to process the step Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> * Path tracer colors (#599) * Modify path tracer to use an RTF value Signed-off-by: Nate Koenig <[email protected]> * Start of path tracer color yaml configuration Signed-off-by: Nate Koenig <[email protected]> * Support yaml configuration for colors and rtf Signed-off-by: Nate Koenig <[email protected]> * Update to use DRY suggestion Signed-off-by: Nate Koenig <[email protected]> * Update subt_ign/src/path_tracer.cc Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> * Merge from master (#621) Signed-off-by: Carlos Agüero <[email protected]> * Missing include Signed-off-by: Nate Koenig <[email protected]> * Merged with master Signed-off-by: Nate Koenig <[email protected]> * Disable truth_controller * Update to use Ignition Dome Signed-off-by: Nate Koenig <[email protected]> * Updating dockerfiles Signed-off-by: Nate Koenig <[email protected]> * Updating subt_sim_entry dockerfile Signed-off-by: Nate Koenig <[email protected]> * Updating model download Signed-off-by: Nate Koenig <[email protected]> * Update dockerfile Signed-off-by: Nate Koenig <[email protected]> * Update dockefile Signed-off-by: Nate Koenig <[email protected]> * Update subt_sim_entry Signed-off-by: Nate Koenig <[email protected]> * Update docker Signed-off-by: Nate Koenig <[email protected]> * Fixing docker Signed-off-by: Nate Koenig <[email protected]> * Improve git clone Signed-off-by: Nate Koenig <[email protected]> * Add back in ros_ign bridge to cloudsim_sim dockerfile Signed-off-by: Nate Koenig <[email protected]> * Tunnel connection points Signed-off-by: Nate Koenig <[email protected]> * added subt_tunnel_staging_area Signed-off-by: Nate Koenig <[email protected]> * Fixed connection points Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Ian Chen <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Taddese <[email protected]> Co-authored-by: acschang <[email protected]> Co-authored-by: Carlos Aguero <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Carlos Agüero <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a copy of the contents in #396 with the addition of drone platform model.
The following is from #396.
This adds a command line argument
marsupial#:=<parentRobotName>:<childRobotName>
whereparentRobotName
andchildRobotName
are names of robots specified usingrobotName#
. The variableMARSUPIAL_VALID_PARENT_ROBOT_TYPES
is used to store valid parent robot types, which is currently just theX1
. Similarly,MARSUPIAL_VALID_CHILD_ROBOT_TYPES
is used to store valid child robot types, which is currently just theX3
.It works by adding the
DetachableJoint
system to the parent robot. This is done by parsing the XML string generated by thespawn
functions and injecting the<plugin>
tag for theDetachableJoint
.This PR adds a new topic, /detach`, which is used for detaching the child robot.
Example
To detach
Xb
, run:rostopic pub /Xb/detach std_msgs/Empty "{}"
Known Issues
There is currently a bug that seems to disable collisions between detached robots and the rest of the environmentSee ign-physics PR 31