Skip to content

Commit 6c1b7ab

Browse files
committed
Merge branch 'master' of https://github.com/openhab/openhab2
2 parents 57460ca + 7f7a29d commit 6c1b7ab

File tree

17 files changed

+674
-80
lines changed

17 files changed

+674
-80
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ distribution/openhabhome/userdata/logs/openhab.log
1818
distribution/openhabhome/userdata/mapdb/storage.mapdb
1919
distribution/openhabhome/userdata/mapdb/storage.mapdb.p
2020
distribution/openhabhome/userdata/mapdb/storage.mapdb.t
21+
features/*/src/main/history

addons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml

+33-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<thing:thing-descriptions bindingId="max"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<thing:thing-descriptions bindingId="max" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
43
xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
5-
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 org.eclipse.smarthome.thing-description.xsd">
4+
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
65

76
<bridge-type id="bridge">
87
<label>MAX! Cube LAN gateway</label>
@@ -15,50 +14,71 @@
1514
</channels>
1615

1716
<config-description>
18-
<parameter name="ipAddress" type="text" required="true">
17+
<parameter-group name="identification">
18+
<label>Identification</label>
19+
<description>Hardware &amp; location identification</description>
20+
<advanced>false</advanced>
21+
</parameter-group>
22+
<parameter-group name="network">
23+
<label>Connection</label>
24+
<description>Connection Settings</description>
25+
<advanced>false</advanced>
26+
</parameter-group>
27+
<parameter-group name="device">
28+
<label>Device Settings</label>
29+
<description>Device parameter settings</description>
30+
<advanced>true</advanced>
31+
</parameter-group>
32+
<parameter-group name="binding">
33+
<label>Binding Settings</label>
34+
<description>Binding settings for this device</description>
35+
<advanced>false</advanced>
36+
</parameter-group>
37+
38+
<parameter name="ipAddress" type="text" required="true" groupName="network">
1939
<context>network-address</context>
2040
<label>MAX! Cube LAN gateway IP</label>
2141
<description>The IP address of the MAX! Cube LAN gateway
2242
</description>
2343
</parameter>
24-
<parameter name="port" type="integer" required="false" min="1"
25-
max="65335">
44+
<parameter name="port" type="integer" required="false" min="1" max="65335" groupName="network">
2645
<context>network-address</context>
2746
<label>MAX! Cube LAN gateway port</label>
2847
<description>Port of the LAN gateway</description>
2948
<default>62910</default>
49+
<advanced>true</advanced>
3050
</parameter>
31-
<parameter name="refreshInterval" type="integer" required="false" min="1">
51+
<parameter name="refreshInterval" type="integer" required="false" min="1" groupName="network">
3252
<label>Refresh Interval</label>
3353
<description>The refresh interval in seconds which is used to poll given
3454
MAX! Cube.
3555
</description>
3656
<default>30</default>
3757
</parameter>
38-
<parameter name="serialNumber" type="text" required="true">
58+
<parameter name="serialNumber" type="text" required="true" groupName="identification">
3959
<label>Serial Number</label>
4060
<description>The Serial Number identifies one specific device.
4161
</description>
4262
</parameter>
43-
<parameter name="rfAddress" type="text" required="false">
63+
<parameter name="rfAddress" type="text" required="false" groupName="identification">
4464
<label>RF Address</label>
4565
<description>The RF Address used for communication between the devices.
4666
</description>
4767
</parameter>
48-
<parameter name="exclusive" type="boolean" required="false">
68+
<parameter name="exclusive" type="boolean" required="false" groupName="network">
4969
<label>Exclusive Mode</label>
5070
<description>If set to true, the binding will leave the connection
5171
to the Cube open.
5272
</description>
5373
<default>true</default>
5474
</parameter>
55-
<parameter name="maxRequestsPerConnection" type="integer"
56-
required="false">
75+
<parameter name="maxRequestsPerConnection" type="integer" required="false" groupName="network">
5776
<label>Max Requests per Connection</label>
5877
<description>In exclusive mode, how many requests are allowed until
5978
connection is closed and reopened.
6079
</description>
6180
<default>1000</default>
81+
<advanced>true</advanced>
6282
</parameter>
6383
</config-description>
6484

@@ -69,7 +89,6 @@
6989
<label>Free Memory Slots</label>
7090
<description>Free memory slots to store commands send to the devices
7191
</description>
72-
<category>FreeMemory</category>
7392
<state pattern="%d" readOnly="true">
7493
</state>
7594
</channel-type>
@@ -79,8 +98,7 @@
7998
<label>Duty Cycle</label>
8099
<description>Duty Cycle for sending commands to the devices
81100
</description>
82-
<category>DutyCycle</category>
83-
<state pattern="%d %" readOnly="true">
101+
<state pattern="%d %%" readOnly="true">
84102
</state>
85103
</channel-type>
86104

0 commit comments

Comments
 (0)