diff --git a/README.md b/README.md index 6d2e179..d5dd580 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,13 @@ $ pip3 install mkdocs $ pip3 install mkdocs-material ``` -3. Install Lightgallery Extension +3. Install git-revision plugin + +```bash +pip3 install mkdocs-git-revision-date-localized-plugin +``` + +4. Install Lightgallery Extension ```bash $ git clone https://github.com/g-provost/lightgallery-markdown.git @@ -32,12 +38,6 @@ $ cd lightgallery-markdown $ python3 setup.py install ``` -4. Install git-revision plugin - -```bash -pip3 install mkdocs-git-revision-date-plugin -``` - 5. Download and serve wiki ```bash diff --git a/docs/css/extra.css b/docs/css/extra.css new file mode 100644 index 0000000..b9edcab --- /dev/null +++ b/docs/css/extra.css @@ -0,0 +1,42 @@ +.md-header-nav__download { + display: block; + width: 7rem; + max-width: 7rem; + margin-left: 1rem; +} + +.md-nav--primary .md-nav__item .md-nav__item--active > .md-nav__link { + color: var(--md-accent-fg-color); + font-weight: bold; +} + +.md-nav__item .md-nav__link--active { + color: var(--md-accent-fg-color); + font-weight: bold; +} + +.md-tabs__link:hover { + color: var(--md-accent-fg-color); +} + +.md-tabs__link--active { + color: var(--md-accent-fg-color); + font-weight: bold; +} + +.md-typeset a { + color: var(--md-accent-fg-color); +} + +.md-typeset a:focus, .md-typeset a:hover { + color: var(--md-accent-fg-color); + font-weight: bold; + +} + +.md-header-nav__button.md-logo img, .md-header-nav__button.md-logo svg { + display: block; + width: 100%; + height: 1.2rem; + fill: currentColor; +} diff --git a/docs/download.md b/docs/download.md new file mode 100644 index 0000000..ec31c6b --- /dev/null +++ b/docs/download.md @@ -0,0 +1,74 @@ +disqus: + +All images are generated by [Armbian](https://www.armbian.com/helios4/) build framework. + +## Helios64 + +### Latest OS Images + +=== "Debian 10 (Buster)" + + *Coming Soon* + +=== "Ubuntu 20.04 (Focal)" + + *Coming Soon* + + +## Helios4 + +### Latest OS Images + +=== "Debian 10 (Buster)" + + [![Debian Stretch](/img/download/debian10.png)](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_buster_current_4.19.107.7z)
+ *MD5SUM : 2e09c44a57075f4b9c6960db55eac54c
+ Build date : 03/03/2020
+ Size : 272 MB
* + [Direct Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_buster_current_4.19.107.7z) + +=== "Debian 9 (Stretch)" + + [![Debian Stretch](/img/download/debian9.png)](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z)
+ *MD5SUM : a66d7d3fbaf57630f15dfc50d767291f
+ Build date : 03/03/2020
+ Size : 263 MB
* + [Direct Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z) + +=== "Ubuntu 18.04 (Bionic)" + + [![Ubuntu Bionic](/img/download/ubuntu.png)](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z)
+ *MD5SUM : adf539231ed556cf01c7f8fdc1214220
+ Build date : 03/03/2020
+ Size : 207 MB
* + [Direct Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z) + + +### Known Limitations + +- SDcard High Speed timing have compatibility issue with some brands. + + **Temporary workaround :** Disable UHS option/support. + + *Can be manually enable, refer to the following [page](/helios4/sdcard).* + +- During SATA heavy load, accessing SPI NOR Flash will generate ATA errors. + + **Temporary workaround :** Disable SPI NOR flash. + + *Can be manually enable, refer to the following [page](/helios4/spi).* + + +### Image List + +!!! note + 7Z archives can be uncompressed with 7-Zip on Windows, Keka on OS X and 7z on Linux (apt-get install p7zip-full). + +Filename | Download | MD5 +---------|----------|---- +**Armbian_20.02.3_Helios4_buster_current_4.19.107.7z**
Armbian 20.02.3 Debian 10 Buster (Kernel 4.19.107)
Build date : 03/03/2019
Size : 272 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_buster_current_4.19.107.7z)|2e09c44a57075f4b9c6960db55eac54c +**Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z**
Armbian 20.02.3 Debian 9 Stretch (Kernel 4.14.172)
Build date : 03/03/2019
Size : 263 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z)|a66d7d3fbaf57630f15dfc50d767291f +**Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z**
Armbian 20.02.3 Ubuntu 18.04 Bionic (Kernel 4.19.107)
Build date : 03/03/2019
Size : 207 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z)|adf539231ed556cf01c7f8fdc1214220 +**Armbian_19.11.3_Helios4_buster_current_4.19.84.7z**
Armbian 19.11.3 Debian 10 Buster (Kernel 4.19.84)
Build date : 19/11/2019
Size : 274 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_19.11.3_Helios4_buster_current_4.19.84.7z)|cdb4463097190de35a2e58b1b12223f9 +**Armbian_19.11.3_Helios4_stretch_legacy_4.14.154.7z**
Armbian 19.11.3 Debian 9 Stretch (Kernel 4.14.154)
Build date : 19/11/2019
Size : 258 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_19.11.3_Helios4_stretch_legacy_4.14.154.7z)|cb7124089b8e1ff6feed32a5c5b768af +**Armbian_19.11.3_Helios4_bionic_current_4.19.84.7z**
Armbian 19.11.3 Ubuntu 18.04 Bionic (Kernel 4.19.84)
Build date : 19/11/2019
Size : 192 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_19.11.3_Helios4_bionic_current_4.19.84.7z)|7d0f80524bf2d24a3de403a6233a655b diff --git a/docs/helios4/download.md b/docs/helios4/download.md deleted file mode 100644 index e5f4d4b..0000000 --- a/docs/helios4/download.md +++ /dev/null @@ -1,68 +0,0 @@ -disqus: - -## Latest OS Images - -All the following images are generated by [Armbian](https://www.armbian.com/helios4/) build framework. - -### Armbian Buster (Debian 10) - -[![Debian Stretch](/helios4/img/os/debian10.png)](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_buster_current_4.19.107.7z)
-*MD5SUM : 2e09c44a57075f4b9c6960db55eac54c
-Build date : 03/03/2020
-Size : 272 MB
* -[Direct Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_buster_current_4.19.107.7z) - -!!! important - OMV5 (OpenMediaVault 5) for Debian 10 Buster is still in beta and unstable. If you wand to use OMV, then you should use Debian 9 Stretch with OMV 4 for now. - -### Armbian Stretch (Debian 9) - -[![Debian Stretch](/helios4/img/os/debian9.png)](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z)
-*MD5SUM : a66d7d3fbaf57630f15dfc50d767291f
-Build date : 03/03/2020
-Size : 263 MB
* -[Direct Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z) - -!!! note - OMV4 (OpenMediaVault 4) can be installed with the **armbian-config** tool as explained [here](/helios4/omv/#install-openmediavault). - -### Armbian Bionic (Ubuntu 18.04) - -[![Ubuntu Bionic](/helios4/img/os/ubuntu.png)](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z)
-*MD5SUM : adf539231ed556cf01c7f8fdc1214220
-Build date : 03/03/2020
-Size : 207 MB
* -[Direct Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z) - - -## Known Limitations - -- SDcard High Speed timing have compatibility issue with some brands. - - **Temporary workaround :** Disable UHS option/support. - - *Can be manually enable, refer to the following [page](/helios4/sdcard).* - -- During SATA heavy load, accessing SPI NOR Flash will generate ATA errors. - - **Temporary workaround :** Disable SPI NOR flash. - - *Can be manually enable, refer to the following [page](/helios4/spi).* - - -## Image List - -!!! note - 7Z archives can be uncompressed with 7-Zip on Windows, Keka on OS X and 7z on Linux (apt-get install p7zip-full). - -Filename | Download | MD5 ----------|----------|---- -**Armbian_20.02.3_Helios4_buster_current_4.19.107.7z**
Armbian 20.02.3 Debian 10 Buster (Kernel 4.19.107)
Build date : 03/03/2019
Size : 272 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_buster_current_4.19.107.7z)|2e09c44a57075f4b9c6960db55eac54c -**Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z**
Armbian 20.02.3 Debian 9 Stretch (Kernel 4.14.172)
Build date : 03/03/2019
Size : 263 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_stretch_legacy_4.14.172.7z)|a66d7d3fbaf57630f15dfc50d767291f -**Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z**
Armbian 20.02.3 Ubuntu 18.04 Bionic (Kernel 4.19.107)
Build date : 03/03/2019
Size : 207 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_20.02.3_Helios4_bionic_current_4.19.107.7z)|adf539231ed556cf01c7f8fdc1214220 -**Armbian_19.11.3_Helios4_buster_current_4.19.84.7z**
Armbian 19.11.3 Debian 10 Buster (Kernel 4.19.84)
Build date : 19/11/2019
Size : 274 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_19.11.3_Helios4_buster_current_4.19.84.7z)|cdb4463097190de35a2e58b1b12223f9 -**Armbian_19.11.3_Helios4_stretch_legacy_4.14.154.7z**
Armbian 19.11.3 Debian 9 Stretch (Kernel 4.14.154)
Build date : 19/11/2019
Size : 258 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_19.11.3_Helios4_stretch_legacy_4.14.154.7z)|cb7124089b8e1ff6feed32a5c5b768af -**Armbian_19.11.3_Helios4_bionic_current_4.19.84.7z**
Armbian 19.11.3 Ubuntu 18.04 Bionic (Kernel 4.19.84)
Build date : 19/11/2019
Size : 192 MB|[Download](https://dl.armbian.com/helios4/archive/Armbian_19.11.3_Helios4_bionic_current_4.19.84.7z)|7d0f80524bf2d24a3de403a6233a655b -**Armbian_5.91_Helios4_Debian_buster_next_4.19.63.7z**
Armbian 5.91 Debian 10 Buster (Kernel 4.19.63)
Build date : 02/08/2019
Size : 261 MB|[Download](https://cdn.kobol.io/files/Armbian_5.91_Helios4_Debian_buster_next_4.19.63.7z)|9c48344c208dfa50b5868debe6fae629 -**Armbian_5.91_Helios4_Debian_stretch_default_4.14.135.7z**
Armbian 5.91 Debian 9 Stretch (Kernel 4.14.135)
Build date : 02/08/2019
Size : 252 MB|[Download](https://cdn.kobol.io/files/Armbian_5.91_Helios4_Debian_stretch_default_4.14.135.7z)|e8416b359a7620bb01b5a13c6a10612f -**Armbian_5.91_Helios4_Ubuntu_bionic_next_4.19.63.7z**
Armbian 5.91 Ubuntu 18.04 Bionic (Kernel 4.19.63)
Build date : 02/08/2019
Size : 192 MB|[Download](https://cdn.kobol.io/files/Armbian_5.91_Helios4_Ubuntu_bionic_next_4.19.63.7z)|62983d7519f15e67355d6dd5e60ee353 diff --git a/docs/helios4/img/os/debian10.png b/docs/helios4/img/os/debian10.png deleted file mode 100644 index 0cb8a5e..0000000 Binary files a/docs/helios4/img/os/debian10.png and /dev/null differ diff --git a/docs/helios4/img/os/debian9.png b/docs/helios4/img/os/debian9.png deleted file mode 100644 index 8bfadfd..0000000 Binary files a/docs/helios4/img/os/debian9.png and /dev/null differ diff --git a/docs/helios4/img/os/omv.png b/docs/helios4/img/os/omv.png deleted file mode 100644 index 00338b0..0000000 Binary files a/docs/helios4/img/os/omv.png and /dev/null differ diff --git a/docs/helios4/img/os/syncloud.png b/docs/helios4/img/os/syncloud.png deleted file mode 100644 index d724086..0000000 Binary files a/docs/helios4/img/os/syncloud.png and /dev/null differ diff --git a/docs/helios4/img/os/ubuntu.png b/docs/helios4/img/os/ubuntu.png deleted file mode 100644 index 08319e9..0000000 Binary files a/docs/helios4/img/os/ubuntu.png and /dev/null differ diff --git a/docs/helios4/omv.md b/docs/helios4/omv.md index 123e71c..5d95696 100644 --- a/docs/helios4/omv.md +++ b/docs/helios4/omv.md @@ -1,10 +1,4 @@ -This is a basic guide to help you setting up Helios4 NAS with [OpenMediaVault](https://www.openmediavault.org/) (**OMV**). OMV offers a large collection of features that we don't cover here. We invite you to look online for the existing OMV guides or go on the [OMV forum](https://forum.openmediavault.org/index.php/Board/29-Guides/). - -!!! info - The following guide was written for OMV3 (Erasmus), but it still works with OMV4 (Arrakis) since the interface is the same. - -!!! important - As of July 2019, OMV5 (Usul) is still in Beta and Unstable, therefore we strongly recommend using OMV4 (Arrakis) for now. In order to install OMV4, you need to be running Debian 9 Stretch. +This is a basic guide to help you setting up Helios4 NAS with [OpenMediaVault](https://www.openmediavault.org/) (**OMV**). OMV offers a large collection of features that we don't cover here. We invite you to look online for the existing OMV guides or go on the [OMV forum](https://forum.openmediavault.org/index.php?board/29-guides/). ## What is OpenMediaVault? diff --git a/docs/helios64/intro.md b/docs/helios64/intro.md index c6602e9..c1173b5 100644 --- a/docs/helios64/intro.md +++ b/docs/helios64/intro.md @@ -54,10 +54,8 @@ Helios64 is our latest design for the ultimate ARM powered NAS. Compared to the ![Helios64 Top View](/helios64/img/intro/helios64-top-view.jpg) - ## Mechanical - |**Mechanical Specifications**|| |------------|-----------| |Board Dimension|120mm x 120mm| @@ -75,7 +73,4 @@ Helios64 is our latest design for the ultimate ARM powered NAS. Compared to the |U-Boot Version|2019.11 |Software Partners|- Armbian: Debian and Ubuntu for ARM board
- OpenMediaVault: Linux NAS turn-key solution
- Syncloud: Cloud services at your premises
- Nextcloud: The File Hosting Solutions| - -**More info coming soon...** - ![Helios64 Heatsink](/helios64/img/intro/helios64-heatsink.jpg) diff --git a/docs/img/download/debian10.png b/docs/img/download/debian10.png new file mode 100644 index 0000000..891382b Binary files /dev/null and b/docs/img/download/debian10.png differ diff --git a/docs/img/download/debian9.png b/docs/img/download/debian9.png new file mode 100644 index 0000000..ed519f6 Binary files /dev/null and b/docs/img/download/debian9.png differ diff --git a/docs/img/download/ubuntu.png b/docs/img/download/ubuntu.png new file mode 100644 index 0000000..e045175 Binary files /dev/null and b/docs/img/download/ubuntu.png differ diff --git a/docs/img/kobol_logo.png b/docs/img/kobol_logo.png deleted file mode 100644 index 59172de..0000000 Binary files a/docs/img/kobol_logo.png and /dev/null differ diff --git a/docs/img/kobol_logo.svg b/docs/img/kobol_logo.svg new file mode 100644 index 0000000..c9d6750 --- /dev/null +++ b/docs/img/kobol_logo.svg @@ -0,0 +1,121 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/img/sd.png b/docs/img/sd.png deleted file mode 100644 index a5f2334..0000000 Binary files a/docs/img/sd.png and /dev/null differ diff --git a/docs/index.md b/docs/index.md index 74a355a..6474549 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,7 +15,7 @@ Here our existing projects : * Launch Year : 2020 * Availability : In-Production -**Go to [Helios64 section](/helios64/intro) for more info.** +Go to [Helios64 section](/helios64/intro) for more info. ## Helios4 @@ -24,4 +24,4 @@ Here our existing projects : * Launch Year : 2017 * Availability : End-of-Life -**Go to [Helios4 section](/helios4/intro) for more info.** +Go to [Helios4 section](/helios4/intro) for more info. diff --git a/mkdocs.yml b/mkdocs.yml index 78b5280..626c2cb 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -16,33 +16,37 @@ copyright: 'Copyright © Kobol Innovations Pte. Ltd. 2020' theme: name: 'material' language: 'en' - favicon: './img/favicon.png' - logo: './img/kobol_logo.png' + favicon: 'img/favicon.png' + logo: 'img/kobol_logo.svg' + icon: + repo: 'fontawesome/brands/git-alt' custom_dir: 'theme' + features: + - tabs palette: - primary: 'teal' + primary: 'white' accent: 'pink' font: text: 'Roboto' code: 'Roboto Mono' +extra_css: + - css/extra.css # Options extra: social: - - type: 'home' + - icon: 'fontawesome/solid/home' link: 'https://kobol.io' - - type: 'github' + - icon: 'fontawesome/brands/github' link: 'https://github.com/helios-4' - - type: 'facebook' + - icon: 'fontawesome/brands/facebook' link: 'https://facebook.com/kobol.io' - - type: 'twitter' + - icon: 'fontawesome/brands/twitter' link: 'https://twitter.com/kobol_io' - - type: 'rss-square' + - icon: 'fontawesome/solid/rss-square' link: 'https://blog.kobol.io' disqus: 'kobol-wiki' - sd_release: - latest: '03/03/2020' # Google Analytics google_analytics: @@ -52,7 +56,7 @@ google_analytics: # Plugins plugins: - search - - git-revision-date + - git-revision-date-localized # Extensions markdown_extensions: @@ -62,55 +66,58 @@ markdown_extensions: guess_lang: False - toc: permalink: True + - pymdownx.tabbed - lightgallery # Page naming nav: -- Welcome: 'index.md' +- Home: + - Introduction: 'index.md' + - Download: 'download.md' + - About: 'about.md' - Helios64: - Introduction: 'helios64/intro.md' - Hardware: - - Overview : 'helios64/hardware.md' - - Button : 'helios64/button.md' - - Ethernet : 'helios64/ethernet.md' - - Front Panel : 'helios64/front-panel.md' - - GPIO : 'helios64/gpio.md' - - I2C : 'helios64/i2c.md' + - Overview: 'helios64/hardware.md' + - Button: 'helios64/button.md' + - Ethernet: 'helios64/ethernet.md' + - Front Panel: 'helios64/front-panel.md' + - GPIO: 'helios64/gpio.md' + - I2C: 'helios64/i2c.md' - Jumper: 'helios64/jumper.md' - - LED : 'helios64/led.md' - - M.2 : 'helios64/m2.md' - - PMIC : 'helios64/pmic.md' - - PWM Fan : 'helios64/pwm.md' - - RTC : 'helios64/rtc.md' - - SATA : 'helios64/sata.md' - - SPI : 'helios64/spi.md' - - UEXT : 'helios64/uext.md' - - UPS : 'helios64/ups.md' - - USB : 'helios64/usb.md' + - LED: 'helios64/led.md' + - M.2: 'helios64/m2.md' + - PMIC: 'helios64/pmic.md' + - PWM Fan: 'helios64/pwm.md' + - RTC: 'helios64/rtc.md' + - SATA: 'helios64/sata.md' + - SPI: 'helios64/spi.md' + - UEXT: 'helios64/uext.md' + - UPS: 'helios64/ups.md' + - USB: 'helios64/usb.md' - Helios4: - Introduction: 'helios4/intro.md' - Kit Assembly: 'helios4/kit.md' - - Download: 'helios4/download.md' + - Download: '/download/#helios4' - Install: 'helios4/install.md' - O/S: - - Arch Linux : 'helios4/arch.md' - - Armbian : 'helios4/armbian.md' - - FreeBSD : 'helios4/freebsd.md' - - Syncloud : 'helios4/syncloud.md' - - U-Boot (bootloader) : 'helios4/uboot.md' + - Arch Linux: 'helios4/arch.md' + - Armbian: 'helios4/armbian.md' + - FreeBSD: 'helios4/freebsd.md' + - Syncloud: 'helios4/syncloud.md' + - U-Boot (bootloader): 'helios4/uboot.md' - Software: - - Mdadm (RAID) : 'helios4/mdadm.md' - - NextCloud : 'helios4/nextcloud.md' - - OpenMediaVault : 'helios4/omv.md' + - Mdadm (RAID): 'helios4/mdadm.md' + - NextCloud: 'helios4/nextcloud.md' + - OpenMediaVault: 'helios4/omv.md' - Hardware: - - Overview : 'helios4/hardware.md' - - CESA (HW Crypto) : 'helios4/cesa.md' - - GPIO : 'helios4/gpio.md' - - I2C (OLED) : 'helios4/i2c.md' - - LED : 'helios4/led.md' - - PWM (Fan) : 'helios4/pwm.md' - - SDIO (SD Card) : 'helios4/sdcard.md' - - SPI (NOR Flash) : 'helios4/spi.md' - - Wake-on-LAN : 'helios4/wol.md' + - Overview: 'helios4/hardware.md' + - CESA (HW Crypto): 'helios4/cesa.md' + - GPIO: 'helios4/gpio.md' + - I2C (OLED): 'helios4/i2c.md' + - LED: 'helios4/led.md' + - PWM (Fan): 'helios4/pwm.md' + - SDIO (SD Card): 'helios4/sdcard.md' + - SPI (NOR Flash): 'helios4/spi.md' + - Wake-on-LAN: 'helios4/wol.md' - Documents: 'helios4/docs.md' -- About: 'about.md' diff --git a/theme/partials/download.html b/theme/partials/download.html new file mode 100644 index 0000000..55f7460 --- /dev/null +++ b/theme/partials/download.html @@ -0,0 +1,15 @@ +{% import "partials/language.html" as lang with context %} + + +
+ {% set icon = "fontawesome/solid/sd-card" %} + {% include ".icons/" ~ icon ~ ".svg" %} +
+
+ Download +
+ diff --git a/theme/partials/header.html b/theme/partials/header.html index cf43ed4..a733197 100644 --- a/theme/partials/header.html +++ b/theme/partials/header.html @@ -1,108 +1,67 @@ - -
-
diff --git a/theme/partials/nav.html b/theme/partials/nav.html index b116be7..ea95f6e 100644 --- a/theme/partials/nav.html +++ b/theme/partials/nav.html @@ -1,5 +1,5 @@ -