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

Add live Webots vision error testing (goal detection) #98

Open
wants to merge 100 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
af6504a
Move the vision collection to the master teleport controller
ysims May 26, 2021
491c94b
Clang tidy :(
ysims May 26, 2021
6d7e8b1
Fix weirdly segmented image data issue
LachlanCourt May 29, 2021
3837123
Add comments and tidy up
LachlanCourt May 29, 2021
8edf8b2
Rename variables for formatting
LachlanCourt May 30, 2021
79e9ef4
Revert change to NUgus.proto
LachlanCourt May 30, 2021
e04d63f
Fix rotations
LachlanCourt May 30, 2021
56219e0
Add segmentation colours for self and other NUgus
LachlanCourt May 30, 2021
9037e7b
Fix height of one of the dummy robots
LachlanCourt May 30, 2021
879b7a0
Merge remote-tracking branch 'origin/main' into sims/vision_data_fix
ysims May 30, 2021
37e685a
Update Wolfgang
ysims May 30, 2021
76ea93a
Recog colours for wolfgang
ysims May 31, 2021
5640244
Fix broken wolfgang texture path
ysims May 31, 2021
a6c4aa7
Enable the sensors
ysims May 31, 2021
eab71db
Fix up recognition colours for the robots
ysims May 31, 2021
f8706cf
Updates readme
ysims May 31, 2021
a428806
Trying to get things moving
ysims May 31, 2021
8112267
Change file extension of README to md from txt
LachlanCourt May 31, 2021
152b2b3
Make the head move
ysims May 31, 2021
16ead47
Don't want floating robots
ysims May 31, 2021
57ef542
Add arm movements
ysims Jun 1, 2021
c926aa0
Prevent collisions
ysims Jun 1, 2021
9f9b51f
Add elbow movements
ysims Jun 1, 2021
dbb5035
Restrict shoulder pitch movement
ysims Jun 1, 2021
45d5b57
Merge branch 'main' into sims/vision_data_fix
ysims Jun 1, 2021
ec3d15f
Change height of wolfgang robot when teleporting
LachlanCourt Jun 1, 2021
6577b13
Merge remote-tracking branch 'origin/sims/vision_data_fix' into sims/…
LachlanCourt Jun 1, 2021
dc181e6
Merge branch 'main' into sims/vision_data_fix
LachlanCourt Jan 10, 2022
cfc58aa
Specify controller so to prevent default
LachlanCourt Jan 14, 2022
fba8b07
Fix texture issues
LachlanCourt Jan 14, 2022
1313d35
Merge branch 'main' into sims/vision_data_fix
ysims Jan 21, 2022
9578946
Add the LD_LIBRARY_PATH variable to the controller's cmakelists.txt
ysims Jan 21, 2022
e345c78
Correct controller name
ysims Jan 21, 2022
961a8e4
Add for the vision data controller
ysims Jan 21, 2022
640773a
Update to the latest Wolfgang robot
ysims Jan 21, 2022
efb2fb7
Add in Bit-Bots' license
ysims Jan 21, 2022
387a3f8
Update our robot to 2021b to remove warnings
ysims Jan 21, 2022
bf120e0
Add back in recognitionColors
ysims Jan 21, 2022
15e9b43
Add readmes for the robots
ysims Jan 21, 2022
53410f3
Update version and texture paths
ysims Jan 21, 2022
771d221
Merge branch 'sims/update-robot-models-jan-2022' into sims/vision_dat…
ysims Jan 21, 2022
a913cb9
Merge branch 'sims/fix-libcppcontroller-issue' into sims/vision_data_fix
ysims Jan 21, 2022
fffa310
Apply suggestions from code review
ysims Jan 21, 2022
8fd4fd9
Merge remote-tracking branch 'origin/sims/vision_data_fix' into sims/…
ysims Jan 21, 2022
5643712
Auto stash before merge of "sims/vision_data_fix" and "origin/sims/vi…
ysims Jan 21, 2022
0e95988
snake_case the variables
ysims Jan 21, 2022
513287b
Merge remote-tracking branch 'origin/main' into sims/vision_data_fix
ysims Jan 21, 2022
bf25bf8
Fix compile errors
ysims Jan 21, 2022
2bbb630
Fix run time error
ysims Jan 22, 2022
311f179
More code quality changes
ysims Jan 22, 2022
c75fe02
Give all robots a height and use it to set the z teleport location
ysims Jan 22, 2022
6d800f7
Use floats when argument is a float
ysims Jan 22, 2022
cd4aa10
Fix errors
ysims Jan 22, 2022
e48a2a2
Add comments
ysims Jan 23, 2022
ce6f484
Take some steps to ensure no overflow errors
ysims Jan 23, 2022
e51bbbf
Create a random rotation rather than reading from a config file
ysims Jan 23, 2022
d28cacb
Formatting and code quality improvements
ysims Jan 23, 2022
fa24988
Fix type error in rotation
ysims Jan 23, 2022
023bd75
Change the config file name for easier search
ysims Jan 23, 2022
e87c4aa
Don't restrict the name length
ysims Jan 23, 2022
4afe5c9
Move complex block into a function
ysims Jan 23, 2022
b6260ee
Detect the small posts and green behind the goals
ysims Jan 23, 2022
a489972
Rename to indicate it is to do with vision
ysims Jan 23, 2022
facc573
Remove binary file
ysims Jan 23, 2022
3c74b6f
Code quality changes
ysims Jan 23, 2022
b17edf2
Update readme
ysims Jan 23, 2022
2b705ef
newline in yaml file...
ysims Jan 23, 2022
cfa790a
Use the void controller to get rid of warnings!!!!!!
ysims Jan 23, 2022
119af8c
Add in functionality to get odometry ground truth
ysims Apr 2, 2022
03a84f1
Add stuff to protos
ysims Apr 2, 2022
73416e6
Get rid of random other robots
ysims Apr 2, 2022
fe0b62b
Some compile fixes and formatting
ysims Apr 2, 2022
d17a4ff
Fix more compile errors
ysims Apr 3, 2022
01e2256
Fix rest of compile issues
ysims Apr 3, 2022
3f65faf
Merge remote-tracking branch 'origin/main' into sims/odometry-test
ysims Apr 3, 2022
dbdc0cd
Merge remote-tracking branch 'origin/main' into sims/odometry-test
ysims Apr 3, 2022
8f12b07
Fix runtime issues
ysims Apr 10, 2022
26b8191
Should work
ysims Apr 19, 2022
f04fff8
Formatting and transpose matrix
ysims Apr 19, 2022
6ded8ac
Added ball detection test
BaileyJoe Jul 8, 2022
bb24724
Added comments
BaileyJoe Jul 31, 2022
8c25248
Change vision ground truth message
Aug 24, 2022
8d4181a
Cleanup
Sep 7, 2022
165e912
Merge remote-tracking branch 'origin/main' into bailey/groundtruth-vi…
BaileyJoe Oct 12, 2022
0743798
Update nuwebots/controllers/nugus_controller/CMakeLists.txt
BaileyJoe Oct 20, 2022
94e78f0
Corrected merge issues
Nov 11, 2022
d17f18e
Merge remote-tracking branch 'origin/bailey/groundtruth-vision-test' …
Nov 11, 2022
99f94cb
Added rough goal benchmarks
BaileyJoe Nov 17, 2022
b1e00ff
Merge remote-tracking branch 'refs/remotes/origin/main'
BaileyJoe Dec 1, 2022
2634db5
Removed repeated line.
Dec 1, 2022
8d4e5ff
Merge branch 'main' into sims/vision_data_fix
ysims Dec 3, 2022
0d4f7da
fix up merge
ysims Dec 3, 2022
ac3a8cc
Merge issues
ysims Dec 3, 2022
77446ec
D:<
ysims Dec 3, 2022
86d8cd4
ignore the vision data and the controller binary
ysims Dec 3, 2022
7d5a205
Merge remote-tracking branch 'origin/sims/vision_data_fix' into baile…
Dec 9, 2022
b4104e1
Merge remote-tracking branch 'origin/main' into bailey/groundtruth-vi…
May 31, 2023
a47a4dc
Merge in main again
BaileyJoe May 31, 2023
0b44fe2
Merge in main again, again
BaileyJoe May 31, 2023
b3780f7
Merge branch 'main' into bailey/groundtruth-vision-test-goals
May 31, 2023
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
2 changes: 2 additions & 0 deletions nuwebots/controllers/nugus_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ find_package(webots REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(Protobuf REQUIRED)

find_package(Eigen3 REQUIRED)

ysims marked this conversation as resolved.
Show resolved Hide resolved
# Find/list all of the source files
set(controller_sources nugus_controller.cpp)

Expand Down
10 changes: 10 additions & 0 deletions nuwebots/controllers/nugus_controller/nugus_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -794,12 +794,22 @@ class PlayerServer {
Eigen::Vector3d rBXx = Eigen::Vector3d(ball_translation[0], ball_translation[1], ball_translation[2]);
Eigen::Vector3d rBWw = Hxw.inverse() * rBXx;

// Get field position in world space
const double* field_position = robot->getFromDef("FIELD")->getPosition();
Eigen::Vector3d rFXx = Eigen::Vector3d(field_position[0], field_position[1], field_position[2]);
Eigen::Vector3d rFWw = Hxw.inverse() * rFXx;

fvec3* rbww = new fvec3();
rbww->set_x(rBWw(0, 0));
rbww->set_y(rBWw(1, 0));
rbww->set_z(rBWw(2, 0));
vision_ground_truth->set_allocated_rbww(rbww);

fvec3* rfww = new fvec3();
rfww->set_x(rFWw(0, 0));
rfww->set_y(rFWw(1, 0));
rfww->set_z(rFWw(2, 0));
vision_ground_truth->set_allocated_rfww(rfww);
sensor_measurements.set_allocated_vision_ground_truth(vision_ground_truth);
}

Expand Down
2 changes: 2 additions & 0 deletions nuwebots/shared/message/messages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ message VisionGroundTruth {
bool exists = 1;
/// Vector from the world to the ball in world space.
fvec3 rBWw = 2;
// Vector from the world to the field in world space.
fvec3 rFWw = 3;
}

message mat4 {
Expand Down