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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions Dockerfile

Copy link
Copy Markdown
Contributor

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.

Copy link
Copy Markdown
Author

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

Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
eventlet \
python-socketio \
python-socketio[client] \
websocket-client
websocket-client \
asrl-pylgmath


#added by sherry
Expand Down Expand Up @@ -178,7 +179,7 @@
RUN unzip libtorch.zip -d /opt/torch && rm /libtorch.zip
ENV TORCH_LIB=/opt/torch/libtorch
ENV LD_LIBRARY_PATH=$TORCH_LIB/lib:${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
ENV CMAKE_PREFIX_PATH=$TORCH_LIB:$CMAKE_PREFIX_PATH

Check warning on line 182 in Dockerfile

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$CMAKE_PREFIX_PATH' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

RUN apt install swig liblapack-dev libmetis-dev -y -q --install-recommends
RUN mkdir -p ${HOMEDIR}/.casadi && cd ${HOMEDIR}/.casadi \
Expand All @@ -187,7 +188,7 @@
&& mkdir -p build && cd build \
&& cmake build -DWITH_PYTHON=ON -DWITH_PYTHON3=ON -DWITH_IPOPT=ON -DWITH_BUILD_IPOPT=ON -DWITH_BUILD_REQUIRED=ON -DWITH_SELFCONTAINED=ON .. \
&& make -j${NUMPROC} install
ENV PYTHONPATH=${PYTHONPATH}:/usr/local

Check warning on line 191 in Dockerfile

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$PYTHONPATH' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
ENV LD_LIBRARY_PATH=/usr/local/casadi:${LD_LIBRARY_PATH}


Expand All @@ -200,5 +201,36 @@
RUN chmod +x /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

## Switch to specified user
# Clone libtorrent RC_2_0
WORKDIR $HOMEDIR
RUN git clone --recursive https://github.com/arvidn/libtorrent.git -b RC_2_0

WORKDIR $HOMEDIR/libtorrent/build
RUN cmake -DCMAKE_BUILD_TYPE=Release \
-DTORRENT_USE_ASSERTS=ON \
-Dpython-bindings=ON \
-Dencryption=ON \
-Ddht=ON \
-Dcrypto=openssl \
-Dextensions=ON \
-DPYTHON_EXECUTABLE=/usr/bin/python3.10 \
-DCMAKE_CXX_FLAGS="-DTORRENT_USE_OPENSSL=1" \
.. && \
make -j$(nproc)

RUN nm -D bindings/python/libtorrent*.so | grep -E "dht_put_item|ed25519"
RUN cp $HOMEDIR/libtorrent/build/bindings/python/libtorrent*.so /usr/local/lib/python3.10/dist-packages/libtorrent.so

# Install Zenoh router (zenohd)
RUN echo "deb [trusted=yes] https://download.eclipse.org/zenoh/debian-repo /" | \
tee /etc/apt/sources.list.d/zenoh.list > /dev/null && \
apt-get update && \
printf '#!/bin/sh\nexit 0' > /usr/bin/systemctl && \
chmod +x /usr/bin/systemctl && \
apt-get install -y zenohd

RUN pip3 install pynacl eclipse-zenoh msgpack zenoh-cli pprintpp pandas
RUN pip3 install --upgrade matplotlib

WORKDIR $HOME

Check warning on line 235 in Dockerfile

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$HOME' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
USER ${USERID}:${GROUPID}
36 changes: 34 additions & 2 deletions Dockerfile.CPU
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
&& git clone https://github.com/OSGeo/PROJ.git . && git checkout 8.2.0 \
&& mkdir -p ${HOMEDIR}/proj/build && cd ${HOMEDIR}/proj/build \
&& cmake .. && cmake --build . -j${NUMPROC} --target install
ENV LD_LIBRARY_PATH=/usr/local/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}

Check warning on line 66 in Dockerfile.CPU

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$LD_LIBRARY_PATH' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

## Install ROS2
# UTF-8
Expand Down Expand Up @@ -139,7 +139,7 @@
RUN rm libtorch.zip
ENV TORCH_LIB=/opt/torch/libtorch
ENV LD_LIBRARY_PATH=$TORCH_LIB/lib:${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
ENV CMAKE_PREFIX_PATH=$TORCH_LIB:$CMAKE_PREFIX_PATH

Check warning on line 142 in Dockerfile.CPU

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$CMAKE_PREFIX_PATH' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

RUN apt install swig liblapack-dev libmetis-dev -y -q --install-recommends
RUN mkdir -p ${HOMEDIR}/.casadi && cd ${HOMEDIR}/.casadi \
Expand All @@ -148,7 +148,7 @@
&& mkdir -p build && cd build \
&& cmake build -DWITH_PYTHON=ON -DWITH_PYTHON3=ON -DWITH_IPOPT=ON -DWITH_BUILD_IPOPT=ON -DWITH_BUILD_REQUIRED=ON -DWITH_SELFCONTAINED=ON .. \
&& make -j${NUMPROC} install
ENV PYTHONPATH=${PYTHONPATH}:/usr/local

Check warning on line 151 in Dockerfile.CPU

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$PYTHONPATH' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
ENV LD_LIBRARY_PATH=/usr/local/casadi:${LD_LIBRARY_PATH}

RUN apt install -y ros-humble-rmw-zenoh-cpp
Expand All @@ -158,6 +158,38 @@
RUN chmod +x /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]


# Clone libtorrent RC_2_0
WORKDIR $HOMEDIR
RUN git clone --recursive https://github.com/arvidn/libtorrent.git -b RC_2_0

WORKDIR $HOMEDIR/libtorrent/build
RUN cmake -DCMAKE_BUILD_TYPE=Release \
-DTORRENT_USE_ASSERTS=ON \
-Dpython-bindings=ON \
-Dencryption=ON \
-Ddht=ON \
-Dcrypto=openssl \
-Dextensions=ON \
-DPYTHON_EXECUTABLE=/usr/bin/python3.10 \
-DCMAKE_CXX_FLAGS="-DTORRENT_USE_OPENSSL=1" \
.. && \
make -j$(nproc)

RUN nm -D bindings/python/libtorrent*.so | grep -E "dht_put_item|ed25519"
RUN cp $HOMEDIR/libtorrent/build/bindings/python/libtorrent*.so /usr/local/lib/python3.10/dist-packages/libtorrent.so

# Install Zenoh router (zenohd)
RUN echo "deb [trusted=yes] https://download.eclipse.org/zenoh/debian-repo /" | \
tee /etc/apt/sources.list.d/zenoh.list > /dev/null && \
apt-get update && \
printf '#!/bin/sh\nexit 0' > /usr/bin/systemctl && \
chmod +x /usr/bin/systemctl && \
apt-get install -y zenohd

RUN pip3 install pynacl eclipse-zenoh msgpack zenoh-cli pprintpp pandas
RUN pip3 install --upgrade matplotlib

WORKDIR $HOME

Check warning on line 193 in Dockerfile.CPU

View workflow job for this annotation

GitHub Actions / docker

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$HOME' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
## Switch to specified user
USER ${USERID}:${GROUPID}
CMD ["bash"]
USER ${USERID}:${GROUPID}
34 changes: 34 additions & 0 deletions Dockerfile.jetson
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,39 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]


# Clone libtorrent RC_2_0
WORKDIR $HOMEDIR
RUN git clone --recursive https://github.com/arvidn/libtorrent.git -b RC_2_0

WORKDIR $HOMEDIR/libtorrent/build
RUN cmake -DCMAKE_BUILD_TYPE=Release \
-DTORRENT_USE_ASSERTS=ON \
-Dpython-bindings=ON \
-Dencryption=ON \
-Ddht=ON \
-Dcrypto=openssl \
-Dextensions=ON \
-DPYTHON_EXECUTABLE=/usr/bin/python3.10 \
-DCMAKE_CXX_FLAGS="-DTORRENT_USE_OPENSSL=1" \
.. && \
make -j$(nproc)

RUN nm -D bindings/python/libtorrent*.so | grep -E "dht_put_item|ed25519"
RUN cp $HOMEDIR/libtorrent/build/bindings/python/libtorrent*.so /usr/local/lib/python3.10/dist-packages/libtorrent.so

# Install Zenoh router (zenohd)
RUN echo "deb [trusted=yes] https://download.eclipse.org/zenoh/debian-repo /" | \
tee /etc/apt/sources.list.d/zenoh.list > /dev/null && \
apt-get update && \
printf '#!/bin/sh\nexit 0' > /usr/bin/systemctl && \
chmod +x /usr/bin/systemctl && \
apt-get install -y zenohd

RUN pip3 install pynacl eclipse-zenoh msgpack zenoh-cli pprintpp pandas
RUN pip3 install --upgrade matplotlib

WORKDIR $HOME

## Switch to specified user
USER ${USERID}:${GROUPID}
2 changes: 1 addition & 1 deletion config/hdl64_grizzly_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
min_vel: 0.5
mpc:
# Controller Params
extrapolate_robot_pose: false
extrapolate_robot_pose: true
mpc_verbosity: false
forward_vel: 1.0
max_lin_vel: 1.5
Expand Down
25 changes: 13 additions & 12 deletions main/src/vtr_gui/vtr_gui/socket_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@

def graph_state_from_ros(ros_graph_state):
return {
'root_vid': str(ros_graph_state.root_vid),
'vertices': [{
'id': v.id,
'neighbors': [n for n in v.neighbors],
'id': str(v.id),
'neighbors': [str(n) for n in v.neighbors],
'lng': v.lng,
'lat': v.lat,
'theta': v.theta,
'type': v.type,
'name': v.name
} for v in ros_graph_state.vertices],
'fixed_routes': [{
'ids': [id for id in r.ids],
'ids': [str(id) for id in r.ids],
'type': r.type
} for r in ros_graph_state.fixed_routes],
'active_routes': [{
'ids': [id for id in r.ids],
'ids': [str(id) for id in r.ids],
'type': r.type
} for r in ros_graph_state.active_routes],
}
Expand All @@ -59,17 +60,17 @@ def graph_update_from_ros(ros_graph_update):
vt = ros_graph_update.vertex_to
return {
'vertex_from': {
'id': vf.id,
'neighbors': [n for n in vf.neighbors],
'id': str(vf.id),
'neighbors': [str(n) for n in vf.neighbors],
'lng': vf.lng,
'lat': vf.lat,
'theta': vf.theta,
'type': vf.type,
'name': vf.name
},
'vertex_to': {
'id': vt.id,
'neighbors': [n for n in vt.neighbors],
'id': str(vt.id),
'neighbors': [str(n) for n in vt.neighbors],
'lng': vt.lng,
'lat': vt.lat,
'theta': vt.theta,
Expand Down Expand Up @@ -102,7 +103,7 @@ def map_info_from_ros(ros_map_info):
}

def following_route_from_ros(ros_following_route):
return {'ids': [id for id in ros_following_route.ids]}
return {'ids': [str(id) for id in ros_following_route.ids]}


def goal_handle_from_ros(ros_goal_handle):
Expand All @@ -124,8 +125,8 @@ def goal_handle_from_ros(ros_goal_handle):
goal_handle["pause_before"] = ros_goal_handle.pause_before / 1000.0
# pause after
goal_handle["pause_after"] = ros_goal_handle.pause_after / 1000.0
# waypointsk
goal_handle["waypoints"] = [x for x in ros_goal_handle.waypoints]
# waypoints
goal_handle["waypoints"] = [str(x) for x in ros_goal_handle.waypoints]

return goal_handle

Expand Down Expand Up @@ -165,7 +166,7 @@ def task_queue_task_from_ros(ros_task_queue_task):
return {
'id': ros_task_queue_task.id,
'name': ros_task_queue_task.name,
'vid': ros_task_queue_task.vid,
'vid': str(ros_task_queue_task.vid),
}


Expand Down
1 change: 1 addition & 0 deletions main/src/vtr_gui/vtr_gui/socket_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ def handle_task_queue_update(json):
socketio.emit(u"task_queue/update", task_queue_update)



Comment thread
becaanth marked this conversation as resolved.
def main():
logger.info("Launching the socket server.")
socketio.run(app, host=SOCKET_ADDRESS, port=SOCKET_PORT, use_reloader=False)
Expand Down
Loading
Loading