Merge pull request #3 from gregmag/knx

Update ip.xml
kgoderis · Aug 25, 2016 · f24a137 · f24a137
2 parents 543f9da + 4b81590
commit f24a137
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/addons/binding/org.openhab.binding.knx/ESH-INF/thing/ip.xml b/addons/binding/org.openhab.binding.knx/ESH-INF/thing/ip.xml
@@ -15,27 +15,27 @@
         </channels>
 
         <config-description>
+            <parameter name="ipConnectionType" type="text">
+                <label>IP Connection Type</label>
+                <description>The ip connection type for connecting to the KNX bus. Could be either TUNNEL or ROUTER</description>
+                <required>true</required>
+            </parameter>  
             <parameter name="ipAddress" type="text">
                 <label>Network Address</label>
                 <description>Network address of the KNX/IP gateway</description>
-                <required>true</required>
+                <required>false</required> <!-- Not required if ipConnectionType is ROUTER -->
             </parameter>
             <parameter name="portNumber" type="integer">
                 <label>Port Number</label>
                 <description>Port number of the KNX/IP gateway</description>
-                <required>true</required>
+                <required>false</required> <!-- Not required if ipConnectionType is ROUTER -->
             </parameter>
             <parameter name="localIp" type="text">
                 <label>Local Network Address</label>
                 <description>Network address of the local host to be used to set up the connection to the KNX/IP gateway</description>
                 <required>false</required>
             </parameter>      
-            <parameter name="ipConnectionType" type="text">
-                <label>IP Connection Type</label>
-                <description>The ip connection type for connecting to the KNX bus. Could be either TUNNEL or ROUTER</description>
-                <required>true</required>
-            </parameter>  
-            <parameter name="localSourceAddr" type="text">
+             <parameter name="localSourceAddr" type="text">
                 <label>local KNX GA</label>
                 <description>The group address for identification of this KNX/IP gateway within the KNX bus. Default is 0.0.0</description>
                 <required>false</required>

diff --git a/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF
@@ -5,6 +5,11 @@ Bundle-SymbolicName: org.openhab.binding.knx;singleton:=true
 Bundle-Vendor: openHAB
 Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+/**
+ * Package gnu.io generate an error at installation time on fresh installation.
+ * It is necessary to install the serial transport feature before the knx module (feature:install openhab-transport-serial).
+ * Possible to install it automatically or workaround ?
+ */
 Import-Package: com.google.common.collect,
  gnu.io,
  org.eclipse.smarthome.config.core,