From: Raul Cataluna Athayde Date: Sun, 4 Jul 2021 18:59:02 +0000 (-0300) Subject: localization with basic configuration of amcl, but no data fusion implemented, maybe... X-Git-Tag: raulTCC~1 X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=fdc0ff8fa6f71928c949abe7b03f207ff7805e03;p=twil.git localization with basic configuration of amcl, but no data fusion implemented, maybe there some data fusion on the navigation stack, but yet unknown --- diff --git a/twil_description/xacro/caster_wheel.urdf.xacro b/twil_description/xacro/caster_wheel.urdf.xacro index a1aaf19..27dd15c 100644 --- a/twil_description/xacro/caster_wheel.urdf.xacro +++ b/twil_description/xacro/caster_wheel.urdf.xacro @@ -36,15 +36,15 @@ Gazebo/Grey - + diff --git a/twil_description/xacro/fixed_wheel.urdf.xacro b/twil_description/xacro/fixed_wheel.urdf.xacro index 31d48dc..b235dd4 100644 --- a/twil_description/xacro/fixed_wheel.urdf.xacro +++ b/twil_description/xacro/fixed_wheel.urdf.xacro @@ -49,7 +49,7 @@ Gazebo/FlatBlack - + diff --git a/twil_description/xacro/twil.urdf.xacro b/twil_description/xacro/twil.urdf.xacro index 80e3882..b75a0fd 100644 --- a/twil_description/xacro/twil.urdf.xacro +++ b/twil_description/xacro/twil.urdf.xacro @@ -138,7 +138,7 @@ map twil_origin - true_odom + ground_truth 30.0 diff --git a/twil_location/launch/gazebo.launch b/twil_location/launch/gazebo.launch index 78e45df..df9ad20 100644 --- a/twil_location/launch/gazebo.launch +++ b/twil_location/launch/gazebo.launch @@ -9,6 +9,10 @@ + + + + @@ -24,18 +28,35 @@ + + + + + + + + + + + + + + + + + - + - + diff --git a/twil_location/launch/location.launch b/twil_location/launch/location.launch index 6924902..db5a56c 100644 --- a/twil_location/launch/location.launch +++ b/twil_location/launch/location.launch @@ -1,64 +1,112 @@ - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/twil_location/launch/plot.launch b/twil_location/launch/plot.launch index eb277a4..9525948 100644 --- a/twil_location/launch/plot.launch +++ b/twil_location/launch/plot.launch @@ -1,15 +1,15 @@ - + - + - + - + - + - + diff --git a/twil_location/rviz/twil_mapping.rviz b/twil_location/rviz/twil_mapping.rviz index 114a21a..35432ac 100644 --- a/twil_location/rviz/twil_mapping.rviz +++ b/twil_location/rviz/twil_mapping.rviz @@ -254,6 +254,82 @@ Visualization Manager: Unreliable: false Value: true - Alpha: 0.699999988079071 + + Class: rviz/Odometry + Covariance: + Orientation: + Alpha: 0.5 + Color: 255; 255; 127 + Color Style: Unique + Frame: Local + Offset: 1 + Scale: 1 + Value: true + Position: + Alpha: 0.30000001192092896 + Color: 204; 51; 204 + Scale: 1 + Value: true + Value: true + Enabled: true + Keep: 42 + Name: rgbd_Odometry + Position Tolerance: 0.30000001192092896 + Queue Size: 10 + Shape: + Alpha: 1 + Axes Length: 1 + Axes Radius: 0.10000000149011612 + Color: 25; 255; 0 + Head Length: 0.30000001192092896 + Head Radius: 0.10000000149011612 + Shaft Length: 1 + Shaft Radius: 0.05000000074505806 + Value: Arrow + Topic: /rgbd_odom + Unreliable: false + Value: true + - Alpha: 0.699999988079071 + + Class: rviz/Odometry + Covariance: + Orientation: + Alpha: 0.5 + Color: 255; 255; 127 + Color Style: Unique + Frame: Local + Offset: 1 + Scale: 1 + Value: true + Position: + Alpha: 0.30000001192092896 + Color: 204; 51; 204 + Scale: 1 + Value: true + Value: true + Enabled: true + Keep: 42 + Name: ground_truth + Position Tolerance: 0.30000001192092896 + Queue Size: 10 + Shape: + Alpha: 1 + Axes Length: 1 + Axes Radius: 0.10000000149011612 + Color: 25; 25; 255 + Head Length: 0.30000001192092896 + Head Radius: 0.10000000149011612 + Shaft Length: 1 + Shaft Radius: 0.05000000074505806 + Value: Arrow + Topic: /ground_truth + Unreliable: false + Value: true + - Alpha: 0.699999988079071 + + + + Class: rviz/Map Color Scheme: costmap Draw Behind: false @@ -265,19 +341,21 @@ Visualization Manager: Value: true - Alpha: 1 Axes Length: 1 - Axes Radius: 0.10000000149011612 + Axes Radius: 0.10000000149011612 + Class: rviz/Map Color Scheme: map Draw Behind: false Enabled: true Name: Map(SLAM) - Topic: /slam_gmapping/Slam_map + Topic: /Slam_map Unreliable: false Use Timestamp: false Value: true - Alpha: 1 Axes Length: 1 - Axes Radius: 0.10000000149011612 + Axes Radius: 0.10000000149011612 + Class: rviz/Pose Color: 255; 255; 0 Enabled: true