Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2018-12-14 10:14:51 +01:00
commit 8b00c2740e
9 changed files with 44 additions and 38 deletions

View File

@ -4,7 +4,9 @@ ruby "> 2.3.0"
group :development do
gem 'rake', '~> 10.0'
gem 'jekyll', '~> 3.0'
# 3.8.5 throws errors on unfinished liquid tags in excerpts
# Wait with upgrade until release https://github.com/jekyll/jekyll/pull/7382
gem 'jekyll', '3.8.4'
gem 'compass', '~> 0.12'
gem 'sass-globbing', '~> 1.0'
gem 'stringex', '~> 1.4'

View File

@ -10,19 +10,29 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
ffi (1.9.18)
concurrent-ruby (1.1.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.9.25)
forwardable-extended (2.6.0)
fssm (0.2.10)
jekyll (3.5.2)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.12.1)
@ -33,13 +43,14 @@ GEM
jekyll (~> 3.3)
jekyll-time-to-read (0.1.2)
jekyll
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
kramdown (1.14.0)
liquid (4.0.0)
listen (3.0.8)
jekyll-watch (2.1.2)
listen (~> 3.0)
kramdown (1.17.0)
liquid (4.0.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
method_source (0.8.2)
mini_portile2 (2.3.0)
@ -64,22 +75,23 @@ GEM
octopress-tag-helpers (~> 1.0)
octopress-tag-helpers (1.0.8)
jekyll (>= 2.0)
pathutil (0.14.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (3.0.0)
public_suffix (3.0.3)
rack (1.6.9)
rack-protection (1.5.5)
rack
rake (10.5.0)
rb-fsevent (0.10.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
redcarpet (3.4.0)
rouge (1.11.1)
rouge (3.3.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.2.19)
sass-globbing (1.1.5)
@ -98,7 +110,7 @@ PLATFORMS
DEPENDENCIES
compass (~> 0.12)
jekyll (~> 3.0)
jekyll (= 3.8.4)
jekyll-paginate
jekyll-redirect-from
jekyll-sitemap
@ -117,4 +129,4 @@ RUBY VERSION
ruby 2.4.1p111
BUNDLED WITH
1.16.1
1.17.1

View File

@ -12,7 +12,7 @@ code.highlighter-rouge {
padding: 0 .3em;
}
.highlight {
pre.highlight {
background-color: #FFF;
border: 1px solid #CCC;
font-family: "Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;

View File

@ -13,7 +13,7 @@ ha_release: "0.10"
ha_iot_class: "Local Polling"
---
The `heatmiser` climate platform let you control [Heatmiser DT/DT-E/PRT/PRT-E](http://www.heatmisershop.co.uk/heatmiser-slimline-programmable-room-thermostat/) thermostats from Heatmiser. The module itself is currently setup to work over a RS232 -> RS485 converter, therefore it connects over IP.
The `heatmiser` climate platform let you control [Heatmiser DT/DT-E/PRT/PRT-E](https://www.heatmisershop.co.uk/thermostats) thermostats from Heatmiser. The module itself is currently setup to work over a RS232 -> RS485 converter, therefore it connects over IP.
Further work would be required to get this setup to connect over Wifi, but the HeatmiserV3 python module being used is a full implementation of the V3 protocol.

View File

@ -39,7 +39,7 @@ Most lights do not support all attributes. You can check the platform documentat
| `color_temp` | yes | An integer in mireds representing the color temperature you want the light to be.
| `kelvin` | yes | Alternatively, you can specify the color temperature in Kelvin.
| `color_name` | yes | A human-readable string of a color name, such as `blue` or `goldenrod`. All [CSS3 color names](https://www.w3.org/TR/css-color-3/#svg-color) are supported.
| `brightness` | yes | Integer between 0 and 255 for how bright the color should be.
| `brightness` | yes | Integer between 0 and 255 for how bright the light should be.
| `brightness_pct`| yes | Alternatively, you can specify brightness in percent (a number between 0 and 100).
| `flash` | yes | Tell light to flash, can be either value `short` or `long`.
| `effect`| yes | Applies an effect such as `colorloop` or `random`.

View File

@ -85,6 +85,8 @@ Navigate to another view:
```yaml
- type: picture
image: /local/home.jpg
tap_action:
action: navigate
navigation_path: /lovelace/home
```

View File

@ -42,20 +42,6 @@ unit:
required: false
description: The unit of measurement
type: string
height:
required: false
description: Height of the graph
type: integer
default: 100
line_width:
required: false
description: Width of the line stroke
type: integer
default: 5
line_color:
required: false
description: Color of the line stroke
type: string
detail:
required: false
description: Detail of the graph `1` or `2`, `1` equals one point/hour, `2` equals six points/hour
@ -66,6 +52,10 @@ hours_to_show:
description: Hours to show in graph
type: integer
default: 24
theme:
required: false
description: Set to any theme within `themes.yaml`
type: string
{% endconfiguration %}
## {% linkable_title Example %}

View File

@ -41,11 +41,11 @@ We have improved how we call services with better validation checks. This means
If you are currently testing Lovelace, please read the notes thoroughly as a lot has changed. First, we now have now three different Lovelace modes: auto-generated, storage, and yaml (the old way of doing Lovelace). The UI editor will be limited to the storage mode, in which we control how the config is stored.
So if you were using Lovelace before 0.84, you now have two options. Option one is to use the new storage mode and import your existing file. You can do this by opening the Lovelace UI and click on Configure UI, this will prompt you to change to storage mode. This will unlock a new option in the menu called "raw config editor". Open this and paste the content of your `ui-lovelace.yaml` file into it and click save. Note that YAML comments are not persisted.
So if you were using Lovelace before 0.84, you now have two options. Option one is to use the new storage mode and import your existing file. You can do this by opening the Lovelace UI and click on Configure UI, this will prompt you to change to storage mode. This will unlock a new option in the menu called "raw config editor". Open this and paste the content of your `ui-lovelace.yaml` file into it and click save. Note that YAML comments are not persisted and `!include`/`!secret` are not supported if in storage mode.
If you want to continue managing a YAML file, [check here how to enable the YAML mode](/lovelace/yaml-mode/). The file `ui-lovelace.yaml` will now follow the same options as `configuration.yaml`. This means that the Lovelace YAML config is now parsed with YAML 1.1 instead of YAML 1.2. Major change is that you need to make sure that you wrap `on` and `off` with quotes in your configs!
We have also aligned the configuration of all the cards, causing breaking changes. Changes are especially focused around how we define actions for short and long presses. See [the docs][/lovelace/changelog/] for more info.
We have also aligned the configuration of all the cards, causing breaking changes. Changes are especially focused around how we define actions for short and long presses. See [the docs](/lovelace/changelog/) for more info.
Editor UI is now further processed. You can manage your Lovelace UI without leaving your browser! It is possible to add, edit and delete views. It is possible to add, edit, move and delete cards, including custom cards!