Skip to content
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

Improve centerline #102

Closed
wants to merge 358 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
358 commits
Select commit Hold shift + click to select a range
286be66
added subscriber and publisher for best trajectory
Oct 2, 2023
7660be1
finished occupancy grid implemenation
Oct 3, 2023
d4cb920
tested search method and other small changes
Oct 4, 2023
0bbfd16
started integration with data flow
Oct 5, 2023
52488b5
added boundary publishing
Oct 7, 2023
b97d3a2
added documentation
Oct 7, 2023
ca232d0
changed msg package
Oct 7, 2023
3e0a4c4
Update README.md
YachtChen Oct 8, 2023
5ebf23c
fixed bugs with interpolation/boundary fill
Oct 9, 2023
eaa3b70
Added boundary message
Oct 9, 2023
f312ce0
Update README.md
YachtChen Oct 10, 2023
67582df
generation timer and boundary subscribers
Oct 11, 2023
3f4f114
added publishers
Oct 12, 2023
2f3d76c
occupany grid to boundary stamped sub
Oct 13, 2023
1c68ba7
deleted test files
Oct 13, 2023
4705f32
added cone map service
Oct 16, 2023
97f65e3
Merge pull request #62 from UOA-FSAE/11-feat-zed-sdk-docker
dyu056 Oct 28, 2023
c1bd376
Merge branch 'cone-detect-map-test' into 26-feat-cone-detection
dyu056 Oct 28, 2023
a42ce59
Merge pull request #63 from UOA-FSAE/26-feat-cone-detection
dyu056 Oct 28, 2023
fdae015
Modify docker container for Daniel'S PC
dyu056 Nov 15, 2023
8d78673
zed container updated to have autonomouus file, but zed_wrapper does …
dyu056 Nov 15, 2023
f40a1b1
Fix docker for installing necessary dependencies
dyu056 Nov 17, 2023
87cf20d
Add files via upload
YachtChen Nov 17, 2023
9d96fad
add pos and rot in detector worked
dyu056 Nov 17, 2023
93efd36
Add files via upload
YachtChen Nov 17, 2023
d7b6c31
finalize for today, still need to do test
dyu056 Nov 20, 2023
aba05d3
Merge remote-tracking branch 'origin/cone-detect-map-test' into cone-…
dyu056 Nov 20, 2023
098b7d8
Make topic uniform
dyu056 Nov 20, 2023
bc80515
Make topic uniform, add one line command to run cone detection
dyu056 Nov 20, 2023
61bc3c3
Cleanned
YachtChen Nov 21, 2023
b7bd6d0
Add translation and rotation info
dyu056 Nov 22, 2023
6d38f7f
Merge remote-tracking branch 'origin/cone-detect-map-test' into cone-…
dyu056 Nov 22, 2023
f7df580
merge
dyu056 Nov 23, 2023
b79bf51
Merge pull request #67 from UOA-FSAE/11-feat-zed-sdk-docker
dyu056 Nov 23, 2023
cff22e9
use updated docker
dyu056 Nov 23, 2023
67d9390
merge
dyu056 Nov 23, 2023
75545b5
add init file
dyu056 Nov 23, 2023
e63cbd5
Corrected the message for fitting cone mapping message
dyu056 Nov 24, 2023
9e69c09
Established detect-map communication. Now need tuning
dyu056 Nov 24, 2023
ea90fbb
To do list from 11-24:
dyu056 Nov 24, 2023
d4a0dce
To do list from 11-24:
dyu056 Nov 24, 2023
09014ad
11-24
dyu056 Nov 24, 2023
bfb47ff
Merge branch 'cone-detect-map-test-orin' of github.com:UOA-FSAE/auton…
dyu056 Nov 24, 2023
f8ad4d4
change docker to Adam's
dyu056 Nov 24, 2023
080d05a
apply perception folder change
dyu056 Nov 24, 2023
cab166a
added branch 11 changes
Nov 24, 2023
a506fc0
fixed pyzed fail
Nov 24, 2023
bfb900c
Fix docker
dyu056 Nov 26, 2023
9a4682a
add virtual sensor
dyu056 Nov 26, 2023
e59b68b
cone map service->subscriber
Nov 28, 2023
c8adeaa
Merge pull request #68 from UOA-FSAE/cone-detect-map-test
dyu056 Nov 29, 2023
fa3eb01
Visualization done
dyu056 Nov 30, 2023
d917a45
Merge remote-tracking branch 'origin/cone-detect-map-test' into cone-…
dyu056 Nov 30, 2023
98d26c6
pytests added for path planning
Dec 1, 2023
9fb97f5
custom all trajectory states message & 3 separate path planning nodes
Dec 17, 2023
08683ab
Merge branch 'nightly' into 58-feat-path-planning
Tanish29 Dec 18, 2023
5a71bb7
Merge pull request #64 from UOA-FSAE/58-feat-path-planning
Tanish29 Dec 18, 2023
02602a2
Update occupancy_grid_service.py
dyu056 Dec 29, 2023
9aa3ef5
remove example code
dyu056 Dec 29, 2023
1e79e5e
Merge branch 'nightly' into 5-feat-can-interface-node
Tanish29 Jan 5, 2024
08fb186
Merge branch 'nightly' into 59-feat-occupancy-grid
Tanish29 Jan 5, 2024
7b550e5
Merge branch 'nightly' into 11-feat-zed-sdk-docker
Jan 5, 2024
7b137bc
Merge pull request #69 from UOA-FSAE/5-feat-can-interface-node
Tanish29 Jan 5, 2024
92fc5e2
Merge pull request #66 from UOA-FSAE/11-feat-zed-sdk-docker
Tanish29 Jan 5, 2024
95f7f2a
Merge pull request #65 from UOA-FSAE/59-feat-occupancy-grid
Tanish29 Jan 5, 2024
b59880c
Revert "5 feat can interface node"
Tanish29 Jan 5, 2024
d821e60
removed redundant code in package.xml
Tanish29 Jan 5, 2024
cad5ec0
Merge pull request #70 from UOA-FSAE/revert-69-5-feat-can-interface-node
Tanish29 Jan 5, 2024
5f6e364
Revert "Revert "5 feat can interface node""
Tanish29 Jan 5, 2024
e83949e
Update package.xml
Tanish29 Jan 5, 2024
601cd05
Merge pull request #71 from UOA-FSAE/revert-70-revert-69-5-feat-can-i…
Tanish29 Jan 5, 2024
982f8b3
hotfix
Jan 7, 2024
d80bcaa
build hotfix
Jan 7, 2024
659304b
fix container launch command
Jan 7, 2024
d9b4d38
fixed files for integration tests
Jan 7, 2024
7ad6434
commented out redundant code
qube1t Jan 13, 2024
bca57ff
Add submodule
Jack17432 Jan 16, 2024
ace8b89
update it
Jack17432 Jan 16, 2024
57c5a2a
Merge pull request #73 from UOA-FSAE/feat/add-cantalk-submodle
Jack17432 Jan 16, 2024
6c0ede2
launch argument for candapter and fixed path planning code
Jan 23, 2024
d1f968e
Merge pull request #74 from UOA-FSAE/can-talker
Tanish29 Jan 23, 2024
958b977
ack to can node test file and update base
Jan 26, 2024
cd7c148
draft trajectory viz and refactored path planning code
Jan 31, 2024
1b7ddee
track and trajectories shown together now
Feb 1, 2024
887a157
Update path_optimisation.py
dyu056 Feb 1, 2024
86ee761
Update path_optimisation.py
dyu056 Feb 1, 2024
5fbb4f5
Update path_optimisation.py
dyu056 Feb 1, 2024
bc0e98e
Update path_optimisation.py
dyu056 Feb 1, 2024
9ea3230
Update path_optimisation.py
dyu056 Feb 1, 2024
a537ea4
small changes
Feb 1, 2024
47a86ec
working draft of center line path planning
Feb 3, 2024
a3e466f
update cone mapper for including colors
dyu056 Feb 3, 2024
f5dce3c
more fake data tests
Feb 4, 2024
62e7fdf
one line command for path planning debug and cone map viz and path viz
Feb 5, 2024
c26c28b
latest modified for non-docker test
dyu056 Feb 7, 2024
8e3b2e8
cone mapping fixing in progress with simulation
dyu056 Feb 9, 2024
7e73fb8
fix sudden jump of orientation
dyu056 Feb 9, 2024
9fc7739
Aruco detection code, need Verification
YachtChen Feb 11, 2024
e178870
Start fixing occupancy grid
dyu056 Feb 13, 2024
12118e0
Working path planning with middle line algorithm, designed for pure p…
dyu056 Feb 14, 2024
8fa6c80
middle line done
dyu056 Feb 18, 2024
9ab850c
Merge pull request #78 from UOA-FSAE/path-planning_perception_occupan…
dyu056 Feb 18, 2024
942b069
Splitting Planning
Zane-Larking Feb 18, 2024
e80a398
fixed aruco detection
YachtChen Feb 19, 2024
8144efe
Aruco detector fixed
YachtChen Feb 19, 2024
e43103d
init (WIP)
Zane-Larking Feb 19, 2024
32389a6
quick comment prior to discussion w/ daniel
Zane-Larking Feb 19, 2024
d1c0e93
aruco cone detection code tested and fixed
Feb 19, 2024
939f6d1
path planning code works
Feb 20, 2024
5623f8f
Merge pull request #79 from UOA-FSAE/splitting_planner_concerns
Tanish29 Feb 20, 2024
d5fd3d1
cleanup and refactor
Feb 20, 2024
71cd69f
Way points
Zane-Larking Feb 20, 2024
6bff6bb
finished implementation start testing
dyu056 Feb 21, 2024
8120c1f
done initial integrated test
dyu056 Feb 21, 2024
043100b
Merge branch 'nightly' into 77-feat-pure-pursuit-control-daniel
dyu056 Feb 21, 2024
0497106
Merge pull request #80 from UOA-FSAE/77-feat-pure-pursuit-control-daniel
dyu056 Feb 21, 2024
0a10645
tuning
dyu056 Feb 22, 2024
6fde1fd
SIM FINISHES A LAAAAAAAAP YOOHOOO
dyu056 Feb 23, 2024
292c3d3
axis redefined and cam tested
Feb 23, 2024
14d8108
getting sim code from nightly
Feb 23, 2024
a7b10db
Experimental works: If it doesn't runs through a lap then please reve…
dyu056 Feb 23, 2024
ebdcb59
testing sim on my end
Feb 23, 2024
1aa3784
Merge pull request #82 from UOA-FSAE/splitting_planner_concerns
Tanish29 Feb 24, 2024
af30539
defined template node for event controller; assumed descriptions are …
qube1t Feb 25, 2024
ca11d40
defined pulse msg with boolean and string data
qube1t Feb 25, 2024
73b7db1
renames topics to reflect documentation
qube1t Feb 25, 2024
2330e89
Merge branch 'nightly' into path-planning_perception
Tanish29 Feb 26, 2024
e147cf4
Merge pull request #83 from UOA-FSAE/path-planning_perception
Tanish29 Feb 26, 2024
f1883e0
Fix several problems
dyu056 Feb 27, 2024
1b91433
path planning code test
Feb 27, 2024
ed1ee55
success, but perception and planning need to speed up! possibly resea…
dyu056 Feb 27, 2024
04b8572
Sim now don't crash
dyu056 Feb 27, 2024
650eb49
Merge branch 'nightly' into sim_improvement
dyu056 Feb 27, 2024
03add26
Merge pull request #84 from UOA-FSAE/sim_improvement
dyu056 Feb 27, 2024
2e2222d
path planning code test sim
Feb 29, 2024
0007916
path planning code test sim
Feb 29, 2024
6d775b5
Now it works on oringit add src!
dyu056 Mar 1, 2024
1d02154
Stanley control-draft
YachtChen Mar 2, 2024
4209ed5
path planning code test sim
Mar 3, 2024
0ea3989
Merge pull request #87 from UOA-FSAE/path-planning_perception
Tanish29 Mar 3, 2024
4754c25
local changes from nightly - close :)
Mar 6, 2024
250888e
pull from nightly
Mar 6, 2024
182e339
openai gym trial with unity sim - not so great for RL
Mar 10, 2024
106d4a3
trying to setup gazebo and urdf
Mar 13, 2024
f2bad73
moa control launch file
Mar 13, 2024
e8f89a8
gazebo simulation update
Mar 15, 2024
4778673
boundary adjustment added - buggy
Mar 15, 2024
58ff897
sim launch file
Mar 16, 2024
d7c231d
path planning test on new computer
Mar 17, 2024
8dc2a42
steering angle to degrees
Mar 17, 2024
d51a2c4
new algo - shortest path
Mar 17, 2024
00ee25d
Stanley Update
Mar 18, 2024
bd11fb5
new trajectory generator test
Mar 18, 2024
6595c97
more path planning sim work
Mar 19, 2024
dd243f9
shortest path - bracket creation done
Mar 19, 2024
e1145a1
milestone: ready to test
dyu056 Mar 20, 2024
4a3263e
milestone: now it is readygit add --all!
dyu056 Mar 20, 2024
2887497
Merge pull request #88 from UOA-FSAE/path-planning_perception
Tanish29 Mar 20, 2024
23ff5cc
brackets show up, compute path draft
Mar 20, 2024
176a2d2
shortest path node created - very buggy
Mar 21, 2024
63c8e02
changed docker, added usb device and changed few setting for jetson
dyu056 Mar 26, 2024
3a1d1db
trajector follower controller - smoother following
Mar 26, 2024
d555c53
distance to center line controller
Mar 28, 2024
00b0890
fixing shortest path code - cone map not accurate
Mar 29, 2024
3964bea
Fixed some errors in yaw angle adjustment
YachtChen Apr 1, 2024
5340d62
latest_tune
dyu056 Apr 2, 2024
f5bf162
latest
dyu056 Apr 3, 2024
495b93b
fixed ssh zed camera not working
dyu056 Apr 3, 2024
bb0fa29
Merge branch 'nightly' of github.com:UOA-FSAE/autonomous into nightly
dyu056 Apr 3, 2024
9e81212
versionalize cone map
dyu056 Apr 3, 2024
40f07d9
cluster method complete
dyu056 Apr 4, 2024
176d245
complete cluster
dyu056 Apr 4, 2024
04b5032
cone map redefine hahaha
dyu056 Apr 4, 2024
6a4f573
code refactor
Apr 4, 2024
061b44d
Merge pull request #89 from UOA-FSAE/nightly_perception_improvement
dyu056 Apr 4, 2024
b94c7f3
bringup file completed
dyu056 Apr 7, 2024
705e933
in process of overall test duh
dyu056 Apr 7, 2024
2694f7b
final change before test, trust me this timeeeee
dyu056 Apr 7, 2024
80e9676
ready for test platform release
AdrianRosioru Apr 10, 2024
594a525
Merge pull request #91 from UOA-FSAE/path-planning_perception
Tanish29 Apr 10, 2024
6d59c44
Merge branch 'nightly' of github.com:UOA-FSAE/autonomous into nightly
AdrianRosioru Apr 11, 2024
5de5677
latest tune
AdrianRosioru Apr 11, 2024
024fd96
latest tune - dont rm
AdrianRosioru Apr 11, 2024
0d05c18
trajectory follower small change
Apr 12, 2024
bdfc6ef
testing my centerline
AdrianRosioru Apr 12, 2024
121465c
boundary interpolation added - kart runs at max speed of 25kph before…
AdrianRosioru Apr 12, 2024
319a3d8
Merge branch 'nightly' into path-planning_new_algos
Tanish29 Apr 16, 2024
480406f
Merge pull request #92 from UOA-FSAE/path-planning_new_algos
Tanish29 Apr 16, 2024
ebf8257
fixing shortest path boundary mapping
Apr 16, 2024
7a80239
improved path planning - draft
Apr 18, 2024
ea3bff4
fixing less cone problem
Apr 24, 2024
1ca93e9
trying cone fix for center line
AdrianRosioru Apr 24, 2024
5c91e88
interpolate centerline
Apr 25, 2024
786d3a7
Merge pull request #94 from UOA-FSAE/path-planning_new_algos
YachtChen Apr 28, 2024
d790062
Fixed Yaw angle calculation
YachtChen Apr 28, 2024
272ef36
fixing new path planning
Apr 29, 2024
49f6c6c
fixed starting node to 0 cost
May 1, 2024
0df0695
Distance Error Control
YachtChen May 5, 2024
edd7a08
i think new path planning works now...
May 6, 2024
9b70cf5
bug fixed - ideal conemap used but sim not working
May 7, 2024
09ce1de
finally fixed DP except in sim :(
May 12, 2024
720d06d
Merge pull request #96 from UOA-FSAE/path-planning_new_algos
Tanish29 May 13, 2024
d953938
Added protobuff-compiler submodule
Zane-Larking May 14, 2024
8dd0864
Test of New Path planning
YachtChen May 19, 2024
f430653
Acceleration Algorithm
YachtChen May 19, 2024
f6f819d
Safer Acceleration
YachtChen May 25, 2024
650283a
Merge pull request #98 from UOA-FSAE/nightly
YachtChen May 28, 2024
d4039b1
Merge pull request #99 from UOA-FSAE/stanley_controller
YachtChen May 28, 2024
f0013e6
Small fix after merge
YachtChen May 28, 2024
6398553
code cleanup - not working atm
Jun 2, 2024
710f614
more cleanup - still not work atm
Jun 3, 2024
0080cff
center line code cleanedup - works need smoother centerline
Jun 5, 2024
3ab3b4e
Merge branch 'nightly' into improve_centerline
Tanish29 Jun 5, 2024
ccd4fe5
Merge pull request #100 from UOA-FSAE/improve_centerline
Tanish29 Jun 5, 2024
012ca61
interpolation for corners added - not working yet
Jun 5, 2024
c1c48d9
local boundary list and interpolation work on fake cone but not sim
Jun 7, 2024
cdf4ca4
local cones based on closest distances and test on sim - kinda works …
Jun 10, 2024
2a67baf
configuring controller to send ackerman for gokart
Jun 19, 2024
a70ce8e
car position node added for temp
Jun 19, 2024
a58762d
reduced logging
Jun 23, 2024
ca5ac48
Merge pull request #97 from UOA-FSAE/feat-proto-msg
Zane-Larking Jun 25, 2024
b0a8ef8
testing something
AdrianRosioru Jul 3, 2024
5b3a910
runtime flag for autonomous ros doesnt work for dev envirnoment
Jul 9, 2024
4b57347
msg generation for linux
Jul 14, 2024
6ef0bce
removed new line
Jul 14, 2024
132e142
Merge branch 'clean_branches' into 10-feat-default-launch-to-bring-up…
Tanish29 Jul 18, 2024
b1127b6
Merge pull request #107 from UOA-FSAE/10-feat-default-launch-to-bring…
Tanish29 Jul 18, 2024
e81d4eb
Merge branch 'clean_branches' into 4-feat-readme-and-onboarding-setup…
Tanish29 Jul 18, 2024
3e1c610
Merge pull request #108 from UOA-FSAE/4-feat-readme-and-onboarding-se…
Tanish29 Jul 18, 2024
805a5ca
old make file
Jul 18, 2024
81b113c
removed duplicate make files
Jul 18, 2024
acdd6b2
added current make file
Jul 18, 2024
94067fd
conflicts fixed - current gitmodules
Jul 18, 2024
15e5b2d
Merge pull request #109 from UOA-FSAE/28-feat-localisation
Tanish29 Jul 18, 2024
b08b9c0
Merge branch 'clean_branches' into 58-feat-path-planning-messages
Tanish29 Jul 18, 2024
fcb3fb0
Merge pull request #110 from UOA-FSAE/58-feat-path-planning-messages
Tanish29 Jul 18, 2024
4b18aec
conflicts - setup file fixed and zed_wrapper folder removed
Jul 18, 2024
0b9cb72
Merge pull request #112 from UOA-FSAE/go-kart
Tanish29 Jul 18, 2024
5ef3956
added zed config file command to templates folder
Jul 18, 2024
506bbc5
Merge branch 'clean_branches' into cone-detect-map-test-orin
Tanish29 Jul 18, 2024
d0a62a0
Merge pull request #113 from UOA-FSAE/cone-detect-map-test-orin
Tanish29 Jul 18, 2024
8b8b36d
conflicts - kalman filter node added
Jul 18, 2024
41f6ed1
Merge pull request #114 from UOA-FSAE/cone-detect-map-test
Tanish29 Jul 18, 2024
29c134a
Merge pull request #115 from UOA-FSAE/13-feat-can-message-decoder
Tanish29 Jul 18, 2024
5852d4d
conflict - pure pursuit controller in moa_controllers deleted
Jul 18, 2024
10b7a25
Merge pull request #116 from UOA-FSAE/77-feat-pure-pursuit-control
Tanish29 Jul 18, 2024
521ed03
Merge pull request #117 from UOA-FSAE/81-feat-event-controller-nodes
Tanish29 Jul 18, 2024
e574533
Merge pull request #119 from UOA-FSAE/test-platform-release
Tanish29 Jul 18, 2024
894a150
Merge pull request #120 from UOA-FSAE/onelap_controller_gokart
Tanish29 Jul 18, 2024
e2d7251
Merge branch 'clean_branches' into improve_centerline
Tanish29 Jul 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
128 changes: 128 additions & 0 deletions .devcontainer/SN31421864.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
[LEFT_CAM_2K]
fx=1066.99
fy=1067.53
cx=1100.79
cy=706.191
k1=-0.0495743
k2=0.020489
p1=-0.000243737
p2=3.96992e-05
k3=-0.00818716

[RIGHT_CAM_2K]
fx=1065.5
fy=1065.75
cx=1122.09
cy=640.969
k1=-0.0468283
k2=0.0178541
p1=0.000339256
p2=0.000245197
k3=-0.0075008

[LEFT_CAM_FHD]
fx=1066.99
fy=1067.53
cx=956.79
cy=625.191
k1=-0.0495743
k2=0.020489
p1=-0.000243737
p2=3.96992e-05
k3=-0.00818716

[RIGHT_CAM_FHD]
fx=1065.5
fy=1065.75
cx=978.09
cy=559.969
k1=-0.0468283
k2=0.0178541
p1=0.000339256
p2=0.000245197
k3=-0.0075008

[LEFT_CAM_HD]
fx=533.495
fy=533.765
cx=636.895
cy=401.0955
k1=-0.0495743
k2=0.020489
p1=-0.000243737
p2=3.96992e-05
k3=-0.00818716

[RIGHT_CAM_HD]
fx=532.75
fy=532.875
cx=647.545
cy=368.4845
k1=-0.0468283
k2=0.0178541
p1=0.000339256
p2=0.000245197
k3=-0.0075008

[LEFT_CAM_VGA]
fx=266.7475
fy=266.8825
cx=333.9475
cy=208.04775
k1=-0.0495743
k2=0.020489
p1=-0.000243737
p2=3.96992e-05
k3=-0.00818716

[RIGHT_CAM_VGA]
fx=266.375
fy=266.4375
cx=339.2725
cy=191.74225
k1=-0.0468283
k2=0.0178541
p1=0.000339256
p2=0.000245197
k3=-0.0075008

[LEFT_DISTO]
k1=-1.40642
k2=2.61105
k3=0.0956687
k4=-1.31639
k5=2.46001
k6=0.261205
p1=-0.000180107
p2=0.000213672

[RIGHT_DISTO]
k1=-2.09762
k2=3.39804
k3=-0.0209668
k4=-2.01869
k5=3.23978
k6=0.160207
p1=0.000360357
p2=0.000109906

[STEREO]
Baseline=119.815
TY=-0.324386
TZ=0.576337
CV_2K=0.00772691
CV_FHD=0.00772691
CV_HD=0.00772691
CV_VGA=0.00772691
RX_2K=0.000780887
RX_FHD=0.000780887
RX_HD=0.000780887
RX_VGA=0.000780887
RZ_2K=0.00237878
RZ_FHD=0.00237878
RZ_HD=0.00237878
RZ_VGA=0.00237878

[MISC]
Sensor_ID=0

44 changes: 21 additions & 23 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,65 @@ version: '3.4'
services:
autonomous_ros2:
image: autonomous

build:
context: ..
dockerfile: .devcontainer/ros2_ws.Dockerfile

environment:
- DISPLAY
- NVIDIA_VISIBLE_DEVICES=0
- NVIDIA_VISIBLE_DEVICES=all
- NVIDIA_DRIVER_CAPABILITIES=all

- ROS_DOMAIN_ID=47 # Its 47 for obvious reasons

- ROS_DOMAIN_ID=47
volumes:
- ..:/ws

network_mode: host
ipc: host
stdin_open: true
tty: true

# runtime: nvidia
deploy:
resources:
reservations:
devices:
- driver: nvidia
device_ids: []
capabilities: [gpu]

- capabilities: [gpu]
privileged: true
devices:
- /dev:/dev

autonomous_zed:
image: zed_sdk

privileged: true

build:
context: ..
dockerfile: .devcontainer/zed.Dockerfile

environment:
- DISPLAY
- NVIDIA_VISIBLE_DEVICES=0
- NVIDIA_VISIBLE_DEVICES=all
- NVIDIA_DRIVER_CAPABILITIES=all
- ROS_DOMAIN_ID=47

# command: "ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"

volumes:
- ../src/perception/:/ws/src/perception/
#- ..:/ws
#- ../src:/ws/src
- ../bringup:/ws/bringup
- ../src/visualization/:/ws/src/visualization/
- ../src/moa/moa_description:/ws/src/moa/moa_description
- ../src/moa/moa_msgs:/ws/src/moa/moa_msgs
- ../ros_entrypoint.sh:/ws/ros_entrypoint.sh
- ../bringup:/ws/bringup
- /tmp/.X11-unix:/tmp/.X11-unix
- /dev:/dev


command: bash -c ". /ws/ros_entrypoint.sh && ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"
network_mode: host
ipc: host
stdin_open: true
tty: true

runtime: nvidia
deploy:
resources:
reservations:
devices:
- driver: nvidia
device_ids: []
capabilities: [gpu]
privileged: true
devices:
- /dev:/dev
81 changes: 81 additions & 0 deletions .devcontainer/ros2_perception.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
FROM stereolabs/zed:4.0-tools-devel-l4t-r35.4
LABEL Name=zed_sdk Version=0.0.1

SHELL [ "/bin/bash", "-c" ]

WORKDIR /ws

ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8

RUN apt update && apt install -y gnupg wget software-properties-common && \
add-apt-repository universe

RUN wget -qO - https://isaac.download.nvidia.com/isaac-ros/repos.key | \
apt-key add - && \
echo 'deb https://isaac.download.nvidia.com/isaac-ros/ubuntu/main focal main' | \
tee -a "/etc/apt/sources.list"

RUN apt update && apt install curl -y && \
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu focal main" | \
tee /etc/apt/sources.list.d/ros2.list > /dev/null

# setup timezone & install packages
RUN apt-get update && apt-get install -q -y --no-install-recommends \
tzdata \
dirmngr \
gnupg2 \
git \
ros-humble-ros-base \
build-essential \
python3-colcon-common-extensions \
python3-colcon-mixin \
python3-rosdep \
python3-vcstool && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean

ENV ROS_DISTRO humble

# setup colcon mixin and metadata
RUN rosdep init && \
rosdep update --rosdistro $ROS_DISTRO && \
colcon mixin add default \
https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml && \
colcon mixin update && \
colcon metadata add default \
https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
colcon metadata update

COPY ./src/perception/ /ws/src/perception/
COPY ./src/moa/moa_description /ws/src/moa/moa_description
COPY ./src/moa/moa_msgs /ws/src/moa/moa_msgs

# install ros2 packages
RUN cd /ws/src/ && \
git clone --recursive https://github.com/stereolabs/zed-ros2-wrapper.git && \
cd .. && \
source /opt/ros/humble/setup.bash && \
rosdep update && apt-get update && \
rosdep install --from-paths src -y -r --ignore-src --rosdistro=$ROS_DISTRO --os=ubuntu:jammy && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean

RUN cd /usr/local/zed && \
pip install requests && \
python3 get_python_api.py

RUN source /opt/ros/humble/setup.bash && \
colcon build --parallel-workers $(nproc) --symlink-install \
--event-handlers console_direct+ --base-paths src \
--cmake-args ' -DCMAKE_BUILD_TYPE=Release' \
' -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs' \
' -DCMAKE_CXX_FLAGS="-Wl,--allow-shlib-undefined"'

RUN echo "source /opt/ros/humble/setup.bash" >> ~/.bashrc && \
echo "source /ws/install/setup.bash" >> ~/.bashrc

RUN . ~/.bashrc

CMD ["bash"]
4 changes: 4 additions & 0 deletions .devcontainer/zed.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,8 @@ RUN source /opt/ros/humble/setup.bash && \
RUN echo "source /opt/ros/humble/setup.bash" >> ~/.bashrc && \
echo "source /ws/install/setup.bash" >> ~/.bashrc

RUN . ~/.bashrc

COPY ./.devcontainer/SN31421864.conf /usr/local/zed/settings/SN31421864.conf

CMD ["bash"]
9 changes: 5 additions & 4 deletions .docker_templates/docker-compose.CPU.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ services:
- NVIDIA_DRIVER_CAPABILITIES=all
- ROS_DOMAIN_ID=47

command: "ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"
command: bash ". ~/.bashrc && ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"

volumes:
- ../ros_entrypoint.sh:/ws/ros_entrypoint.sh

- ../src/perception/:/ws/src/perception/
- ../src/moa/moa_description:/ws/src/moa/moa_description
- ../src/moa/moa_msgs:/ws/src/moa/moa_msgs

network_mode: host
ipc: host
stdin_open: true
tty: true
tty: true
2 changes: 1 addition & 1 deletion .docker_templates/docker-compose.GPU.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
- NVIDIA_DRIVER_CAPABILITIES=all
- ROS_DOMAIN_ID=47

command: "ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"
command: bash ". ~/.bashrc && ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"

volumes:
- ../src/perception/:/ws/src/perception/
Expand Down
4 changes: 4 additions & 0 deletions .docker_templates/zed.Jetson.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,8 @@ RUN source /opt/ros/humble/setup.bash && \
RUN echo "source /opt/ros/humble/setup.bash" >> ~/.bashrc && \
echo "source /ws/install/setup.bash" >> ~/.bashrc

RUN . ~/.bashrc

COPY ./.devcontainer/SN31421864.conf /usr/local/zed/settings/SN31421864.conf

CMD ["bash"]
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
build
install
log
kaggle.json
.devcontainer/docker-compose.yml
.devcontainer/zed.Dockerfile
.devcontainer/ros2_ws.Dockerfile
.vscode/settings.json
.gitignore
.vscode/c_cpp_properties.json
**/__pycache__/
**/__pycache__/
*.msg
*.srv
18 changes: 14 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
[submodule "src/hardware_drivers/foxglove-bridge"]
path = src/hardware_drivers/foxglove-bridge
url = https://github.com/foxglove/ros-foxglove-bridge.git
[submodule "src/moa/cone-detection/cone_detection/yolov7"]
[submodule "src/hardware_drivers/foxglove-bridge"]
path = src/hardware_drivers/foxglove-bridge
url = https://github.com/foxglove/ros-foxglove-bridge.git
[submodule "src/moa/cone-detection/cone_detection/yolov7"]
path = src/perception/cone-detection/cone_detection/yolov7
url = https://github.com/WongKinYiu/yolov7.git
[submodule "src/hardware_drivers/CanTalk"]
path = src/hardware_drivers/CanTalk
url = https://github.com/UOA-FSAE/CanTalk.git
branch = main
[submodule "Tracks/racetrack-database"]
path = src/planning/path_planning/path_planning/shortest_path/Tracks/racetrack-database
url = https://github.com/TUMFTM/racetrack-database.git
[submodule "ROS2-protobuff-compiler"]
path = ROS2-protobuff-compiler
url = https://github.com/UOA-FSAE/ROS2-protobuff-compiler.git
Loading
Loading