-
Notifications
You must be signed in to change notification settings - Fork 1
Cone detection test #144
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
Open
AdrianRosioru
wants to merge
18
commits into
nightly
Choose a base branch
from
cone_detection_test
base: nightly
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.
Open
Cone detection test #144
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
a85db50
added svo2 to gitignore - someone did not commit!
d5088e3
pulled
9a961bd
cone mapping modified for pang
AdrianRosioru b7dddfe
Added deleter for cone_map
AdrianRosioru 184369f
cone deleter sucks
AdrianRosioru 4689e77
finished
AdrianRosioru 66c722c
Velocity broken
AdrianRosioru cd94f0e
Merge branch 'cone_detection_test' of https://github.com/UOA-FSAE/aut…
c17993c
cone_mapping_modified
ce75624
Merge branch 'cone_detection_test' of https://github.com/UOA-FSAE/aut…
e2921cd
Modified kalman filter params
614f389
Merge branch 'nightly' into cone_detection_test
AdrianRosioru d153519
Created a launch file for the zed_launch
AdrianRosioru 2fb5f0d
Made changes as requested
AdrianRosioru 108d5f7
Pang's path planning code
975ffd0
zed launch shell script
winola-whu ec44e7e
modified for crown
winola-whu e1bc657
CanTalk update
winola-whu 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
rosbag2_bagfile_information: | ||
version: 5 | ||
storage_identifier: sqlite3 | ||
duration: | ||
nanoseconds: 0 | ||
starting_time: | ||
nanoseconds_since_epoch: 9223372036854775807 | ||
message_count: 0 | ||
topics_with_message_count: | ||
[] | ||
compression_format: "" | ||
compression_mode: "" | ||
relative_file_paths: | ||
- rosbag2_2025_03_06-20_57_16_0.db3 | ||
files: | ||
- path: rosbag2_2025_03_06-20_57_16_0.db3 | ||
starting_time: | ||
nanoseconds_since_epoch: 9223372036854775807 | ||
duration: | ||
nanoseconds: 0 | ||
message_count: 0 |
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
rosbag2_bagfile_information: | ||
version: 5 | ||
storage_identifier: sqlite3 | ||
duration: | ||
nanoseconds: 0 | ||
starting_time: | ||
nanoseconds_since_epoch: 9223372036854775807 | ||
message_count: 0 | ||
topics_with_message_count: | ||
[] | ||
compression_format: "" | ||
compression_mode: "" | ||
relative_file_paths: | ||
- rosbag2_2025_03_06-21_00_01_0.db3 | ||
files: | ||
- path: rosbag2_2025_03_06-21_00_01_0.db3 | ||
starting_time: | ||
nanoseconds_since_epoch: 9223372036854775807 | ||
duration: | ||
nanoseconds: 0 | ||
message_count: 0 |
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#!/bin/bash | ||
source install/setup.bash | ||
colcon build --packages-select path_planning | ||
ros2 run path_planning centerline_planner | ||
ros2 run path_planning fasttube | ||
#ros2 run path_planning trajectory_generation | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
#!/bin/bash | ||
source install/setup.bash | ||
colcon build --packages-select zed_launch && ros2 run zed_launch zed_launch_node recording2.svo2 | ||
#colcon build --packages-select zed_launch && ros2 run zed_launch zed_launch_node | ||
## with sim | ||
colcon build --packages-select zed_launch && ros2 run zed_launch zed_launch_node recording1.svo2 |
Empty file.
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
Submodule CanTalk
updated
3 files
+5 −0 | CanTalk/CanDapter.py | |
+ − | CanTalk/__pycache__/CanDapter.cpython-310.pyc | |
+ − | CanTalk/__pycache__/__init__.cpython-310.pyc |
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
38 changes: 38 additions & 0 deletions
38
src/perception/aquisition/zed_launch/launch/zed_launch.launch.py
AdrianRosioru marked this conversation as resolved.
Show resolved
Hide resolved
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
from launch import LaunchDescription | ||
from launch.actions import DeclareLaunchArgument | ||
from launch.substitutions import LaunchConfiguration | ||
from launch_ros.actions import Node | ||
|
||
def generate_launch_description(): | ||
# Declare the launch argument for recording name | ||
recording_name_arg = DeclareLaunchArgument( | ||
'recording_name', | ||
default_value='default_recording', | ||
description=""" | ||
This launch file is used to start the ZED camera node with or | ||
without recording functionality. | ||
Usage: | ||
- Without recording: ros2 launch zed_launch.launch.py | ||
- With recording: ros2 launch zed_launch.launch.py recording_name:=<NAME> | ||
The 'recording_name' argument is optional. If provided, the camera node will | ||
initiate a recording session using the specified file name. | ||
""" | ||
) | ||
|
||
# Access the recording name configured by the user | ||
recording_name = LaunchConfiguration('recording_name') | ||
|
||
# Define the node, including the recording name as a command-line argument | ||
camera_node = Node( | ||
package='zed_launch', | ||
executable='zed_launch_node', | ||
name='zed_camera', | ||
output='screen', | ||
arguments=[recording_name] | ||
AdrianRosioru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
) | ||
|
||
return LaunchDescription([ | ||
recording_name_arg, | ||
camera_node | ||
]) |
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
33 changes: 33 additions & 0 deletions
33
src/perception/aquisition/zed_launch/velocity/velocity.cpp
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#include <iostream> | ||
#include <cmath> | ||
|
||
#include "sl/Camera.hpp" | ||
#include "../zed_launch/zed_launch.hpp" | ||
|
||
#include "geometry_msgs/msg/vector3.hpp" | ||
|
||
void ZedLaunchNode::car_velocity() { | ||
|
||
geometry_msgs::msg::Vector3 car_velocity; | ||
sl::SensorsData sensor_data; | ||
sl::SensorsData::IMUData imu_data; | ||
|
||
car_velocity.x = 0; | ||
car_velocity.y = 0; | ||
car_velocity.z = 0; | ||
|
||
while (camera_running) { | ||
std::this_thread::sleep_for(10ms); | ||
|
||
zed.getSensorsData(sensor_data, sl::TIME_REFERENCE::IMAGE); | ||
imu_data = sensor_data.imu; | ||
|
||
car_velocity.x += imu_data.linear_acceleration.x * 0.01; | ||
car_velocity.y += imu_data.linear_acceleration.y * 0.01; | ||
|
||
car_velocity_publisher->publish(car_velocity); | ||
|
||
} | ||
} | ||
|
||
// ### THIS DOES NOT OUTPUT ACCURATE VELOCITY DATA ### |
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.
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.
Uh oh!
There was an error while loading. Please reload this page.