-
Notifications
You must be signed in to change notification settings - Fork 32
Torrent and repeat #262
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
Draft
becaanth
wants to merge
544
commits into
main
Choose a base branch
from
torrent_and_repeat
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Torrent and repeat #262
Changes from all commits
Commits
Show all changes
544 commits
Select commit
Hold shift + click to select a range
227f462
Update separation distance. Change min speed to classify as error
99cf1e5
Merge branch 'lelr-devel' of 10.1.0.5:/home/lelr/ASRL/vtr3/src into l…
a-krawciw 021a8ac
Add varying robot icon colours
lanton97 b301b8c
Add read only graph access
a-krawciw df812bb
Implement convoy manager to allow switching control modes live on the…
a-krawciw 740d3f2
Fix move robot front end bug
lanton97 6cecd45
Fix move robot tool backend
lanton97 f876042
Add read only graph access
a-krawciw 03ff16e
Implement convoy manager to allow switching control modes live on the…
a-krawciw f5e7291
Modify launch files and fix typo
a-krawciw 9920c1f
Update convoy manager
a-krawciw 2d695ea
Fix convoy manager
a-krawciw 9cb38b6
Update launch
a-krawciw 03b6c76
Typo
a-krawciw bba0711
Updates for debugging
a-krawciw 43a6f49
Add path planning logs
a-krawciw 5dbd7d8
Always call service
a-krawciw a573681
Change pose graph
a-krawciw e26dd0f
Update the convoy manager to only cancel follwers' repeats
a-krawciw fc70f2a
Change parameters so that they work properly
a-krawciw 5331c58
Fix namespace
a-krawciw ba587d2
Restore null pointer check
a-krawciw d7d3124
Fix convoy manager
a-krawciw 74e66d9
Check if the goal queues are matched
a-krawciw 0be0818
Fix control period
a-krawciw 726b665
Fix mission server logic
a-krawciw 456195f
Dont clear all goals on a cancel
a-krawciw 457cf76
Merge branch 'convoy' into lelr-devel
lanton97 31439bf
Merge remote-tracking branch 'refs/remotes/origin/convoy' into convoy
lanton97 5cd1c7d
Merge branch 'convoy' into lelr-devel
lanton97 89533ea
Fix missed merge conflicts
lanton97 0e8e348
Fix xml
eb7e60f
Lelr convoy config change
a-krawciw 66ddc4c
Merge remote-tracking branch 'foxtrot/lelr-devel' into lelr-devel
lanton97 a863636
Change config files to new format
a-krawciw be4563d
Revert issue with package.xml
a-krawciw 76429ef
Fix errant config space
a-krawciw 0f61149
Fix indent in yaml
a-krawciw c9ac239
Add missing domain ID
a-krawciw 1127906
Change logging
a-krawciw 626cca3
Fix config issue with the planner type
a-krawciw dc0c2e4
Fixindentation in config
a-krawciw 69b97bb
Add a better None check
a-krawciw 60dd3a1
Change logic of ending goals
a-krawciw 098dc07
Merge remote-tracking branch 'refs/remotes/origin/lelr-devel' into le…
lanton97 71d3598
Update cancel goal logic
a-krawciw 6003dac
Changes to cancelling goals
a-krawciw 196885c
Add pause state to state machine, as well as pause exit comman
lanton97 b6678bf
Remove exit pause mission command
lanton97 2cc949c
Add new goal types to GUI display
lanton97 6af5579
Merge branch 'lelr-devel' of github.com:utiasASRL/vtr3 into lelr-devel
a-krawciw 9f22d47
Merge remote-tracking branch 'refs/remotes/origin/lelr-devel' into le…
lanton97 82a0e68
Change invalid id to zeros
a-krawciw 81e0655
Connect GUI to convoy route planner for repeat goals
lanton97 7999956
Cache robot vertex index and send to convoy route planner
lanton97 f2f705f
Merge remote-tracking branch 'refs/remotes/origin/lelr-devel' into le…
lanton97 dc9203b
Add an auto pause during a direction switch to allow the robots to sy…
a-krawciw 31662e2
Merge branch 'lelr-devel' of github.com:utiasASRL/vtr3 into lelr-devel
a-krawciw c4b817e
Update arrows to match default
a-krawciw 06e5379
Change finishing behaviour
a-krawciw 35e46ef
Change cancel goal
a-krawciw 5953895
Add eop logging
a-krawciw a00d57f
Force a zero command when we pause the controller.
a-krawciw c09474a
Tell the controller to stop immediately at eop
a-krawciw d541fd3
Remove setTrunk call from pause state
lanton97 43ba9c9
Change force vertex and add a log
a-krawciw 82baf29
EOP
a-krawciw 36298aa
Resolve git merge duplications
a-krawciw d5e8e3a
Changes to EOP behaviour
6b7487a
Move graph search
a-krawciw 5ee4197
Merge branch 'lelr-devel' of 10.1.0.5:/home/lelr/ASRL/vtr3/src into l…
a-krawciw ddc11d8
Add cancel all goals button
lanton97 c2eda50
Update convoy manager to check robot current positions and headings (…
lanton97 951a7c7
Fix typo in convoy manager flag
lanton97 f609a1e
Merge branch 'lelr-devel' of github.com:utiasASRL/vtr3 into lelr-devel
a-krawciw 0dbb336
Revert speed config
a-krawciw 6144222
Add distinct min vel at the end of path
a-krawciw c00bc9c
Restore change to publish odometry from the root.
a-krawciw e611437
Add search range so localize mode changes vertex id
lanton97 3eadc75
Merge branch 'lelr-devel' of 10.0.0.5:/home/lelr/ASRL/vtr3/src into l…
lanton97 8aa738d
Better run time. Collect better ros bags.
a-krawciw 92467fa
Retain intermediate waypoints on convoy route planning
a-krawciw 0e3a8d9
Merge branch 'lelr-devel' of 10.0.0.5:/home/lelr/ASRL/vtr3/src into l…
a-krawciw 8061cba
Add eop min vel
5db900e
Fix adding waypoints in single robot GUI
lanton97 90a1f52
Merge remote-tracking branch 'foxtrot/lelr-devel' into lelr-devel
lanton97 a056f31
Change the setup server to sync between two robots
a-krawciw 2f263c4
Merge branch 'lelr-devel' of github.com:utiasASRL/vtr3 into lelr-devel
a-krawciw e54bb68
Move cancel all goals button
lanton97 4ba633e
Update the map to world tf
a-krawciw 7866ccf
Downsample more
a-krawciw 1f819fb
Change graph search to privilged grpah only
a-krawciw 7ae8fac
Merge remote-tracking branch 'refs/remotes/origin/lelr-devel' into le…
lanton97 76433e3
Error out on critical TF missing
lanton97 a92f382
Add pose graph smoother script and auto run on state exit.
a-krawciw 0752597
Publish the estimated distance to ros
a-krawciw 3ef037a
Merge branch 'lelr-devel' of github.com:utiasASRL/vtr3 into lelr-devel
a-krawciw b9f3c84
Retain intermediate waypoints on convoy route planning
a-krawciw 103b7e1
Modify config params
a-krawciw cb8d217
Change the follower to request the leader's route again
a-krawciw 559d454
Increase TF timeout
a-krawciw 1d46546
Update convoy manager to listen to the right convoy param
a-krawciw 530e12d
Merge branch 'lelr-devel' of 10.0.0.5:/home/lelr/ASRL/vtr3/src into l…
a-krawciw 7da860a
Base level clean up
a-krawciw 812bf21
Fix pose graph smoother to accept command line args
a-krawciw 8a41b34
Change convoy manager to select different possible controllers
a-krawciw b19a923
Update the launch files to use the new hunter launch
a-krawciw 9d7f1d5
Merge pull request #257 from utiasASRL/lelr-merge
lanton97 41abc40
Modifications to arc length at CSA
f694c05
Merge branch 'convoy' of 192.168.2.42:/home/indro/ASRL/vtr3/src into …
a-krawciw b9d92fe
Add new params for figure eight
a-krawciw 20b48c8
Add timestamp to reference pose publishing
lanton97 0f0ba11
Merge branch 'convoy' of 192.168.3.42:/home/indro/ASRL/vtr3/src into …
lanton97 a7787dd
Update hunter config to launch setup client as well
lanton97 97a50f0
Fix frame namespacing for multi-robot case
lanton97 7475c85
Add setup client blocking call to convoy launch
lanton97 9934b8e
Move first order lag to base MPC config
lanton97 77845fb
Remove joint MPC tracker
lanton97 a1ee063
Remove joint mpc header include
lanton97 89d090c
Minor cleanup and some shuffling of function args and config members
lanton97 9a7aa2f
Point unicycle at base MPC class - no corresponding changes casadi SO…
lanton97 d0e0771
Remove python joint MPC refs
lanton97 651e9ae
Fix config namespacing and launch args for convoy route-planner
lanton97 45ccf67
Connect casadi solver cost parameters to ROS2 node configs
lanton97 c6feb66
Uncomment throwing errors on casadi failure
lanton97 4851cb0
init commit, need to fix bugs
ElliotP-K 908ecd7
Build error fixes plus config parameter loading
ElliotP-K 3d21685
Fix duplicate instantiation of ROS params
lanton97 5e1e6f9
minor unicycle mpc parameter fix + warthog unicycle config parameters
ElliotP-K 6bc45e5
Fix loading of config
lanton97 f3be0f1
tested new unicycle code
ElliotP-K fc8da7a
init commit, need to fix bugs
ElliotP-K a519190
Build error fixes plus config parameter loading
ElliotP-K de39f74
Hunter unicycle follower test configs
ElliotP-K 85a64d2
Added convoy params for unicycle test
ElliotP-K a2a8391
trying to push to robot
ElliotP-K 9991eab
Pointing robots to unicycle
ElliotP-K 50840bc
Refactor sim for unicycle MPC
lanton97 4c801dc
mrs_peacock remote
becaanth 7d3630b
Merge remote-tracking branch 'refs/remotes/origin/convoy' into convoy
lanton97 ed6e3ab
unicycle follower sim
becaanth b20b68d
fixed unicycle_mpc_path_tracker.cpp merge issue
becaanth 67d7dc1
feat: unicycle convoy proof of life; unicycle_follow_solver.py, run_c…
becaanth 6225994
feat: proof of life for unicycle convoy
lanton97 2b4715a
init commit, need to fix bugs
ElliotP-K a9c379a
mrs_peacock remote
becaanth c10f99f
unicycle follower sim
becaanth 16b84c5
feat: convoy unicycle proof of life
becaanth 3d2346a
completed rebase
becaanth 0deac55
Partial updates from follower proof of life
ElliotP-K 6091b51
Merge branch 'convoy_unicycle_follower_updates' of github.com:utiasAS…
ElliotP-K f59d60f
merge casadi_path_planners.cpp
becaanth 63c95ed
Fix extant merge conflicts
becaanth c92bbde
Merge branch 'convoy_unicycle_follower_updates' of 192.168.5.42:/home…
becaanth 0a49b30
casadi issue, sim works, hunters dont; fixing casadi_path_planners.cpp
becaanth 6037584
Merge branch 'convoy_unicycle_follower_updates' of github.com:utiasAS…
becaanth b72d8cc
modifying tactic.* storables.* to write edges, vertices, indices. edg…
becaanth f3455ac
revert: instead of graph_->write for edges, lets try graph->save calls
becaanth 427f60e
feat(rc_graph): saveLive methods, feat(tactic): save each time a vert…
becaanth 4a62ace
live edge saving
becaanth b9f6852
feat: live posegraph saving; next is live decomposition
becaanth be9d337
feat(uuid vertex ids): tested in test_serialization_edge.cpp, next is…
becaanth 64e04fc
feat(uuids): updated vtr_pose_graph, vtr_tactic, vtr_navigation, vtr_gui
becaanth 3631534
feat(rids with UUIDs): able to teach two separate runs on the same gr…
becaanth aba6130
feat: reverted vids to sequential. rids are uuids. fixed gui
becaanth f39cb6b
feat: skip dangling edges (these come from live_deconstructed pgs, co…
becaanth 7680bfc
feat(44-bit uuids) can teach, repeat, merge with 44-bit uuids. still …
becaanth c8f22e0
added robot_id as a launch parameter, determines first 4 bits of run_id
becaanth a99b164
bug fix for robot_id
becaanth 9469760
feat: added libtorrent dependancies to vtr3 container
becaanth e17ba3f
feat: color routes by teacher ID
becaanth 979b2a9
feat: load pg with partial information (doesnt load whole topology pr…
becaanth 64e3e26
fix: typo in data_bubble
becaanth 6dbaf29
feat: include EdgeMode in EdgeBase, to match signature of EdgeMode RO…
becaanth f947608
feat: refactor for EdgeMode in mission planning, tactic, and path_pla…
becaanth 723a7c0
feat: added topology.hpp mask; note: EdgeMode refactor not complete, …
becaanth 4b8de00
fix(edge_base.hpp): found final EdgeMode bug!
becaanth 185cfa7
feat: loadLive methods tracking topology; next is to extendSimpleGraph
becaanth ed290ed
feat:populateEdgesLive overwrites topology edges in edges_. backend, …
becaanth fcb90ea
feat(vtr_pose_graph, vtr_tactic): topology mask, evaluator, etc.
becaanth 43891f5
feat(vtr_navigation): using topology mask
becaanth fd140c3
feat(vtr_storage): enable read_only access to closing an accessor. ne…
becaanth 9b8628e
feat(vtr_route_planning): bfs on topology mask
becaanth 4bb02f0
Dockerfile: added run command to enable torrents and GUI
becaanth 16b09f7
fix(vtr_navigation): viz topology-edges. if there is no env_info, set…
becaanth 36fee24
fix(vtr_navigation): fixed crash from clicking on topology-only vtx, …
becaanth 91756a7
fix(vtr_tactic): Alec you might have questions about this commit - Re…
becaanth 020908e
fix(vtr_storage): resolved sqlite R/W errors. can saveLive(), and wri…
becaanth eb6ced4
fix(vtr_storage): sqlite storage/wrapper updated to avoid error 517: …
becaanth 94cc926
feat(almost live loading posegraphs, gui is last) | vtr_pose_graph: n…
becaanth f2a618f
fix(vtr_storage): PRAGMAs were not set for read_only, apply busy_time…
becaanth 13550af
fix(vtr_pose_graph): increment lastVertexIdx_ and lastEdgeIdx_ in sav…
becaanth 9d005ab
fix(GraphMap.js): 1) connectivity check in GraphState so erroneous ed…
becaanth 2597b06
feat(graph_map_server): publish graphState messages ONLY on callbacks…
becaanth 7e70f28
fix(graph_map_server): fixed bug where refreshing graph_state would c…
becaanth 3a2a753
feat: refactored populateLive to separate edges and vertices; resolvi…
becaanth 7b4eace
fix(graph_map_server.cpp): released unnecessary mutex in buildAndPubl…
becaanth 9b2e89a
feat(vtr_tactic): call loadLive on a dedicated timer
becaanth 5cb73ad
(rc_graph.cpp): reorganized code in populateLive()
becaanth 50775f5
(GraphMap.js): removed extra print statements
becaanth 4d41ecd
feat: planning with topology mask, eval, graph. wherever there was pr…
becaanth 43f3585
feat(vtr_pose_graph): refactored topology_edges_ and topology_vertice…
becaanth 0664e89
feat: changed output stream for edge_base class to show type as well
becaanth 9d2aa49
feat(vtr_navigation): can see live updating topology. bugs: vertex ty…
becaanth ff7d0d2
feat(rc_graph): second condition on populateLive to publish NEW topol…
becaanth 0eb8288
feat(rc_graph): advance edge iterator on second condition
becaanth 3cd5d76
fix(vtr_navigation): graph_map_server.cpp fixed service calls to buil…
becaanth 3520807
fix(vtr_gui) GraphMap.js: resolved incorrect route coloring
becaanth 99c939e
refactor(vtr_pose_graph) rc_graph: remove bool field for topology_*_ …
becaanth 48af980
feat(vtr_pose_graph) rc_graph.cpp: guarded loadLive against empty pos…
becaanth 867f79d
feat(vtr_pose_graph) rc_graph.hpp: fixed map_info issue. assumption t…
becaanth 033c750
removed some logging
becaanth e6f574b
comment: resolved multiple run from commit 9d2aa49, was an issue with…
becaanth 76e8a3a
resolving TODOs - made lastVertexIdx_ and lastEdgeIdx_ private member…
becaanth aa2356a
feat(vtr_gui) GraphMap.js: wider waypoint text boxes! 64-bit uuids fit
becaanth 87fc69d
fix(vtr_tactic) tactic.cpp: fixed issue where teach was crashing. old…
becaanth b285cb2
merge
becaanth f9c9be3
fix(vtr_pose_graph) simple_graph.cpp: dont crash when trying to add a…
becaanth ce8b139
fix(tactic): set odometry_success to true on success
becaanth b133eb8
ts(graph.inl): robot id error -> input is "3", log says 77
becaanth 1a8950f
switched to bicycle mpc in config
becaanth ec1da26
convoy config updated
becaanth dc4502b
git(vtr_path_planning): since TTR has made no changes to path_plannin…
becaanth 9f57f05
fix(vtr_path_planning): refactored unicycle_tests.cpp to use EdgeMode…
becaanth be6fc80
git(vtr_lidar): checked out from main
becaanth 3a7003b
git(vtr_common): checked out from main; new vtr_lidar causes vtr_navi…
becaanth 358b42b
git(vtr_mult_robot): added from main
becaanth 8dce17e
fix(pose_graph): continue instead of return in rc_graph
becaanth 0c047b5
Merge branch 'main' into torrent_and_repeat
becaanth 9bf3265
Delete erroneously added files
a-krawciw 9b8a041
Remove additional erroroneous additions
a-krawciw d0b45f8
Delete rviz file
a-krawciw 8e0fa50
fix(path_planning): unicycle_tests.cpp refactored with EdgeMode
becaanth b1fbadc
Merge branch 'torrent_and_repeat' of github.com:utiasASRL/vtr3 into t…
becaanth 44b7111
pr(tactic): removed old comments from storables.hpp
becaanth ba41d59
pr(storage): removed stale comments
becaanth f2aebf7
pr(pose_graph): removed err. return in simple_graph
becaanth 6755f82
pr(pose_graph): reverted pose_graph_smoother.hpp (dont need topology)
becaanth c606d67
pr(pose_graph): removed comments from localization chain
becaanth 20a5100
pr(pose_graph): added comment abt vertex ids to id.hpp
becaanth 6541319
pr(navigation): remove timestamp_offset_
becaanth ece3ddb
pr(navigation): revert vtr.launch.py and command_publisher to main
becaanth 9d466ce
pr(mission_planning): removed dependancy on algorithm
becaanth 29b55a3
pr(gui)
becaanth 22fa5b5
pr(mission planning): privileged -> edge_mode; pr(pose_graph): remove…
becaanth 7b993c3
cleaned Dockerfile to build from docker hub
becaanth 246c1dc
fix(gui) remove mention of CSA plan
becaanth 871bd3a
pr(vision): remove top_evaluator
becaanth f7be42e
pr(Dockerfiles): add libtorrent deps to dockerfiles
becaanth 50997d8
feat(pose_graph): take ROBOT_ID as a parameter in graph.inl (not grap…
becaanth File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These will need to be in all 3 dockerfiles I assume.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my new dockerfile will just build off of the image from dockerhub - planning to delete the other DockerFiles