jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' into next

Browse source 
Conflicts:
	source/_components/binary_sensor.command_line.markdown
	source/_components/binary_sensor.mysensors.markdown
	source/_posts/2016-02-28-steam-d-link-smart-plugs-and-neurio-energy-sensors.markdown
	source/developers/credits.markdown
This commit is contained in:
Paulus Schoutsen 2016-03-12 09:50:18 -08:00
commit 6187938e63
40 changed files with 3724 additions and 3248 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/_components/binary_sensor.mysensors.markdown
View file

@ -2,7 +2,11 @@
layout: page
title: "MySensors Binary Sensor"
description: "Instructions how to integrate MySensors binary sensors into Home Assistant."
<<<<<<< HEAD
date: 2016-02-27 20:13 +0100
=======
date: 2016-02-28 01:20 +0100
>>>>>>> master
sidebar: true
comments: false
sharing: true
@ -30,9 +34,9 @@ S_TYPE | V_TYPE
---------------|----------------------------------
S_SPRINKLER | V_TRIPPED
S_WATER_LEAK | V_TRIPPED
S_SOUND | V_TRIPPED, V_LEVEL
S_VIBRATION | V_TRIPPED, V_LEVEL
S_MOISTURE | V_TRIPPED, V_LEVEL
S_SOUND | V_TRIPPED
S_VIBRATION | V_TRIPPED
S_MOISTURE | V_TRIPPED
For more information, visit the [serial api] of MySensors.