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

Merge branch 'current' into next

Browse source
This commit is contained in:
Paulus Schoutsen 2016-09-28 20:34:05 -07:00
commit 8a8e6e9c1f
52 changed files with 304 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/_components/modbus.markdown
View file

@ -20,7 +20,11 @@ To add modbus to your installation, add the following to your `configuration.yam
For a network connection:
```yaml
<<<<<<< HEAD
# Modbus TCP
=======
# Example configuration.yaml entry for a TCP connection
>>>>>>> current
modbus:
type: tcp
host: IP_ADDRESS
@ -31,12 +35,12 @@ Configuration variables:
- **type** (*Required*): Type of the connection to Modbus.
- **host** (*Required*): The IP address of your router, eg. 192.168.1.1.
- **port** (*Required*): The port for the comminication.
- **port** (*Required*): The port for the communication.
For a serial connection:
```yaml
# Example configuration.yaml entry
# Example configuration.yaml entry for a serial connection
modbus:
type: serial
method: rtu