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

106 feature extended kalman filter for more precise location measurements #150

Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e7dec54
feat(#106): changed docker-compose.yml and kalman_filter.py
robertik10 Dec 13, 2023
167d9cb
feat(#106): kalanfilter works
robertik10 Dec 13, 2023
25a7fe0
feat(#106): addded debug + unfiltered gps data
robertik10 Dec 14, 2023
eddac1d
feat(#106): more plots
robertik10 Dec 15, 2023
f6d54d9
feat(#106): functioning kalman filter
robertik10 Dec 18, 2023
fd3eba5
feat(#106): functioning kalman filter
robertik10 Dec 18, 2023
cd782ca
feat(#106): fixed heading angle calculation
robertik10 Jan 7, 2024
7592133
Merge branch 'main' into 106-feature-extended-kalman-filter-for-more-…
robertik10 Jan 7, 2024
630874e
feat(#106): cleaned up the Position_Publisher_Node
robertik10 Jan 12, 2024
f1e75bf
feat(#106): cleaned up the perception launch
robertik10 Jan 12, 2024
40d87f1
feat(#106): Added kalman datasets
robertik10 Jan 12, 2024
a33df32
fix: add behaviour tree to flake8 config exclusion
robertik10 Jan 12, 2024
177da72
fix: test commit
robertik10 Jan 12, 2024
a67f00d
feat(#106): added documentation-> this branch is ready for merge
robertik10 Jan 14, 2024
54f2494
feat(#106): ready for merge
robertik10 Jan 14, 2024
bf6080d
Merge branch 'main' into 106-feature-extended-kalman-filter-for-more-…
robertik10 Jan 14, 2024
65b4a0c
feat(#106): commented the Acting Debugger
robertik10 Jan 14, 2024
46ef234
Merge branch '106-feature-extended-kalman-filter-for-more-precise-loc…
robertik10 Jan 14, 2024
21a595b
Update 00_coordinate_transformation.md
robertik10 Jan 15, 2024
c7f33c6
Update 00_coordinate_transformation.md
robertik10 Jan 15, 2024
2a8375e
Update coordinate_transformation.py
robertik10 Jan 15, 2024
c2aab4b
fix: add new data to the repo + heading
robertik10 Jan 17, 2024
838f49a
Merge branch '106-feature-extended-kalman-filter-for-more-precise-loc…
robertik10 Jan 17, 2024
2778195
fix: ready for merge
robertik10 Jan 17, 2024
aa2fa11
fix: ready for merge
robertik10 Jan 17, 2024
5d56c01
fix: rechanged docker-compose.yml to original-> ready for merge
robertik10 Jan 17, 2024
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
4 changes: 3 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[flake8]
exclude= code/planning/behavior_agent/src/behavior_agent/behavior_tree.py,
code/planning/behavior_agent/src/behavior_agent/behaviours/__init__.py
code/planning/behavior_agent/src/behavior_agent/behaviours/__init__.py,
code/planning/src/behavior_agent/behavior_tree.py,
code/planning/src/behavior_agent/behaviours/__init__.py
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ code/output

# Byte-compiled / optimized / DLL files
__pycache__/

1 change: 0 additions & 1 deletion build/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ services:
#command: bash -c "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/opt/leaderboard/leaderboard/autoagents/npc_agent.py --host=carla-simulator --track=SENSORS"
#command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch"
command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/workspace/code/agent/src/agent/agent.py --host=carla-simulator --track=MAP"

logging:
driver: "local"
environment:
Expand Down
49 changes: 27 additions & 22 deletions code/perception/launch/perception.launch
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,43 @@
<arg name="role_name" default="hero" />
<arg name="control_loop_rate" default="0.1" />

<!--just for testing purposes -> Uncomment to use and see plots
<node pkg="perception" type="sensor_filter_debug.py" name="sensor_filter_debug" output="screen">
<!--just for testing purposes -> Uncomment to use and see plots -->
<!-- <node pkg="perception" type="sensor_filter_debug.py" name="sensor_filter_debug" output="screen">
<param name="control_loop_rate" value="0.001" />
<param name="role_name" value="$(arg role_name)" />
</node>
<node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot" args="/paf/hero/location_error/data[0] /paf/hero/location_error/data[1]" />
</node> -->
<!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot" args="/paf/hero/location_error/data[0] /paf/hero/location_error/data[1]" />
<node pkg="rqt_plot" type="rqt_plot" output="screen" name="x_plot" args="/paf/hero/ideal_x/data[0] /paf/hero/ideal_x/data[1]" />
<node pkg="rqt_plot" type="rqt_plot" output="screen" name="y_plot" args="/paf/hero/ideal_y/data[0] /paf/hero/ideal_y/data[1]" /-->
<!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="error_plot" args="/paf/hero/ideal_x/data[2]" />
-->

<!-- does not publish data yet. Uncomment to use and see plots
<!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="error_plot" args="/paf/hero/ideal_x/data[2]" /-->

<node pkg="perception" type="kalman_filter.py" name="kalman_filter_node" output="screen">
<param name="control_loop_rate" value="0.1" />
<param name="control_loop_rate" value="0.05" />
<param name="role_name" value="$(arg role_name)" />
</node>
<node pkg="rqt_plot" type="rqt_plot" output="screen" name="x_plot" args="/paf/hero/current_pos/data[0] /paf/hero/kalman_pos/data[0]" />
<node pkg="rqt_plot" type="rqt_plot" output="screen" name="y_plot" args="/paf/hero/current_pos/data[1] /paf/hero/kalman_pos/data[1]" />
<node pkg="rqt_plot" type="rqt_plot" output="screen" name="heading_plot" args="/paf/hero/current_heading/data /paf/hero/kalman_heading/data" />
-->


<node pkg="perception" type="Position_Publisher_Node.py" name="Position_Publisher_Node" output="screen">
<param name="control_loop_rate" value="0.1" />
<param name="role_name" value="$(arg role_name)" />
<param name="pos_filter" value="Kalman" />
<param name="heading_filter" value="Kalman" />
<!--
Position Filter values:
- "Kalman" (Default)
- "RunningAvg"
- "None"
Heading Filter values:
- "Kalman" (Default)
- "None"
-->
</node>


<node pkg="perception" type="vision_node.py" name="VisionNode" output="screen">
<param name="role_name" value="$(arg role_name)" />
<param name="side" value="Center" />

<!-- Object-Detection:

<!--
Object-Detection:
- fasterrcnn_resnet50_fpn_v2
- fasterrcnn_mobilenet_v3_large_320_fpn
- yolov8n
Expand All @@ -52,11 +57,11 @@

Image-Segmentation:
- deeplabv3_resnet101
- yolov8x-seg -->

- yolov8x-seg
-->
<param name="model" value="yolov8x-seg" />
</node>


<node pkg="perception" type="global_plan_distance_publisher.py" name="GlobalPlanDistance" output="screen">
<param name="control_loop_rate" value="0.1" />
Expand All @@ -73,7 +78,7 @@
<param name="range_topic" value="/carla/hero/LIDAR_range"/>
</node>

<!-- <node pkg="perception" type="lidar_distance.py" name="lidar_distance_rear_right" output="screen">
<node pkg="perception" type="lidar_distance.py" name="lidar_distance_rear_right" output="screen">
<param name="min_y" value="-5"/>
<param name="max_y" value="-2.5"/>
<param name="max_x" value="0"/>
Expand All @@ -91,6 +96,6 @@
<param name="max_z" value="0"/>
<param name="point_cloud_topic" value="/carla/hero/LIDAR_filtered_rear_left"/>
<param name="range_topic" value="/carla/hero/LIDAR_range_rear_left"/>
</node>-->
</node>

</launch>
Loading
Loading