Skip to content
This repository has been archived by the owner on Feb 24, 2021. It is now read-only.

Commit

Permalink
Merge master into dependabot/npm_and_yarn/master/material-design-icon…
Browse files Browse the repository at this point in the history
…s-iconfont-6.1.0
  • Loading branch information
github-actions[bot] committed Nov 13, 2020
2 parents d970fd1 + a44e6a1 commit dea2eb6
Show file tree
Hide file tree
Showing 12 changed files with 1,013 additions and 151 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ 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.6](https://github.com/OpenZWave/Zwave2Mqtt/compare/v4.0.5...v4.0.6)

> 4 November 2020
- feat(ui): save items per page in local storage [`#816`](https://github.com/OpenZWave/Zwave2Mqtt/pull/816)
- chore(deps): bump chrisns/openzwave in /docker [`#815`](https://github.com/OpenZWave/Zwave2Mqtt/pull/815)
- fix(hass): misuse drying state for Full Power mode [`#775`](https://github.com/OpenZWave/Zwave2Mqtt/pull/775)
- chore(deps): bump actions/setup-node from v1 to v2.1.2 [`#768`](https://github.com/OpenZWave/Zwave2Mqtt/pull/768)
- chore(deps): bump prismjs from 1.21.0 to 1.22.0 [`#778`](https://github.com/OpenZWave/Zwave2Mqtt/pull/778)
- chore(deps): bump socket.io-client from 2.3.0 to 2.3.1 [`#759`](https://github.com/OpenZWave/Zwave2Mqtt/pull/759)
- chore(deps): bump pascalgn/automerge-action from v0.11.0 to v0.12.0 [`#772`](https://github.com/OpenZWave/Zwave2Mqtt/pull/772)
- fix(ui): vuetify deprecation `.native` [`#797`](https://github.com/OpenZWave/Zwave2Mqtt/pull/797)
- feat(hass): add deviceId '881-21-2' for Eurotronic Spirit Z-Wave Plus device [`#799`](https://github.com/OpenZWave/Zwave2Mqtt/pull/799)
- fix: update last active on value changes [`#798`](https://github.com/OpenZWave/Zwave2Mqtt/pull/798)
- fix: allow `/` char in name and location #790 [`#796`](https://github.com/OpenZWave/Zwave2Mqtt/pull/796)

#### [v4.0.5](https://github.com/OpenZWave/Zwave2Mqtt/compare/v4.0.4...v4.0.5)

> 16 October 2020
Expand All @@ -26,6 +42,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- 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)
- Release 4.0.5 [`43601f5`](https://github.com/OpenZWave/Zwave2Mqtt/commit/43601f51ac2b8d52a7269f8caf7d20d66398af26)
- 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)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ----------------
# STEP 1:
FROM chrisns/openzwave:alpine-1.6.1392 as ozw
FROM chrisns/openzwave:alpine-1.6.1545 as ozw

# ----------------
# STEP 2:
Expand Down
15 changes: 12 additions & 3 deletions hass/devices.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,22 @@ const SPIRIT_ZWAVE_PLUS = {
type: 'climate',
object_id: 'thermostat',
values: ['64-1-0', '49-1-1', '67-1-1', '67-1-11'],
mode_map: { off: 'Off', heat: 'Heat', cool: 'Heat Eco' },
setpoint_topic: { Heat: '67-1-1', 'Heat Eco': '67-1-11' },
mode_map: {
off: 'Off',
heat: 'Heat',
cool: 'Heat Eco',
drying: 'Full Power'
},
setpoint_topic: {
Heat: '67-1-1',
'Heat Eco': '67-1-11',
'Full Power': '67-1-1'
},
default_setpoint: '67-1-1',
discovery_payload: {
min_temp: 8,
max_temp: 28,
modes: ['off', 'heat', 'cool'],
modes: ['off', 'heat', 'cool', 'drying'],
mode_state_topic: '64-1-0',
mode_command_topic: true,
current_temperature_topic: '49-1-1',
Expand Down
Loading

0 comments on commit dea2eb6

Please sign in to comment.