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

fix manner of relURL according to Hugo v0.101 update #147

Merged
merged 4 commits into from
Jun 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
#hugo-version: 'latest'
hugo-version: '0.100.1'
hugo-version: 'latest'

- name: Build
run: hugo --minify
Expand Down
2 changes: 1 addition & 1 deletion config.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
baseURL = "https://toppers.github.io/hakoniwa/"
baseURL = "https://toppers.github.io/hakoniwa"
languageCode = "ja"
title = "箱庭"
theme = "kube"
Expand Down
2 changes: 1 addition & 1 deletion content/docs/aimat.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bref = "箱庭の対象や利用者,本プロジェクトの目指す強みと

大規模かつ複雑なIoTシステムを開発/提供する技術者のための **シミュレーション環境とエコシステム** を構築することを目指しています.

{{< image src="/img/docs/aimat1.png" width="700" >}}
{{< image src="img/docs/aimat1.png" width="700" >}}

箱庭のターゲットは,様々な機器がネットワークで接続された情報システムです.
自動運転や物流,宇宙分野など,IoTの様々な分野を想定しています.
Expand Down
4 changes: 2 additions & 2 deletions content/docs/background.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ IoTシステムは,多様かつ大量の情報機器が,ネットワーク
- アプリケーション系
- 配車管理や交通流管理アプリの開発

{{< image src="/img/docs/back1.png" width="600" >}}
{{< image src="img/docs/back1.png" width="600" >}}

このようなIoTシステムを構築する際の課題として,下記が考えられます.
- 問題発生経路の複雑化
Expand All @@ -45,6 +45,6 @@ IoTシステムは,多様かつ大量の情報機器が,ネットワーク
- 頻繁に変更されるシステム要件に対して,変更適用に時間がかかる
- 実証実験時には結合トラブルが頻発する

{{< image src="/img/docs/back2.png" width="600" >}}
{{< image src="img/docs/back2.png" width="600" >}}

**「箱庭」は,このような技術的課題を解決し,IoTのシステム開発/サービス構築を加速化することができるプラットフォームとなること目指します.**
4 changes: 2 additions & 2 deletions content/docs/concept.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ bref = "「箱庭」に込めているコンセプトと想定される利用シ

IoTや自動運転システム,クラウドロボティクスシステムを開発する際に,仮想環境である箱庭上に様々なソフトウェアやサービスを持ち寄って,机上で実証実験できる場を提供します.

{{< image src="/img/docs/concept1.png" width="700" >}}
{{< image src="img/docs/concept1.png" width="700" >}}

想定している利用シーンは,多様な分野から技術者が集まるIoTシステムの開発現場です.
IoTの各要素が連携される複雑なシステムの事象や状態を,「箱」の中ではシナリオに応じた同じ挙動が再現されるようにします.
そして,箱庭のシステム構成要素である「アセット」を差し替えることで,検証の対象/抽象度/レベルを任意に変更することができます.
また,システム環境の視点(評価観点)や抽象度を,各技術者の分野や立場に応じて切り替えられるようにします.

{{< image src="/img/docs/concept2.png" width="600" >}}
{{< image src="img/docs/concept2.png" width="600" >}}

なお箱庭の語源は,名園や山水を模したミニチュアの庭園に由来します.
盆景や盆栽に類するもので,江戸時代後半から明治時代にかけて流行したといわれています.
2 changes: 1 addition & 1 deletion content/docs/core.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ bref = "箱庭の核となるコア機能と,備えるべき機能特性を紹
箱庭のコア機能と機能特性については,[プロトタイプモデル](/hakoniwa/prototypes/)の開発を進めながら,WG内での設計検討を続けているところです.
詳細が固まりましたら,追って解説を加えていきます.

{{< image src="/img/docs/core1.png" width="700" >}}
{{< image src="img/docs/core1.png" width="700" >}}
2 changes: 1 addition & 1 deletion content/docs/technical.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ bref = "箱庭を形成する技術要素を紹介します"
TOPPERSライセンスのもと,オープンソースで開発を進めています.
- https://github.com/toppers/athrill

{{< image src="/img/athrill.png" width="200" href="https://github.com/toppers/athrill" >}}
{{< image src="img/athrill.png" width="200" href="https://github.com/toppers/athrill" >}}


### mROS
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/aimat.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bref = "Target users, strengths, and novelty of Hakoniwa"

Our goal is to establish a **simulation environment and ecosystem** for engineers who develop/provide massive and complex IoT systems.

{{< image src="/img/docs/aimat1.en.png" width="700" >}}
{{< image src="img/docs/aimat1.en.png" width="700" >}}

Hakoniwa's target is an information system with various devices connected by a network.
We envision IoT applications in various fields, such as autonomous driving, logistics, and space development.
Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/background.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ It crosses various technical domains as follows.
- application Systems
- Development of vehicle assignment management and traffic flow management applications

{{< image src="/img/docs/back1.en.png" width="600" >}}
{{< image src="img/docs/back1.en.png" width="600" >}}

However, we face the following challenges to realizing such an IoT system.
- Complexity of the problem path
Expand All @@ -45,6 +45,6 @@ Next, consider the potential challenges when building IoT services using robots.
- System requirements may change frequently, requiring high effort to apply changes
- Difficulty in combining causes frequent trouble during testing.

{{< image src="/img/docs/back2.en.png" width="600" >}}
{{< image src="img/docs/back2.en.png" width="600" >}}

**Hakoniwa intends to solve such technical issues and accelerate the development of IoT systems and the construction of services.**
4 changes: 2 additions & 2 deletions content/en/docs/concept.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ The concept of Hakoniwa is **"Put mixed things as you like, and try various conc

We provide a virtual environment, which makes it easy to combine and demonstrate different software and services when developing IoT, automated driving systems, cloud robotics systems, etc.

{{< image src="/img/docs/concept1.en.png" width="700" >}}
{{< image src="img/docs/concept1.en.png" width="700" >}}

We envision a use scenario where engineers from diverse fields gather to develop IoT systems.
The "box" simulates the events and states of complex federated IoT systems according to the desired scenario.
And, by just replacing the "assets" that are the system components of Hakoniwa, the user can arbitrarily change the validation's target / abstraction level / accuracy.

{{< image src="/img/docs/concept2.en.png" width="800" >}}
{{< image src="img/docs/concept2.en.png" width="800" >}}

For your information, the origin of Hakoniwa is one of the traditional Japanese cultures in which various elements such as small trees, dolls, bridges, and boats are arranged in a miniature garden in a small box to recreate a picturesque scene.
2 changes: 1 addition & 1 deletion content/en/docs/core.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Also, we believe that the following functional characteristics are essential for
The core functions and functional characteristics of Hakoniwa are still under design study in the WG while developing the [prototype model](/hakoniwa/prototypes/).
We will add more details as we progress.

{{< image src="/img/docs/core1.en.png" width="800" >}}
{{< image src="img/docs/core1.en.png" width="800" >}}
2 changes: 1 addition & 1 deletion content/en/docs/technical.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Members of Hokoniwa WG mainly develop it. It enables debugging and functional ve
The software is being developed as open source under the TOPPERS license.
- https://github.com/toppers/athrill

{{< image src="/img/athrill.png" width="200" href="https://github.com/toppers/athrill" >}}
{{< image src="img/athrill.png" width="200" href="https://github.com/toppers/athrill" >}}


### mROS
Expand Down
2 changes: 1 addition & 1 deletion content/en/prototypes/harmony-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ This is a Hakoniwa prototype model for integration of cloud computing and roboti
- Interaction with RDBOX ( establish a track record of Hakoniwa as a development virtual environment)
- Promote Hakoniwa to the RDBOX user base (PR activities)

{{< image src="/img/prototypes/modelC.en.png" width="700" >}}
{{< image src="img/prototypes/modelC.en.png" width="700" >}}

The prototype model is currently under development. So please wait for its release.
2 changes: 1 addition & 1 deletion content/en/prototypes/multi-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ github = "https://github.com/toppers/hakoniwa-ros-multiplay"
This prototype model simulates multiple robots and control programs in the same environment.
This prototype uses Unity's Photon library to synchronize multiple Unity environments and even time synchronization among assets and uses VR technology to dive into the simulation environment for verification.

{{< image src="/img/prototypes/modelBoverview.en.png" width="700" >}}
{{< image src="img/prototypes/modelBoverview.en.png" width="700" >}}

### Design intent from a technical study perspective

Expand Down
2 changes: 1 addition & 1 deletion content/en/prototypes/single-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This prototype can verify by linking the program's behavior on the embedded micr

- Promote Hakoniwa to ET Robot contenst participants (PR activities)

{{< image src="/img/prototypes/modelA.en.png" width="700" >}}
{{< image src="img/prototypes/modelA.en.png" width="700" >}}

### Installation & Usage

Expand Down
2 changes: 1 addition & 1 deletion content/prototypes/harmony-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ images = ["img/prototypes/modelC.png"]
- RDBOX連携(開発支援仮想環境としての箱庭の実績作り)
- RDBOXユーザ層に箱庭を広める(広報活動)

{{< image src="/img/prototypes/modelC.png" width="700" >}}
{{< image src="img/prototypes/modelC.png" width="700" >}}

現在,本プロトタイプモデルの実現に向けて鋭意開発中です.公開までしばしお待ちください.

2 changes: 1 addition & 1 deletion content/prototypes/multi-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ github = "https://github.com/toppers/hakoniwa-ros-multiplay"
UnityのPhotonライブラリを用いて複数のUnity環境の同期を行っており,加えてアセット間の時間同期も実現しています.
またVRによるシミュレーション環境へのダイブも試行しています.

{{< image src="/img/prototypes/modelBoverview.png" width="700" >}}
{{< image src="img/prototypes/modelBoverview.png" width="700" >}}

### 技術研鑽視点での狙い

Expand Down
2 changes: 1 addition & 1 deletion content/prototypes/single-robot.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ github = "https://github.com/toppers/hakoniwa-single_robot"

- ETロボコンユーザ層に箱庭を広める(広報活動)

{{< image src="/img/prototypes/modelA.png" width="700" >}}
{{< image src="img/prototypes/modelA.png" width="700" >}}

### 導入方法と使用方法

Expand Down
14 changes: 7 additions & 7 deletions content/single-robot-setup-detail/60_unity_install_v1.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ Unityのインストール方法は色々なサイト・書籍で紹介されて
まず,インストールしたUnityを起動してください.
無事起動すると以下のような画面が出ますので,右上の「新規作成」を選択し新規プロジェクト作成します.

{{< image src="/img/single-robot/unity_invoke.png" width="800" >}}
{{< image src="img/single-robot/unity_invoke.png" width="800" >}}

次の選択画面で,「プロジェクト名」に適当なプロジェクト名を設定して,「作成」ボタンを押下してください.

{{< image src="/img/single-robot/unity_create_project.png" width="800" >}}
{{< image src="img/single-robot/unity_create_project.png" width="800" >}}

成功すると,以下のようにUnityが起動します.

{{< image src="/img/single-robot/unity_start.png" width="800" >}}
{{< image src="img/single-robot/unity_start.png" width="800" >}}


### Unityパッケージのインポート
Expand All @@ -48,12 +48,12 @@ Unity のメニューから,「Assets」⇒「Import Package」⇒「Custom Pa

成功すると,下図の画面がポップアップされますので,素直に「Import」ボタンを押下してください.

{{< image src="/img/single-robot/unity_import.png" width="300" >}}
{{< image src="img/single-robot/unity_import.png" width="300" >}}

成功するとProject/Scenes配下にToppers_Courseというシーンが追加されます.
Toppers_Courseをダブルクリックすると下図の画面が現れます.

{{< image src="/img/single-robot/unity_HackEV.png" width="900" >}}
{{< image src="img/single-robot/unity_HackEV.png" width="900" >}}


次に,シミュレーションに関わる設定を変更します.
Expand All @@ -64,7 +64,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
`Fixed Timestep` を 0.001に,
`Time Scale` を 0.6に設定します.

{{< image src="/img/single-robot/unity_setting_time.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_time.png" width="700" >}}

`ev3rt-simple-robot.unitypackage`を使用する場合で,もしシミュレーションの動作が
遅い場合には,`Fixed Timestep` を 0.01に,EV3 Motor(Script)の`Interval`を 0.0005に
Expand All @@ -73,7 +73,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
「Quality」
`Other``VSync Count` を Don't Sync に設定します.

{{< image src="/img/single-robot/unity_setting_quality.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_quality.png" width="700" >}}

これでインポート作業終了です.

Expand Down
14 changes: 7 additions & 7 deletions content/single-robot-setup-detail/60_unity_install_v2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ Unityのインストール方法は色々なサイト・書籍で紹介されて
まず,インストールしたUnityを起動してください.
無事起動すると以下のような画面が出ますので,右上の「新規作成」を選択し新規プロジェクト作成します.

{{< image src="/img/single-robot/unity_invoke.png" width="800" >}}
{{< image src="img/single-robot/unity_invoke.png" width="800" >}}

次の選択画面で,「プロジェクト名」に適当なプロジェクト名を設定して,「作成」ボタンを押下してください.

{{< image src="/img/single-robot/unity_create_project.png" width="800" >}}
{{< image src="img/single-robot/unity_create_project.png" width="800" >}}

成功すると,以下のようにUnityが起動します.

{{< image src="/img/single-robot/unity_start.png" width="800" >}}
{{< image src="img/single-robot/unity_start.png" width="800" >}}



Expand All @@ -49,12 +49,12 @@ Unity のメニューから,「Assets」⇒「Import Package」⇒「Custom Pa

成功すると,下図の画面がポップアップされますので,素直に「Import」ボタンを押下してください.

{{< image src="/img/single-robot/unity_import.png" width="300" >}}
{{< image src="img/single-robot/unity_import.png" width="300" >}}

成功するとProject/Scenes配下にToppers_Courseというシーンが追加されます.
Toppers_Courseをダブルクリックすると下図の画面が現れます.

{{< image src="/img/single-robot/unity_HackEV.png" width="900" >}}
{{< image src="img/single-robot/unity_HackEV.png" width="900" >}}


次に,シミュレーションに関わる設定を変更します.
Expand All @@ -65,7 +65,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
`Fixed Timestep` を 0.001に,
`Time Scale` を 0.6に設定します.

{{< image src="/img/single-robot/unity_setting_time.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_time.png" width="700" >}}

`ev3rt-simple-robot.unitypackage`を使用する場合で,もしシミュレーションの動作が
遅い場合には,`Fixed Timestep` を 0.01に,EV3 Motor(Script)の`Interval`を 0.0005に
Expand All @@ -74,7 +74,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
「Quality」
`Other``VSync Count` を Don't Sync に設定します.

{{< image src="/img/single-robot/unity_setting_quality.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_quality.png" width="700" >}}

これでインポート作業終了です.

Expand Down
14 changes: 7 additions & 7 deletions content/single-robot-setup-detail/60_unity_install_v2.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ Unityのインストール方法は色々なサイト・書籍で紹介されて
まず,インストールしたUnityを起動してください.
無事起動すると以下のような画面が出ますので,右上の「新規作成」を選択し新規プロジェクト作成します.

{{< image src="/img/single-robot/unity_invoke.png" width="800" >}}
{{< image src="img/single-robot/unity_invoke.png" width="800" >}}

次の選択画面で,「プロジェクト名」に適当なプロジェクト名を設定して,「作成」ボタンを押下してください.

{{< image src="/img/single-robot/unity_create_project.png" width="800" >}}
{{< image src="img/single-robot/unity_create_project.png" width="800" >}}

成功すると,以下のようにUnityが起動します.

{{< image src="/img/single-robot/unity_start.png" width="800" >}}
{{< image src="img/single-robot/unity_start.png" width="800" >}}



Expand All @@ -49,12 +49,12 @@ Unity のメニューから,「Assets」⇒「Import Package」⇒「Custom Pa

成功すると,下図の画面がポップアップされますので,素直に「Import」ボタンを押下してください.

{{< image src="/img/single-robot/unity_import.png" width="300" >}}
{{< image src="img/single-robot/unity_import.png" width="300" >}}

成功するとProject/Scenes配下にToppers_Courseというシーンが追加されます.
Toppers_Courseをダブルクリックすると下図の画面が現れます.

{{< image src="/img/single-robot/unity_HackEV.png" width="900" >}}
{{< image src="img/single-robot/unity_HackEV.png" width="900" >}}


次に,シミュレーションに関わる設定を変更します.
Expand All @@ -65,7 +65,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
`Fixed Timestep` を 0.001に,
`Time Scale` を 0.6に設定します.

{{< image src="/img/single-robot/unity_setting_time.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_time.png" width="700" >}}

`ev3rt-simple-robot.unitypackage`を使用する場合で,もしシミュレーションの動作が
遅い場合には,`Fixed Timestep` を 0.01に,EV3 Motor(Script)の`Interval`を 0.0005に
Expand All @@ -74,7 +74,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
「Quality」
`Other``VSync Count` を Don't Sync に設定します.

{{< image src="/img/single-robot/unity_setting_quality.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_quality.png" width="700" >}}

これでインポート作業終了です.

Expand Down
2 changes: 1 addition & 1 deletion content/single-robot-setup-detail/61_unity_install_mmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Unity のメニューから,「Edit」⇒「Project Settings」を選択しま
「Player」
`Other Setting``Scripting Define Symbols``VDEV_IO_MMAP`と設定します.

{{< image src="/img/single-robot/unity_setting_player_mmap.png" width="700" >}}
{{< image src="img/single-robot/unity_setting_player_mmap.png" width="700" >}}

# MMAP用パラメータ設定

Expand Down
Loading