Merge remote-tracking branch 'upstream/MySensors' into MySensors

Conflicts: addons/binding/org.openhab.binding.mysensors/ESH-INF/thing/thing-types.xml
tobof · Jan 31, 2016 · ffbbfc5 · ffbbfc5
2 parents 5449983 + 8c64a8c
commit ffbbfc5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/addons/binding/org.openhab.binding.mysensors/Readme.md b/addons/binding/org.openhab.binding.mysensors/Readme.md
@@ -21,6 +21,15 @@ SerialGateway:
     /** define things connected to that bridge here */
   }
 ```
+
+The serial gateway from MySensors works with a baud rate of 115.200. If you're using a different baud rate you need to add an additional parameter "baudRate":
+
+```
+  mysensors:bridge-ser:gateway [ serialPort="/dev/pts/2", sendDelay=200, baudRate=115200 ] {
+    /** define things connected to that bridge here */
+  }
+```
+
 
 EthernetGateway:
 

diff --git a/addons/binding/org.openhab.binding.mysensors/test/testscript.sh b/addons/binding/org.openhab.binding.mysensors/test/testscript.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-serialPort="/dev/pts/1"
+serialPort="/dev/pts/12"
 
 # socat -d -d pty,raw,echo=0 pty,raw,echo=0
 

diff --git a/addons/binding/pom.xml b/addons/binding/pom.xml
@@ -36,6 +36,7 @@
     <module>org.openhab.binding.squeezebox</module>
     <module>org.openhab.binding.tesla</module>
     <module>org.openhab.binding.vitotronic</module>
+    <module>org.openhab.binding.mysensors</module>
   </modules>
 
-</project>
+</project>