Merge master into dependabot/npm_and_yarn/master/eslint-plugin-import…

…-2.22.1

.github/workflows/automerge.yml

@@ -22,6 +22,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: 'pascalgn/automerge-action@v0.11.0'
+        uses: 'pascalgn/automerge-action@v0.12.0'
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           path: open-zwave
 
       - name: Cache openzwave
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.2
         with:
           path: open-zwave
           key: ${{ hashFiles('open-zwave/.git/refs/heads/master') }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Cache node modules
         id: cache-node-modules
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.2
         with:
           path: node_modules
           key: ${{ matrix['node-version'] }}-npm-${{ hashFiles('package-lock.json') }}
@@ -63,7 +63,7 @@ jobs:
 
       - name: Cache build
         id: cache-build
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.2
         with:
           path: dist
           key: ${{ matrix['node-version'] }}-cache-build-${{ hashFiles('build/*') }}-${{ hashFiles('src/*') }}-${{ hashFiles('static/*') }}-${{ hashFiles('package-lock.json') }}

.github/workflows/dockerbuild.yml

@@ -25,26 +25,27 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Prepare
+        id: prepare
         run: |
           DOCKER_REPO=robertslando/zwave2mqtt
+          TAGS=${DOCKER_REPO}:sha-${GITHUB_SHA}
+
           if [ "$GITHUB_REF" == "refs/heads/master" ]; then
-            TAGS="${DOCKER_REPO}:dev\n"
+            TAGS=$TAGS,${DOCKER_REPO}:dev
           fi
           if [ "$GITHUB_EVENT_NAME" == "release" ]; then
-            TAGS="${TAGS}${DOCKER_REPO}:latest\n"
-            TAGS="${TAGS}${DOCKER_REPO}:$(echo ${GITHUB_REF} | sed "s/refs\/tags\/v//")\n"
+            TAGS=$TAGS,${DOCKER_REPO}:latest
+            TAGS=$TAGS,${DOCKER_REPO}:$(echo ${GITHUB_REF} | sed "s/refs\/tags\/v//") >> ./TAGS
           fi
 
-          TAGS="${TAGS}${DOCKER_REPO}:sha-${GITHUB_SHA}"
-
-          echo TAGS="${TAGS}" >> $GITHUB_ENV
+          echo ::set-output name=TAGS::${TAGS}
           echo DOCKER_REPO="${DOCKER_REPO}" >> $GITHUB_ENV
 
       - name: build+push
         uses: docker/build-push-action@v2
         with:
           cache-from: type=registry,ref=${{ env.DOCKER_REPO }}:sha-${{ env.GITHUB_SHA }}
-          platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386
+          platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7
           file: docker/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ env.TAGS }}
+          tags: ${{ steps.prepare.outputs.TAGS }}

CHANGELOG.md

@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v4.0.5](https://github.com/OpenZWave/Zwave2Mqtt/compare/v4.0.4...v4.0.5)
+
+> 16 October 2020
+
+- chore: audit fix high severity [`#794`](https://github.com/OpenZWave/Zwave2Mqtt/pull/794)
+- fix: Rows per page not set correctly [`#793`](https://github.com/OpenZWave/Zwave2Mqtt/pull/793)
+- feat: support more ENV VARS for configuration [`#788`](https://github.com/OpenZWave/Zwave2Mqtt/pull/788)
+- fix: typo in comment [`#789`](https://github.com/OpenZWave/Zwave2Mqtt/pull/789)
+- docs: libudev.h shouldn't be required with ozw 1.6 [`#786`](https://github.com/OpenZWave/Zwave2Mqtt/pull/786)
+- feat: improve HASS discovery of cover devices [`#783`](https://github.com/OpenZWave/Zwave2Mqtt/pull/783)
+- chore(deps): bump actions/cache from v1 to v2.1.2 [`#780`](https://github.com/OpenZWave/Zwave2Mqtt/pull/780)
+- feat(hass): adding CT100 using 2GIG template [`#776`](https://github.com/OpenZWave/Zwave2Mqtt/pull/776)
+- chore(ci): remove linux/386 to fix dockerbuild [`#782`](https://github.com/OpenZWave/Zwave2Mqtt/pull/782)
+- Update README.md [`#774`](https://github.com/OpenZWave/Zwave2Mqtt/pull/774)
+- tidy up the docker build [`#769`](https://github.com/OpenZWave/Zwave2Mqtt/pull/769)
+- dependabot update github actions and docker [`#766`](https://github.com/OpenZWave/Zwave2Mqtt/pull/766)
+- close stale issues+prs [`#756`](https://github.com/OpenZWave/Zwave2Mqtt/pull/756)
+- Create Dependabot config file [`#566`](https://github.com/OpenZWave/Zwave2Mqtt/pull/566)
+- docker: update ozw to 1.6.392 [`#751`](https://github.com/OpenZWave/Zwave2Mqtt/pull/751)
+- docker: update ozw to version 1.6.1382 [`#748`](https://github.com/OpenZWave/Zwave2Mqtt/pull/748)
+- feat(hass): Eurotronic Stella Z thermostat [`#746`](https://github.com/OpenZWave/Zwave2Mqtt/pull/746)
+- fix: Rows per page not set correctly (#793) [`#792`](https://github.com/OpenZWave/Zwave2Mqtt/issues/792)
+- fix tag list composition [`55e0dc0`](https://github.com/OpenZWave/Zwave2Mqtt/commit/55e0dc0b69bd212130305989793037c33e588383)
+- fix tag list composition [`50cf1ad`](https://github.com/OpenZWave/Zwave2Mqtt/commit/50cf1add8ed6d52b90898c0fcd78cc9f90d5a63f)
+- fix tag list composition [`0e95d46`](https://github.com/OpenZWave/Zwave2Mqtt/commit/0e95d46235559c735e142b908c6f55a14a5753b5)
+- fix tag list composition [`cb1f337`](https://github.com/OpenZWave/Zwave2Mqtt/commit/cb1f337971daf151f2173fe1095f895291284f0a)
+- fix tag list composition [`8221a56`](https://github.com/OpenZWave/Zwave2Mqtt/commit/8221a56c67839cbd262127e21ed78962efc2c91a)
+- fix tag list composition [`0857c43`](https://github.com/OpenZWave/Zwave2Mqtt/commit/0857c43639340dee42f203e27fe205d5599c5f0f)
+- fix tag list composition [`970b82a`](https://github.com/OpenZWave/Zwave2Mqtt/commit/970b82acb50c1eba93a7b7c79ab524a503774fa6)
+- fix tag list composition [`5569669`](https://github.com/OpenZWave/Zwave2Mqtt/commit/55696698bc8bc5e930180aa2dfa005ece8d0116b)
+
 #### [v4.0.4](https://github.com/OpenZWave/Zwave2Mqtt/compare/v4.0.3...v4.0.4)
 
 > 28 September 2020
@@ -22,6 +53,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps): upgrade vuetify from 2.3.4 to 2.3.5 [`#667`](https://github.com/OpenZWave/Zwave2Mqtt/pull/667)
 - chore(deps): upgrade serialport from 9.0.0 to 9.0.1 [`#695`](https://github.com/OpenZWave/Zwave2Mqtt/pull/695)
 - docs: fix anchor link in README [`#696`](https://github.com/OpenZWave/Zwave2Mqtt/pull/696)
+- Release 4.0.4 [`2c5f939`](https://github.com/OpenZWave/Zwave2Mqtt/commit/2c5f939fd8bbaba5d6b66315cffa5118c90e8b70)
 
 #### [v4.0.3](https://github.com/OpenZWave/Zwave2Mqtt/compare/v4.0.2...v4.0.3)
 

README.md

@@ -82,6 +82,7 @@ After a [discussion](https://github.com/OpenZWave/Zwave2Mqtt/issues/201) with Op
     - [Mesh](#mesh)
     - [Debug](#debug)
   - [Health check endpoints](#health-check-endpoints)
+  - [Environment variables](#environment-variables)
   - [:question: FAQ](#-faq)
   - [:pray: Thanks](#-thanks)
   - [:pencil: TODOs](#-todos)
@@ -111,19 +112,16 @@ For more info about docker check [here](docker/README.md)
 ### Kubernetes way
 
 ```bash
-kubectl apply -k https://raw.githubusercontent.com/openzwave/zwave2mqtt/master/kustomize.yml
+kubectl apply -k https://raw.githubusercontent.com/OpenZWave/Zwave2Mqtt/master/kustomization.yaml
 ```
 
 > You will almost certainly need to instead use this as a base, and then layer on top patches or resource customizations to your needs or just copy all the resources from the [kubernetes resources](./kubernetes) directory of this repo
 
 ### NodeJS or PKG version
 
-1. Firstly you need to install [Open-Zwave](https://github.com/OpenZWave/open-zwave) library on your system.
-
-   If you are using Ubuntu:
+1. Firstly you need to install the [Open-Zwave](https://github.com/OpenZWave/open-zwave) library on your system.
 
    ```sh
-   sudo apt-get install libudev-dev git
    cd ~
    git clone https://github.com/OpenZWave/open-zwave.git
    cd open-zwave && make && sudo make install
@@ -807,6 +805,17 @@ Remember to add the header: `Accept: text/plain` to your request.
 
 Example: `curl localhost:8091/health/zwave -H "Accept: text/plain"`
 
+## Environment variables
+
+_**Note**: Each one of the following environment variables corresponds to their respective options in the UI settings and options saved in the UI take presence over these environment variables._
+
+- `OZW_NETWORK_KEY`
+- `OZW_SAVE_CONFIG`
+- `OZW_POLL_INTERVAL`
+- `OZW_AUTO_UPDATE_CONFIG`
+- `OZW_CONFIG_PATH`
+- `OZW_ASSUME_AWAKE`
+
 ## :question: FAQ
 
 > A: Why when I add a value to Gateway values table I don't see all my devices?

hass/configurations.js

@@ -226,14 +226,17 @@ module.exports = {
   },
   cover_position: {
     type: 'cover',
-    object_id: 'cover',
+    object_id: 'position',
     discovery_payload: {
+      state_topic: true,
       command_topic: true,
       position_topic: true,
       set_position_topic: true,
-      set_position_template: '{ "value": {{ position }} }',
-      value_template: '{{ value_json.value }}',
-      state_topic: false
+      value_template: '{{ value_json.value | round(0) }}',
+      position_open: 99,
+      position_closed: 0,
+      payload_open: '99',
+      payload_close: '0'
     }
   },
 

hass/devices.js

@@ -22,7 +22,7 @@ const FAN_DIMMER = {
   }
 }
 
-// Radio Thermostat / 2GIG CT32 and CT101
+// Radio Thermostat / 2GIG CT32, CT100 and CT101
 const THERMOSTAT_2GIG = {
   type: 'climate',
   object_id: 'thermostat',
@@ -337,12 +337,14 @@ module.exports = {
   '99-12340-18756': [FAN_DIMMER], // GE 1724 Dimmer
   '99-12593-18756': [FAN_DIMMER], // GE 1724 Dimmer
   '152-12-25857': [THERMOSTAT_2GIG], // Radio Thermostat / 2GIG CT101
+  '152-263-25601': [THERMOSTAT_2GIG], // Radio Thermostat / 2GIG CT100
   '152-256-8194': [THERMOSTAT_2GIG], // Radio Thermostat / 2GIG CT32
   '271-4096-770': [COVER], // Fibaro FGS222
   '328-1-1': [STELLA_ZWAVE],
   '328-1-3': [SPIRIT_ZWAVE_PLUS],
   '328-2-3': [SPIRIT_ZWAVE_PLUS],
   '328-3-3': [SPIRIT_ZWAVE_PLUS],
-  '345-82-3': [COVER], // Qubin0 flush shutter
-  '622-23089-17235': [COVER] // Graber/Bali/Spring Fashion Covers
+  '345-82-3': [COVER], // Qubino flush shutter
+  '622-23089-17235': [COVER], // Graber/Bali/Spring Fashion Covers
+  '881-21-2': [SPIRIT_ZWAVE_PLUS] // Eurotronic Spirit / Aeotec ZWA021
 }