Skip to content

Commit 9ff5de2

Browse files
authored
Merge pull request #20 from toppers/rel-v1.1.0
release v1.1.0
2 parents 824e9d9 + d7f07c3 commit 9ff5de2

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,7 @@ https://hub.docker.com/r/toppersjp/hakoniwa-ros2sim
9191
$ bash docker/pull-image.bash
9292
```
9393

94-
\[補足:開発者向け情報\] Dockerイメージの作成
95-
96-
```
97-
$ bash docker/create-image.bash
98-
```
94+
\[補足:開発者向け情報\] Dockerイメージの作成用に `docker/create-image.bash` があります.
9995

10096
### dockerを起動する
10197

@@ -208,6 +204,9 @@ Unityのシミュレーション開始ボタンをクリックすると,以下
208204

209205
## TODO
210206

207+
- [ ] Dockerを利用しないネイティブのLinux環境(WSL2を含む)での動作をサポート ([#18](https://github.com/toppers/hakoniwa-ros2sim/issues/18))
208+
- [ ] SLAMやNav2の動作例を示す ([#19](https://github.com/toppers/hakoniwa-ros2sim/issues/19))
209+
211210

212211
## 謝辞
213212
* TurtleBot3 の Unity パッケージの設計と作成にあたっては,宝塚大学 東京メディア芸術学部 吉岡章夫准教授および学部生の杉崎涼志さん,木村明美さんにご協力いただきました.

appendix/latest_version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0.0
1+
v1.1.0

appendix/version.md

+11
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@
1919

2020
## 更新履歴
2121

22+
### v1.1.0 @ 2022/05/06
23+
24+
- リポジトリ名の変更
25+
- README の作成と改善
26+
- Docker image の公開
27+
- ユーザ利便性の改善
28+
- submodule の URL を https に変更
29+
- Docker 操作のスクリプトを全プラットフォームで共通化
30+
- 箱庭アセットとバージョン (commit hash) 情報
31+
- [hakoniwa-core](https://github.com/toppers/hakoniwa-core) / sha: [35c47fe42af58f37a4843e5e789e5f749acfbf0b](https://github.com/toppers/hakoniwa-core/tree/35c47fe42af58f37a4843e5e789e5f749acfbf0b)
32+
2233
### v1.0.0 @ 2022/04/23
2334

2435
- 最初のリリース

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ RUN apt-get install -y software-properties-common
7373
RUN add-apt-repository ppa:mosquitto-dev/mosquitto-ppa
7474
RUN apt-get install -y libmosquitto-dev
7575

76-
WORKDIR /root/workspace/hakoniwa-ros-samples/ros2/workspace
76+
WORKDIR /root/workspace/hakoniwa-ros2sim/ros2/workspace
7777
RUN chmod +x /root/workspace/hakoniwa-core/impl/asset/client/build/cpp/hako-*
7878
ENV CORE_PORTNO 50051

docker/run.bash

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ fi
3737

3838
if [ ${OS_TYPE} != "Mac" ]
3939
then
40-
docker run -v ${HAKONIWA_TOP_DIR}:/root/workspace/hakoniwa-ros-samples \
40+
docker run -v ${HAKONIWA_TOP_DIR}:/root/workspace/hakoniwa-ros2sim \
4141
-it --rm \
4242
--net host \
4343
-e CORE_IPADDR=${IPADDR} \
4444
-e OS_TYPE=${OS_TYPE} \
4545
--name hakoniwa-ros2sim ${DOCKER_IMAGE}
4646
else
47-
docker run -v ${HAKONIWA_TOP_DIR}:/root/workspace/hakoniwa-ros-samples \
47+
docker run -v ${HAKONIWA_TOP_DIR}:/root/workspace/hakoniwa-ros2sim \
4848
-it --rm \
4949
--ip ${IPADDR} -p 10000:10000 \
5050
-e CORE_IPADDR=${IPADDR} \
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/opt/ros/foxy/share
2-
/root/workspace/hakoniwa-ros-samples/ros2/workspace/src
2+
/root/workspace/hakoniwa-ros2sim/ros2/workspace/src

utils/create_ros2unity_info_wsl2.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export CORE_IPADDR=`cat /etc/resolv.conf | grep nameserver | awk '{print $NF}'`
44

5-
cat settings/tb3/ros2_search_file_path.txt | grep -v samples > tmp.txt
5+
cat settings/tb3/ros2_search_file_path.txt | grep -v ros2sim > tmp.txt
66
CURDIR=`pwd`
77
echo "${CURDIR}/ros2/workspace/src" >> tmp.txt
88
mv tmp.txt settings/tb3/ros2_search_file_path.txt

0 commit comments

Comments
 (0)