Merge pull request airalab#611 from tubleronchik/master

upgrade smart home structure

data/sidebar_docs.yaml

@@ -2,38 +2,60 @@
   items:
     - title_en: Overview
       link: /docs/robonomics-smart-home-overview
-    - title_en: Install
+    - title_en: Pre-installed Image For Raspberry Pi
       items:
-        - title_en: Pre-installed Image For Raspberry Pi
+        - title_en: Installation
           link: /docs/hass-image-install
-        - title_en: Upgrade Home Assistant OS
-          link: /docs/hass-os-upgrade
-        - title_en: Upgrade Home Assistant Docker for Unix-like OS
-          link: /docs/hass-docker-upgrade
-        - title_en: Upgrade Home Assistant Core
-          link: /docs/hass-core-upgrade
-    - title_en: Configure
-      items:
         - title_en: Home Assistant Init
           link: /docs/hass-init
-        - title_en: MQTT Broker Options
-          items:
-            - title_en: MQTT Broker for Home Assistant OS
-              link: /docs/mqtt-hassos
-            - title_en: MQTT Broker for Pre-installed Image, HA Docker, HA Core
-              link: /docs/mqtt-image-docker-core
+        - title_en: MQTT Broker
+          link: /docs/mqtt-image-docker-core
         - title_en: MQTT Integration Setup
           link: /docs/mqtt-integration
-        - title_en: ZigBee Setup Options
-          items:
-            - title_en: Zigbee2MQTT Adapter for Home Assistant OS
-              link: /docs/zigbee-to-mqtt-hassos
-            - title_en: Zigbee2MQTT Adapter for Pre-installed Image, HA Docker, HA Core
-              link: /docs/zigbee-to-mqtt
-            - title_en: Robonomics SLS Gateway
-              link: /docs/sls-gateway
-    - title_en: IoT Subscription
+        - title_en: Zigbee2MQTT Adapter
+          link: /docs/zigbee-to-mqtt-image
+        - title_en: Subscription Activate
+          link: /docs/sub-activate
+        - title_en: Robonomics Integration Setup
+          link: /docs/robonomics-hass-integration
+    - title_en: Upgrade Home Assistant OS
       items:
+        - title_en: Robonomics Installation
+          link: /docs/hass-os-upgrade
+        - title_en: MQTT Broker
+          link: /docs/mqtt-hassos
+        - title_en: MQTT Integration Setup
+          link: /docs/mqtt-integration
+        - title_en: Zigbee2MQTT Adapter
+          link: /docs/zigbee-to-mqtt-hassos
+        - title_en: Subscription Activate
+          link: /docs/sub-activate
+        - title_en: Robonomics Integration Setup
+          link: /docs/robonomics-hass-integration
+    - title_en: Upgrade Home Assistant Docker for Unix-like OS
+      items: 
+        - title_en: Robonomics Installation
+          link: /docs/hass-docker-upgrade
+        - title_en: MQTT Broker
+          link: /docs/mqtt-image-docker-core
+        - title_en: MQTT Integration Setup
+          link: /docs/mqtt-integration
+        - title_en: Zigbee2MQTT Adapter
+          link: /docs/zigbee-to-mqtt
+        - title_en: Subscription Activate
+          link: /docs/sub-activate
+        - title_en: Robonomics Integration Setup
+          link: /docs/robonomics-hass-integration
+    - title_en: Upgrade Home Assistant Core
+      items: 
+        - title_en: Robonomics Installation
+          link: /docs/hass-core-upgrade
+        - title_en: MQTT Broker
+          link: /docs/mqtt-image-docker-core
+        - title_en: MQTT Integration Setup
+          link: /docs/mqtt-integration
+        - title_en: Zigbee2MQTT Adapter
+          link: /docs/zigbee-to-mqtt
         - title_en: Subscription Activate
           link: /docs/sub-activate
         - title_en: Robonomics Integration Setup

docs/hass-image-install.md

@@ -26,11 +26,11 @@ tools:
 
 To simplify the installation process, a pre-made image can be used. It contains Home Assistant Core with Robonomics integration and IPFS. Options for downloading:
 
-### GitHub Release
+### Option 1: GitHub Release
 
-Download it from the latest [GitHub releases.](https://github.com/airalab/Robonomics-HomeAssistant-image/releases)
+Download image-robonomics_homeassistant.img.xz with current update date from the latest [GitHub releases.](https://github.com/airalab/Robonomics-HomeAssistant-image/releases)
 
-### IPFS get
+### Option 2: IPFS get
 
 Alternatively, you can download it using IPFS. [Install IPFS](https://docs.ipfs.tech/install/command-line/), initialize and start the daemon:
 
@@ -95,10 +95,6 @@ User is `smart`, password is `robot`.
 
 </robo-wiki-note>
 
-## Next step
-
-Now you have a Raspberry Pi with firmware installed, go to the [Home Assistant Init](/docs/hass-init/) article.
-
 <!-- ## Related videos
 
 https://youtu.be/qW4sjUaShWA -->

docs/hass-os-upgrade.md

@@ -87,23 +87,6 @@ wget -O - https://get.hacs.xyz | bash -
 
 Now you can install Robonomics Integration using HACS.
 
-<robo-wiki-video autoplay loop controls :videos="[{src: 'https://crustipfs.info/ipfs/Qmb19UEQwwHfNroCaH8NMFhPV2dc52vSC8i4ATJsqVYiZf', type:'mp4'}]" />
+<robo-wiki-video autoplay loop controls :videos="[{src: 'https://crustipfs.live/ipfs/QmUodGanHyTE8hCJdcCHzvdnmuyVVGvnfTuYvYTPVKhh5d', type:'mp4'}]" />
 
-1. Open HACS from a sidebar menu and go to `Integrations`. Press on three dots in the upper right corner and choose `Custom Repositories`. In the opened window paste the following link:
-
-<code-helper copy>
-
-```
-https://github.com/airalab/homeassistant-robonomics-integration
-```
-
-</code-helper>
-
-2. After that, choose `Integration` category and press `ADD`. 
-
-3. In `Custom Repositories` click on Robonomics and press the `Download` button in the lower right corner. After downloading, restart Home Assistant.
-
-Now you have two options:
-
-- If you have not yet used MQTT integration to connect smart devices via Zigbee adapter, go to the [**MQTT Broker for Home Assistant OS**](/docs/mqtt-hassos) article.
-- Otherwise, go to the [**IoT Subscription**](/docs/sub-activate) section and start activating the Robonomics subscription.
+Open HACS from the sidebar menu and navigate to `Integrations`. Click on `Explore & Download Repositories`, then search for `Robonomics` and click on the `Download` button located in the lower right corner. Once the download is complete, restart Home Assistant.

docs/mqtt-hassos.md

@@ -34,5 +34,3 @@ tools:
 </robo-wiki-note>
 
 3. Save the configuration and go to the `Info` tab to start the add-on.
-
-Continue MQTT setup with the [**MQTT Integration Setup**](/docs/mqtt-integration) article.

docs/mqtt-image-docker-core.md

@@ -22,10 +22,6 @@ bash mqtt-install.sh
 
 You will be asked to enter `USERNAME` and `PASSWORD` for the broker. After finishing, the broker will be running as a `systemd` service.
 
-## Next step
-
-After that, go to the [MQTT Integration Setup](/docs/mqtt-integration/) article.
-
 ## Related videos
 
 https://youtu.be/n4PX25aB1JU

docs/mqtt-integration.md

@@ -23,14 +23,3 @@ tools:
 - Username & password — your credentials which you created earlier for Mosquitto Broker.
 
 4. After that, press `SUBMIT`.
-
-Now, you can proceed to add devices. Depending on the hardware you have, choose one of the options:
-
-**Option 1 (with zigbee2MQTT for Home Assistant OS)**
-* For Zigbee adapter and Home Assistant OS [go here](/docs/zigbee-to-mqtt-hassos/). Ideal for [JetHome USB JetStick Z2](https://jethome.ru/z2/?sl=en) or similar [supported adapters](https://www.zigbee2mqtt.io/information/supported_adapters.html).
-
-**Option 2 (with zigbee2MQTT for for pre-installed image or Home Assistant Docker or Core)**
-* For Zigbee adapter with other options of the Home Assistant installation [go here](/docs/zigbee-to-mqtt/). Ideal for [JetHome USB JetStick Z2](https://jethome.ru/z2/?sl=en) or similar [supported adapters](https://www.zigbee2mqtt.io/information/supported_adapters.html).
-
-**Option 3 (with SLS Gateway)**
-* For Robonomics SLS Gateway regardless of the Home Assistant installation options [go here](/docs/sls-gateway/). Open SLS gateway specs your can [find here](https://easyeda.com/ludovich88/robonomics_sls_gateway_v01).

docs/robonomics-hass-integration.md

@@ -21,5 +21,3 @@ tools:
 - (Optional) You can add credentials for pinning service Pinata to spread your data wider over the IPFS network.
 
 3. Press `SUBMIT` after finishing the configuration. If you filled in everything correctly, you will see the success window.
-
-Congratulations! You have fully installed and configured Home Assistant with Robonomics integration. Now go to [**"Use"**](/docs/global-administration) section to start working with your upgraded smart home.

docs/robonomics-smart-home-overview.md

@@ -23,39 +23,39 @@ To solve both problems, we suggest you to try Robonomics, our **secure**, **serv
 ## What you need for installation
 
   <robo-wiki-grid-element-wrapper textAlign="center" :columns="4">
-    <robo-wiki-grid-element>
-      <robo-wiki-picture src="home-assistant/need_1.png" /> 
-      <p><a href="https://www.home-assistant.io/">Home Assistant</a> as control system software</p> 
-    </robo-wiki-grid-element>
     <robo-wiki-grid-element>
       <robo-wiki-picture src="home-assistant/need_2.png" /> 
       <p>Raspberry Pi 4 (at least 2 GB RAM)</p>  
     </robo-wiki-grid-element>
     <robo-wiki-grid-element>
       <robo-wiki-picture src="home-assistant/need_3.png" /> 
-      <p>SD card (minimum 32 GB)</p>  
+      <p>SD card (minimum 16 GB)</p>  
     </robo-wiki-grid-element>
     <robo-wiki-grid-element>
-      <robo-wiki-picture src="home-assistant/need_4.png" /> 
-      <p>SD adapter</p>
+      <robo-wiki-picture src="home-assistant/need_10.png" /> 
+      <p>Power supply for Raspberry Pi4</p>
+    </robo-wiki-grid-element>
+    <robo-wiki-grid-element>
+      <robo-wiki-picture src="home-assistant/need_7.png" /> 
+      <p>Zigbee adapter <a href="https://jethome.ru/z2/">JetHome USB JetStick Z2</a> (or one of <a href="https://www.zigbee2mqtt.io/information/supported_adapters.html">supported</a>)</p>
     </robo-wiki-grid-element>
   </robo-wiki-grid-element-wrapper>
 
-  <robo-wiki-grid-element-wrapper :columns="2" textAlign="center">
+  <robo-wiki-grid-element-wrapper textAlign="center" :columns="4">
+    <robo-wiki-grid-element>
+      <robo-wiki-picture src="home-assistant/need_1.png" /> 
+      <p><a href="https://www.home-assistant.io/">Home Assistant</a> as control system software</p> 
+    </robo-wiki-grid-element>
     <robo-wiki-grid-element>
       <robo-wiki-picture src="home-assistant/need_5.png" />
       <p>Zigbee smart devices (any from <a href="https://slsys.io/action/supported_devices.html">supported devices</a>)</p>
     </robo-wiki-grid-element>
     <robo-wiki-grid-element>
-      <robo-wiki-picture src="home-assistant/need_6.png" /> 
-      <p>Zigbee adapter <a href="https://jethome.ru/z2/">JetHome USB JetStick Z2</a> (or one of <a href="https://www.zigbee2mqtt.io/information/supported_adapters.html">supported</a>) or 
-      <a href="https://easyeda.com/ludovich88/robonomics_sls_gateway_v01">Robonomics SLS Gateway</a></p>
-    </robo-wiki-grid-element/>
+      <robo-wiki-picture src="home-assistant/need_9.png" />
+      <p>Computer for setup</p>
+    </robo-wiki-grid-element>
+    <robo-wiki-grid-element>
+      <robo-wiki-picture src="home-assistant/need_4.png" /> 
+      <p>SD adapter (optional)</p>
+    </robo-wiki-grid-element>
   </robo-wiki-grid-element-wrapper>
-
-## How to install Home Assistant with Robonomics 
-
-* [Pre-installed image](/docs/hass-image-install/) — This method implies setting up a whole new OS on your Raspberry Pi.
-* [Home Assistant OS](/docs/hass-os-upgrade/) — The method is suitable for integrating Robonomics with an existing Home Assistant OS.
-* [Home Assistant Docker for Unix-like OS](/docs/hass-docker-upgrade/) — The method is suitable for integrating Robonomics with an existing Home Assistant Docker for Unix-like OS.
-* [Home Assistant Core](/docs/hass-core-upgrade/) — The method is suitable for integrating Robonomics with an existing Home Assistant Core.

docs/sub-activate.md

@@ -94,5 +94,3 @@ Now you need to add a `sub_controller` account to the **access list**.
 3. Repeat steps 1 and 2 for `sub_owner` account.
 
 3. Press `Save`. Enter your `sub_owner` password in the popup window and wait until the activation process is completed.
-
-After that, go to the article ["Robonomics Integration Setup"](/docs/robonomics-hass-integration/) article.

docs/zigbee-to-mqtt-hassos.md

@@ -134,5 +134,3 @@ rm coordinator_backup.json
 <robo-wiki-picture src="home-assistant/zigbee-2-mqtt-addon-ui.png" />
 
 4. Now you should see the device with the same IEEE Address in your Home Assistant Web UI. Go to `Settings` -> `Devices & Services` -> `Devices`.
-
-Now you can go to the [**IoT Subscription**](/docs/sub-activate) section and start activating the Robonomics subscription.