Skip to content

Commit fc4cf63

Browse files
fix localization bug
1 parent a815756 commit fc4cf63

5 files changed

Lines changed: 21 additions & 18 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ logs/
55
build/
66

77
.catkin_tools
8-
abseil-cpp
8+
abseil-cpp
9+
10+
**__pycache__**

README.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ If you have any questions, please feel free to contact us: [smkk00715@gmail.com]
1515
## Features
1616

1717
- SLAM
18-
- [x] Cartographer
19-
- [x] Fast-LIO2
20-
- [x] Map Fusion
18+
- [X] Cartographer
19+
- [X] Fast-LIO2
20+
- [X] Map Fusion
2121
- Planning and Control (PnC)
22-
- [x] A\*
23-
- [x] Theta\*
24-
- [x] DWA
25-
- [x] TEB
26-
- [x] Model Predictive Control (MPC)
22+
- [X] A\*
23+
- [X] Theta\*
24+
- [X] DWA
25+
- [X] TEB
26+
- [X] Model Predictive Control (MPC)
2727
- Perception: EasyOCR
2828
- Decision and Exploration
29-
- [x] Finite State Machine (FSM)
30-
- [x] Frontier and occupancy grid map-based exploration
29+
- [X] Finite State Machine (FSM)
30+
- [X] Frontier and occupancy grid map-based exploration
3131
- Pipeline: Highly modular, automated, and configurable
3232

3333
## Structure
@@ -90,7 +90,6 @@ catkin config -DPYTHON_EXECUTABLE=/usr/bin/python3 -DCMAKE_BUILD_TYPE=RelWithDeb
9090
```shell
9191
~/me5413_final_ws/src/third_party/cartographer/cartographer/scripts/install_abseil.sh
9292
```
93-
9493
- Build:
9594

9695
```shell
@@ -117,7 +116,7 @@ echo "source ~/me5413_final_ws/devel/setup.bash" >> ~/.bashrc
117116
bash
118117
```
119118

120-
### Prepare perception packages (optional)
119+
### 3. Prepare perception packages (optional)
121120

122121
Please install `conda` first.
123122

@@ -170,7 +169,6 @@ roslaunch me5413_world me5413_world.launch
170169
<p align="center">
171170
<img src="final_slam/maps/carto_map_2d.png" alt="carto_map" width="30%">
172171
</p>
173-
174172
- **Fast-LIO**
175173

176174
```shell
@@ -211,7 +209,6 @@ roslaunch me5413_world me5413_world.launch
211209
<p align="center">
212210
<img src="final_slam/maps/fast_lio_map.png" alt="fast_lio_map" width="30%">
213211
</p>
214-
215212
- **Map Fusion**
216213

217214
To fully utilize the maps generated both by Cartographer and Fast-LIO, we provide a simple Python script that uses image processing methods to fuse these two high-quality maps into one. To perform this, execute:

install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ git clone https://github.com/gpakosz/.tmux.git
1616
ln -s -f .tmux/.tmux.conf
1717
cp .tmux/.tmux.conf.local .
1818
tmux source-file ~/.tmux.conf
19-
echo "set -g mouse on" >>~/.tmux.conf
20-
echo "tmux_conf_copy_to_os_clipboard=true" >>~/.tmux.conf
19+
sed -i '1i\
20+
set -g mouse on' ~/.tmux.conf.local
21+
sed -i '1i\
22+
tmux_conf_copy_to_os_clipboard=true' ~/.tmux.conf.local
2123

2224
echo 'alias rosk="rosnode kill -a ; killall -9 roscore rosmaster gzserver gazebo rviz rqt rqt_tf_tree rqt_graph rqt_reconfigure"
2325
alias gazebok="pkill -P $(pgrep -f gazebo.launch) ; pkill -9 gzserver ; pkill -9 gzclient"

src/final_pnc/temp/curr_params_log.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"time": "2024-04-13 17:04:16",
2+
"time": "2025-04-04 19:55:55",
33
"method": "mpc",
44
"map_frame": "map",
55
"ref_path_topic": "/move_base/TrajectoryPlannerROS/global_plan",

src/final_slam/launch/localization_carto.launch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
<group unless="$(arg enable_ekf)">
1919
<node pkg="final_slam" type="get_gt_odom.py" name="get_gt_odom" output="screen" />
20+
<node pkg="tf2_ros" type="static_transform_publisher" name="map2odom"
21+
args="0 0 0 0 0 0 map odom" />
2022
</group>
2123

2224
<!-- Launch Cartographer -->

0 commit comments

Comments
 (0)