-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Removing arducam * Implementing new camera * refactoring yaml parameters * matrixes + camera_settings struct (for later cups) * projection from fisheye to pinhole * Start over condering arucos sizes * improving project_corners_pinhole_to_fisheye function * Simulating image capture * Hello compute_final_projection function * refactoring estimate_arucos_poses function * arucos number definition * Better model (400x2 pics for this mathematical model) * Add sharpness parameter to yaml * Considering the center marker as a special marker * computing assurancetourix -> map tf from the center marker pose estim * update black to 21.4b0 * sending estimated static tf directly from assurancetourix constructor * Not using transformix in assurancetourix anymore * Cleaning dependencies * Fixing localisation zero division * black localisation * Multiple center markers detection to compute an average tf estimation * pose estimation with 2 cm precision * Hello geometrix * Some geometrical functions * arucos params managed by geometrix * assurancetourix yaml update * Assurancetourix now publishes marker_array of raw detection * Some useful function for geometrix * Geometrix know how to assign markers to robots * Top arucos management for geometrix * Call geometrix to identify which marker is for which robot * Fix estimate_initial_camera_pose function * Geometrix can now compute true enemies positions * WIP on compute_ally_position * tested geometrix * assurancetourix small tweak * top marker management * accurate mean_angle * tweak over enemies detection * yaml fix + ally_or_enemy function * clean ally and enemy classification * improved enemies positioning algorithm * fix size of arucos enemies that isn't a true 7 centimers * cleaning public/private global variables * refactoring geometrix compute_enemy_position function * geometrix is now capable of predicting enemies position * Much more accurate initial position guessing of camera * Some visualization addons * Last missing geometrical part of geaometrix * publishing the right marker array * removing a bunch of logs * Adding some visualization options in yaml * fix stamp problem + overall cleaning * reducing image latency * refining aruco detection at x:0.5 y:1.9 * Obelix arucos size and id * trying to get pixel from posiitonn * picture not to big for bebug * adding an extra delay over image capture * tweaking the delay, seems better now * get_pixel_from_position function, seems to be functionnal * done and functionnal get_color_from_position * is_goblet_at_position and reef_goblet_callback function * side selction and compass_orientation function draft * New assurancetourix yml * compass orientation + /compass string topic with "north" or "south" * auto_exposure_function * Adjusting huge aruco aruco size * renaming variable + deleting some tests * assurancetourix launch pharaon and update /pharaon/deploy topic * cleaning the node * Removing parameter_event_callback * Starting to write the documentation * More documentation * assurancetourix tf estimate doc * documentation on robots poses, geometrix, color finding * All documentation pretty much written * Forgot to save conflict changes... * Pharaon node not launched in simulation mode (only with titan) Co-authored-by: PhileasL <phileas.lambert@gmail.com>
- Loading branch information
Showing
28 changed files
with
1,577 additions
and
1,025 deletions.
There are no files selected for viewing
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
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
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file added
BIN
+58.2 KB
src/assurancetourix/assurancetourix/doc/formulas/color_finding/second_step.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
src/assurancetourix/assurancetourix/doc/formulas/color_finding/second_step_md.md
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
$$ | ||
\begin{pmatrix}x_{pinhole\_model}\\ | ||
y_{pinhole\_model}\\ | ||
k\\ | ||
\end{pmatrix} = | ||
\begin{pmatrix}f_{x_{pinhole\_model}} & 0 & c_{x_{pinhole\_model}}\\ | ||
0 & f_{y_{pinhole\_model}} & c_{y_{pinhole\_model}}\\ | ||
0 & 0 & 1\\ | ||
\end{pmatrix} | ||
. | ||
\begin{pmatrix}1 & 0 & 0 & 0\\ | ||
0 & 1 & 0 & 0\\ | ||
0 & 0 & 1 & 0\\ | ||
\end{pmatrix} | ||
. | ||
\begin{pmatrix}pt\_assurancetourix.x \\ | ||
pt\_assurancetourix.y\\ | ||
pt\_assurancetourix.z\\ | ||
1.0 \\ | ||
\end{pmatrix} | ||
$$ |
Binary file added
BIN
+58.2 KB
src/assurancetourix/assurancetourix/doc/formulas/color_finding/third_step.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions
8
src/assurancetourix/assurancetourix/doc/formulas/color_finding/third_step_md.md
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
$$ | ||
\begin{pmatrix}x_{fisheye\_model}\\ | ||
y_{fisheye\_model}\\ | ||
\end{pmatrix} = | ||
\begin{pmatrix}\frac{\frac {x_{pinhole\_model}}{k} - c_{x_{new\_k}}}{f_{x_{new\_k}}}\\ | ||
\frac{\frac {y_{pinhole\_model}}{k} - c_{y_{new\_k}}}{f_{y_{new\_k}}}\\ | ||
\end{pmatrix} | ||
$$ |
Binary file added
BIN
+18.8 KB
.../doc/formulas/projection_original_to_fisheye_corrected_balanced/formula_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions
8
...x/doc/formulas/projection_original_to_fisheye_corrected_balanced/formulas_md.md
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
$$new_k = \begin{pmatrix}f_x & 0 & c_x\\ | ||
0 & f_y & c_y\\ | ||
0 & 0 & 1\\ | ||
\end{pmatrix}$$ | ||
|
||
$$\begin{pmatrix} new_{pixel_x}\\ | ||
new_{pixel_y}\end{pmatrix} = \begin{pmatrix}pixel\_to\_project_x.f_x+c_x \\ | ||
pixel\_to\_project_y.f_y+c_y\end{pmatrix}$$ |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+27 KB
src/assurancetourix/assurancetourix/doc/pictures/assurancetourix_map_tf.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+987 KB
src/assurancetourix/assurancetourix/doc/pictures/fisheye_correction_projection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.13 MB
src/assurancetourix/assurancetourix/doc/pictures/fisheye_unbalanced.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+106 KB
src/assurancetourix/assurancetourix/doc/pictures/geometrix_ally_schematic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+44.5 KB
src/assurancetourix/assurancetourix/doc/pictures/geometrix_enemy_schematic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.