Skip to content

Commit

Permalink
Merge branch 'beta' of https://github.com/jeedom/plugin-zwavejs into …
Browse files Browse the repository at this point in the history
…beta
  • Loading branch information
an0Nym0us63 committed Sep 22, 2023
2 parents 01daba7 + 79fb8ba commit 74f70da
Show file tree
Hide file tree
Showing 16 changed files with 505 additions and 102 deletions.
50 changes: 50 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!-- Provide a general summary of your changes in the title above. -->

<!--
Please target the `beta` branch when submitting your pull request, unless your change **only** applies to Jeedom 4.x.
-->

## Description
<!--
What do you want to achieve with this PR? Why did you write this code? What problem does this PR solve?
Describe your changes in detail and, if relevant, explain which choices you have made and why.
-->


### Suggested changelog entry
<!-- Please provide a short description of the change for the changelog. -->


### Related issues/external references

Fixes #


## Types of changes
<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix _(non-breaking change which fixes)_
- [ ] New feature _(non-breaking change which adds functionality)_
- [ ] Breaking change _(fix or feature that would cause existing functionality to change)_
- [ ] This change is only breaking for integrators, not for external standards or end-users.
- [ ] Documentation improvement


## PR checklist
<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
- [ ] I have checked there is no other PR open for the same change.
- [ ] I have read the [Contribution Guidelines](https://doc.jeedom.com/fr_FR/contribute/).
- [ ] I grant the project the right to include and distribute the code under the GNU.
- [ ] I have added tests to cover my changes.
- [ ] I have verified that the code complies with the projects coding standards.
- [ ] [Required for new sniffs] I have added MD documentation for the sniff.

<!--
============================================================================================
Please make sure your pull request passes all continuous integration checks!
PRs which are failing their CI checks will likely be ignored by the maintainers.
PRs using atomic, descriptive commits are hugely appreciated as it will make
reviewing your changes easier for the maintainers.
============================================================================================
-->
62 changes: 62 additions & 0 deletions .github/workflows/codeLintGlobal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
on:
# Trigger the workflow on push or pull request,
# but only for the main branch
push:
branches:
- beta
pull_request:
branches:
- beta
- master

name : 'Code Lint Global'

jobs:
run-linters:
name: Test Linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
coverage: none
tools: phpcs

- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 14

# ESLint and Prettier must be in `package.json`
- name: Install Node.js dependencies
run: npm i prettier

- name: Install Python dependencies
run: pip install flake8 black

- name: Run linters
uses: wearerequired/lint-action@v2
with:
php_codesniffer: false
# Optional: Ignore warnings
php_codesniffer_args: "-n --ignore-annotations ./core ./desktop ./plugin_info"
flake8: true
prettier: true
prettier_extensions: css,html,js,json,jsx,md,sass,scss,ts,tsx,vue,yaml
auto_fix: true
prettier_auto_fix: true
git_email: [email protected]
git_name: 'JeedomBot lint Pretty'
commit: false
black: true
black_auto_fix: true
28 changes: 28 additions & 0 deletions .github/workflows/lint_Php73.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name : 'Php 7.3'

on:
push:
branches:
- beta
paths:
- "**.php"
pull_request:
branches:
- beta
- master
paths:
- "**.php"

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: PHP syntax checker 7.3
uses: prestashop/github-action-php-lint/7.3@v1
with:
folder-to-exclude: "! -path \"./3rdparty/*\""
28 changes: 28 additions & 0 deletions .github/workflows/lint_Php74.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name : 'Php 7.4'

on:
push:
branches:
- beta
paths:
- "**.php"
pull_request:
branches:
- beta
- master
paths:
- "**.php"

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: PHP syntax checker 7.4
uses: prestashop/github-action-php-lint/7.4@v1
with:
folder-to-exclude: "! -path \"./3rdparty/*\""
23 changes: 23 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "PHP"

on:
push:
branches:
- beta
paths:
- "**.php"
pull_request:
branches:
- beta
- master
paths:
- "**.php"

jobs:
phpcs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: michaelw90/PHP-Lint@master


22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
# Plugin Zwave-Js

Validation PHP Version (branche BETA) :

![PHP 7.3](https://github.com/jeedom/plugin-zwavejs/actions/workflows/lint_Php73.yml/badge.svg?branch=beta)
![PHP 7.4](https://github.com/jeedom/plugin-zwavejs/actions/workflows/lint_Php74.yml/badge.svg?branch=beta)

Validation Code int (branche BETA):

![PHP](https://github.com/jeedom/plugin-zwavejs/actions/workflows/php.yml/badge.svg?branch=beta)
![PHP](https://github.com/jeedom/plugin-zwavejs/actions/workflows/codeLintGlobal.yml/badge.svg?branch=beta)


--------
Validation PHP Version (branche MASTER) :

![PHP 7.3](https://github.com/jeedom/plugin-zwavejs/actions/workflows/lint_Php73.yml/badge.svg?branch=master)
![PHP 7.4](https://github.com/jeedom/plugin-zwavejs/actions/workflows/lint_Php74.yml/badge.svg?branch=master)

Validation Code int (branche MASTER):

![PHP](https://github.com/jeedom/plugin-zwavejs/actions/workflows/php.yml/badge.svg?branch=master)
![PHP](https://github.com/jeedom/plugin-zwavejs/actions/workflows/codeLintGlobal.yml/badge.svg?branch=master)
Binary file modified core/config/devices/nice_1089/ibt4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 19 additions & 2 deletions docs/de_DE/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,39 @@
>
>Wenn es keine Informationen über die Aktualisierung gibt, bedeutet dies, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt.
# xx/08/2023
# 11.09.2023

**Behebt**

- Update-Fix *OTA* einer Modul-Firmware nach einer ZwaveJSUI-Änderung

**Verbesserungen**

- Zur Version wechseln *8.23.2* von ZwaveJsUI.
- Zur Version wechseln *8.25.1* von ZwaveJsUI.
- Möglichkeit hinzugefügt, ein Update durchzuführen *OTW* einen Controller (falls kompatibel))
- Option zum Verwalten hinzugefügt *Benachrichtigungen* im Nachrichtencenter *tote und lebendige Knoten*
- Option zum Verwalten hinzugefügt *Benachrichtigungen* im Nachrichtencenter *verpasstes Erwachen und Rückkehr*

**Konfigurationsergänzungen**

- Konfig hinzugefügt *Shelly Qubino Wave 13:00 Uhr* (Eigenschaften : Schalter, Stromversorgung, Energie, Netzbenachrichtigung, Überstrombenachrichtigung, Wärmesensorbenachrichtigung)
- Konfig hinzugefügt *Shelly Qubino Welle 1* (Eigenschaften : Schalter, Stromversorgung, Energie, Netzbenachrichtigung, Überstrombenachrichtigung, Wärmesensorbenachrichtigung)
- Hinzufügen einer Untereigenschaft *binäres Wasser* für Eigentum *Flut*
- Hinzufügen einer Untereigenschaft *onlevel-barriere* für Eigentum *Mehrstufig*

**Konfigurationsänderungen**

- Ändern der Konfiguration *MCOhome Mh8FC* um die Eigenschaften zu verwenden
- Ändern der Konfiguration *NeoCoolCam WS02Z* um die Eigenschaften zu verwenden
- Ändern der Konfiguration *Kaipule IM20* um die Eigenschaften zu verwenden
- Ändern der Konfiguration *HRT4_SRT321* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Benext Plug-In-Dimmer* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Dome On Off Plug-In-Schalter Plug-In-Dimmer* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Domux Dx2skz* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Swiid-Stecker* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Everspring SM810* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Zipato PD01z* um die Eigenschaften besser zu nutzen
- Ändern der Konfiguration *Vision-Sicherheit ZS5101* um die Eigenschaften besser zu nutzen

# 08.02.2023

Expand Down
21 changes: 19 additions & 2 deletions docs/en_US/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,39 @@
>
>If there is no information on the update, it means that it concerns only the update of documentation, translation or text.
# xx/08/2023
# 09/11/2023

**Fixes**

- Update fix *OTA* of a module firmware following a ZwaveJSUI change

**Improvements**

- Switch to version *8.23.2* by ZwaveJsUI.
- Switch to version *8.25.1* by ZwaveJsUI.
- Added the possibility to make an update *OTW* a controller (if compatible)
- Added an option to manage *notifications* in the message center *dead and alive nodes*
- Added an option to manage *notifications* in the message center *missed awakenings and return*

**Configuration Additions**

- Added config *Shelly Qubino Wave 1PM* (properties : Switch, Power, Energy, Mains Notification, Over-Current Notification, Heat-Sensor Notification)
- Added config *Shelly Qubino Wave 1* (properties : Switch, Power, Energy, Mains Notification, Over-Current Notification, Heat-Sensor Notification)
- Adding a subproperty *binary-water* for property *Flood*
- Adding a subproperty *onlevel-barrier* for property *Multilevel*

**Configuration Changes**

- Changing the configuration *MCOhome Mh8FC* to use the properties
- Changing the configuration *NeoCoolCam WS02Z* to use the properties
- Changing the configuration *Kaipule IM20* to use the properties
- Changing the configuration *HRT4_SRT321* to better use the properties
- Changing the configuration *Benext Plug In Dimmer* to better use the properties
- Changing the configuration *Dome On Off Plug In Switch Plug In Dimmer* to better use the properties
- Changing the configuration *Domux Dx2skz* to better use the properties
- Changing the configuration *Swiid Plug* to better use the properties
- Changing the configuration *Everspring SM810* to better use the properties
- Changing the configuration *Zipato PD01z* to better use the properties
- Changing the configuration *Vision Security ZS5101* to better use the properties

# 02/08/2023

Expand Down
21 changes: 19 additions & 2 deletions docs/es_ES/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,39 @@
>
>Si no hay información sobre la actualización, significa que se trata solo de la actualización de la documentación, la traducción o el texto.
# xx/08/2023
# 11/09/2023

**Arreglos**

- Corrección de actualización *OTA* del firmware de un módulo después de un cambio de ZwaveJSUI

**Mejoras**

- Cambiar a versión *8.23.2* por ZwaveJsUI.
- Cambiar a versión *8.25.1* por ZwaveJsUI.
- Se agregó la posibilidad de realizar una actualización *OTW* un controlador (si es compatible)
- Se agregó una opción para administrar *notificaciones* en el centro de mensajes *nodos vivos y muertos*
- Se agregó una opción para administrar *notificaciones* en el centro de mensajes *despertares perdidos y regreso*

**Adiciones de configuración**

- Configuración añadida *Shelly Qubino Ola 1PM* (propiedades : Interruptor, alimentación, energía, notificación de red, notificación de sobrecorriente, notificación de sensor de calor)
- Configuración añadida *Shelly Qubino Ola 1* (propiedades : Interruptor, alimentación, energía, notificación de red, notificación de sobrecorriente, notificación de sensor de calor)
- Agregar una subpropiedad *agua-binaria* para la propiedad *Inundación*
- Agregar una subpropiedad *barrera de nivel* para la propiedad *Multi nivel*

**Cambios de configuración**

- Cambiar la configuración *MCOhome Mh8FC* para usar las propiedades
- Cambiar la configuración *NeoCoolCam WS02Z* para usar las propiedades
- Cambiar la configuración *Kaipule IM20* para usar las propiedades
- Cambiar la configuración *HRT4_SRT321* para aprovechar mejor las propiedades
- Cambiar la configuración *Atenuador enchufable Benext* para aprovechar mejor las propiedades
- Cambiar la configuración *Domo de encendido y apagado Interruptor enchufable Atenuador enchufable* para aprovechar mejor las propiedades
- Cambiar la configuración *Domux dx2skz* para aprovechar mejor las propiedades
- Cambiar la configuración *Enchufe deslizante* para aprovechar mejor las propiedades
- Cambiar la configuración *Everspring SM810* para aprovechar mejor las propiedades
- Cambiar la configuración *Zipato PD01z* para aprovechar mejor las propiedades
- Cambiar la configuración *Seguridad de visión ZS5101* para aprovechar mejor las propiedades

# 08/02/2023

Expand Down
Loading

0 comments on commit 74f70da

Please sign in to comment.