Skip to content

Commit 42a26d6

Browse files
kaikreuzerkaikreuzer
committed
Merge branch 'freebox' of https://github.com/clinique/openhab2 into clinique-freebox
Conflicts: AUTHORS addons/binding/pom.xml targetplatform/openHAB_Runtime.launch Signed-off-by: Kai Kreuzer <[email protected]> (github: @kaikreuzer)
2 parents 63d70f8 + 1daf8ea commit 42a26d6

22 files changed

+949
-1
lines changed

‎AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
Dancho Penev <[email protected]>
55
Gerhard Riegler <[email protected]>
6+
Gaël L'hopital <[email protected]>
67
Gideon le Grange <[email protected]>
78
Jochen Hiller <[email protected]>
89
Kai Kreuzer <[email protected]>

‎addons/binding/org.openhab.binding.freebox/.classpath

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry exported="true" kind="lib" path="lib/httpcore-4.3.jar"/>
4+
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.3.1.jar"/>
5+
<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.9.13.jar"/>
6+
<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.9.13.jar"/>
7+
<classpathentry exported="true" kind="lib" path="lib/freeboxos-client-0.3.5.jar"/>
8+
<classpathentry exported="true" kind="lib" path="lib/httpmime-4.3.1.jar"/>
9+
<classpathentry exported="true" kind="lib" path="lib/json-simple-1.1.jar"/>
10+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
11+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
12+
<classpathentry kind="src" path="src/main/java"/>
13+
<classpathentry kind="output" path="target/classes"/>
14+
</classpath>

‎addons/binding/org.openhab.binding.freebox/.project

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.openhab.binding.freebox</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.pde.ds.core.builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>org.eclipse.pde.PluginNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>

‎addons/binding/org.openhab.binding.freebox/.settings/org.eclipse.pde.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
resolve.requirebundle=false

‎addons/binding/org.openhab.binding.freebox/ESH-INF/binding/binding.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<binding:binding id="freebox"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
5+
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
6+
7+
<name>Freebox Binding</name>
8+
<description>The Freebox binding requests your Freebox Revolution Server for various operational informations.</description>
9+
<author>Gaël L'hopital</author>
10+
11+
</binding:binding>

‎addons/binding/org.openhab.binding.freebox/ESH-INF/thing/thing-types.xml

+273
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,273 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<thing:thing-descriptions bindingId="freebox"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
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 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
6+
7+
<thing-type id="server">
8+
<label>Freebox Revolution Server</label>
9+
<description>Provides various informations regarding the status of the Freebox Server</description>
10+
11+
<channels>
12+
<channel id="fwversion" typeId="fwversion"/>
13+
<channel id="uptime" typeId="uptime"/>
14+
<channel id="restarted" typeId="restarted"/>
15+
<channel id="tempcpum" typeId="tempcpum" />
16+
<channel id="tempcpub" typeId="tempcpub" />
17+
<channel id="tempswitch" typeId="tempswitch" />
18+
<channel id="fanspeed" typeId="fanspeed" />
19+
<channel id="reboot" typeId="reboot" />
20+
<channel id="lcd_brightness" typeId="lcd_brightness" />
21+
<channel id="lcd_orientation" typeId="lcd_orientation" />
22+
<channel id="lcd_forced" typeId="lcd_forced" />
23+
<channel id="wifi_status" typeId="wifi_status" />
24+
<channel id="xdsl_status" typeId="xdsl_status" />
25+
<channel id="line_status" typeId="line_status" />
26+
<channel id="ipv4" typeId="ipv4" />
27+
<channel id="rate_up" typeId="rate_up" />
28+
<channel id="rate_down" typeId="rate_down" />
29+
<channel id="bytes_up" typeId="bytes_up" />
30+
<channel id="bytes_down" typeId="bytes_down" />
31+
<channel id="onhook" typeId="onhook" />
32+
<channel id="ringing" typeId="ringing" />
33+
<channel id="call_number" typeId="call_number" />
34+
<channel id="call_duration" typeId="call_duration" />
35+
<channel id="call_timestamp" typeId="call_timestamp" />
36+
<channel id="call_status" typeId="call_status" />
37+
<channel id="call_name" typeId="call_name" />
38+
</channels>
39+
40+
<config-description>
41+
<parameter name="ipAddress" type="text">
42+
<label>Freebox Network Address</label>
43+
<context>network_address</context>
44+
<description>The IP address / FQDN of the Freebox Server (can include port number)</description>
45+
<default>mafreebox.freebox.fr</default>
46+
<required>false</required>
47+
</parameter>
48+
49+
<parameter name="appToken" type="text">
50+
<label>Application token</label>
51+
<description>Token generated by the Freebox server</description>
52+
<required>true</required>
53+
</parameter>
54+
55+
<parameter name="refreshInterval" type="integer">
56+
<label>Refresh Interval</label>
57+
<description>The refresh interval in seconds which is used to poll given Freebox Server.</description>
58+
<default>30</default>
59+
<required>false</required>
60+
</parameter>
61+
62+
<parameter name="refreshPhoneInterval" type="integer">
63+
<label>Phone Refresh Interval</label>
64+
<description>The refresh interval in seconds which is used to poll given Freebox Server for phone informations.</description>
65+
<default>2</default>
66+
<required>false</required>
67+
</parameter>
68+
69+
</config-description>
70+
</thing-type>
71+
72+
<channel-type id="fwversion" advanced="true">
73+
<item-type>String</item-type>
74+
<label>Firmware Version</label>
75+
<description>Version of the Freebox Server Firmware</description>
76+
<state readOnly="true" />
77+
</channel-type>
78+
79+
<channel-type id="uptime" advanced="true">
80+
<item-type>Number</item-type>
81+
<label>Server uptime</label>
82+
<description>Time since last reboot of the Freebox Server</description>
83+
<state readOnly="true" pattern="%d s"/>
84+
</channel-type>
85+
86+
<channel-type id="restarted" advanced="true">
87+
<item-type>Switch</item-type>
88+
<label>Just restarted</label>
89+
<description>Has the Freebox server have restarted during the last poll period</description>
90+
<category>Alarm</category>
91+
<state readOnly="true" />
92+
</channel-type>
93+
94+
<channel-type id="reboot">
95+
<item-type>Switch</item-type>
96+
<label>Reboot Freebox</label>
97+
<description>Reboots the Freebox server</description>
98+
<category>Switch</category>
99+
</channel-type>
100+
101+
<channel-type id="tempcpum" advanced="true">
102+
<item-type>Number</item-type>
103+
<label>CPUm Temperature</label>
104+
<description>Actual measured CPU Marvell temperature of the Freebox Server</description>
105+
<category>Temperature</category>
106+
<state readOnly="true" pattern="%d °C"/>
107+
</channel-type>
108+
109+
<channel-type id="tempcpub" advanced="true">
110+
<item-type>Number</item-type>
111+
<label>CPUb Temperature</label>
112+
<description>Actual measured CPU Broadcom (xDSL) temperature of the Freebox Server</description>
113+
<category>Temperature</category>
114+
<state readOnly="true" pattern="%d °C"/>
115+
</channel-type>
116+
117+
<channel-type id="tempswitch" advanced="true">
118+
<item-type>Number</item-type>
119+
<label>Switch Temperature</label>
120+
<description>Actual measured switch temperature of the Freebox Server</description>
121+
<category>Temperature</category>
122+
<state readOnly="true" pattern="%d °C"/>
123+
</channel-type>
124+
125+
<channel-type id="fanspeed" advanced="true">
126+
<item-type>Number</item-type>
127+
<label>Fan Speed</label>
128+
<description>Actual measured fan speed (rpm) of the Freebox Server</description>
129+
<state readOnly="true" pattern="%d rpm"/>
130+
</channel-type>
131+
132+
<channel-type id="lcd_brightness" advanced="true">
133+
<item-type>Number</item-type>
134+
<label>Screen Brightness</label>
135+
<description>Brightness level of the screen in percent</description>
136+
<category>DimmableLight</category>
137+
<state pattern="%d %%"/>
138+
</channel-type>
139+
140+
<channel-type id="lcd_orientation">
141+
<item-type>Number</item-type>
142+
<label>Screen Orientation</label>
143+
<description>Screen Orientation in degrees</description>
144+
<state pattern="%d °">
145+
<options>
146+
<option value="0">Horizontal</option>
147+
<option value="90">Turned left</option>
148+
<option value="180">Turned right</option>
149+
<option value="270">Reversed</option>
150+
</options>
151+
</state>
152+
</channel-type>
153+
154+
<channel-type id="lcd_forced" advanced="true">
155+
<item-type>Switch</item-type>
156+
<label>Forced Orientation</label>
157+
<description>Indicates whether the screen orientation forced</description>
158+
<category>Switch</category>
159+
</channel-type>
160+
161+
<channel-type id="wifi_status">
162+
<item-type>Switch</item-type>
163+
<label>Wifi Enabled</label>
164+
<description>Indicates whether the wifi network is enabled</description>
165+
<category>Switch</category>
166+
</channel-type>
167+
168+
<channel-type id="xdsl_status">
169+
<item-type>String</item-type>
170+
<label>xDSL Status</label>
171+
<description>Status of the xDSL line</description>
172+
<state readOnly="true" />
173+
</channel-type>
174+
175+
<channel-type id="line_status">
176+
<item-type>String</item-type>
177+
<label>Line Status</label>
178+
<description>Status of network line connexion</description>
179+
<state readOnly="true" />
180+
</channel-type>
181+
182+
<channel-type id="ipv4" advanced="true">
183+
<item-type>String</item-type>
184+
<label>IP Address</label>
185+
<description>Public IP Address of the Freebox Server</description>
186+
<state readOnly="true" />
187+
</channel-type>
188+
189+
<channel-type id="rate_up" advanced="true">
190+
<item-type>Number</item-type>
191+
<label>Upload Rate</label>
192+
<description>Current upload rate in byte/s</description>
193+
<state readOnly="true" pattern="%d b/s"/>
194+
</channel-type>
195+
196+
<channel-type id="rate_down" advanced="true">
197+
<item-type>Number</item-type>
198+
<label>Download Rate</label>
199+
<description>Current download rate in byte/s</description>
200+
<state readOnly="true" pattern="%d b/s"/>
201+
</channel-type>
202+
203+
<channel-type id="bytes_up" advanced="true">
204+
<item-type>Number</item-type>
205+
<label>Uploaded</label>
206+
<description>Total uploaded bytes since last connection</description>
207+
<state readOnly="true" pattern="%d bytes"/>
208+
</channel-type>
209+
210+
<channel-type id="bytes_down" advanced="true">
211+
<item-type>Number</item-type>
212+
<label>Downloaded</label>
213+
<description>Total downloaded bytes since last connection</description>
214+
<state readOnly="true" pattern="%d bytes"/>
215+
</channel-type>
216+
217+
<channel-type id="onhook">
218+
<item-type>Switch</item-type>
219+
<label>On-hook</label>
220+
<description>Indicates whether the phone is on hook</description>
221+
<category>Switch</category>
222+
<state readOnly="true" />
223+
</channel-type>
224+
225+
<channel-type id="ringing">
226+
<item-type>Switch</item-type>
227+
<label>Ringing</label>
228+
<description>Is the phone ringing</description>
229+
<category>Alarm</category>
230+
<state readOnly="true" />
231+
</channel-type>
232+
233+
<channel-type id="call_number">
234+
<item-type>String</item-type>
235+
<label>Phone Number</label>
236+
<description>Callee number for outgoing calls. Caller number for incoming calls</description>
237+
<state readOnly="true" />
238+
</channel-type>
239+
240+
<channel-type id="call_duration">
241+
<item-type>Number</item-type>
242+
<label>Duration</label>
243+
<description>Call duration in seconds</description>
244+
<state readOnly="true" pattern="%d s"/>
245+
</channel-type>
246+
247+
<channel-type id="call_timestamp">
248+
<item-type>String</item-type>
249+
<label>Timestamp</label>
250+
<description>Call creation timestamp</description>
251+
<state readOnly="true" />
252+
</channel-type>
253+
254+
<channel-type id="call_status">
255+
<item-type>String</item-type>
256+
<label>Call Type</label>
257+
<description>Call Type (ingoing, outgoing, missed)</description>
258+
<state readOnly="true">
259+
<options>
260+
<option value="ingoing">Ingoing call</option>
261+
<option value="outgoing">Outgoing call</option>
262+
<option value="missing">Missed call</option>
263+
</options>
264+
</state>
265+
</channel-type>
266+
267+
<channel-type id="call_name">
268+
<item-type>String</item-type>
269+
<label>Caller name</label>
270+
<description>Callee name for outgoing calls. Caller name for incoming calls</description>
271+
<state readOnly="true" />
272+
</channel-type>
273+
</thing:thing-descriptions>

‎addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Freebox Binding
4+
Bundle-SymbolicName: org.openhab.binding.freebox;singleton:=true
5+
Bundle-Vendor: openHAB
6+
Bundle-Version: 2.0.0.qualifier
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8+
Bundle-ClassPath: .,
9+
lib/json-simple-1.1.jar,
10+
lib/httpmime-4.3.1.jar,
11+
lib/freeboxos-client-0.3.5.jar,
12+
lib/jackson-core-asl-1.9.13.jar,
13+
lib/jackson-mapper-asl-1.9.13.jar,
14+
lib/httpclient-4.3.1.jar,
15+
lib/httpcore-4.3.jar
16+
Import-Package: com.google.common.collect,
17+
org.apache.commons.logging,
18+
org.eclipse.smarthome.config.core,
19+
org.eclipse.smarthome.config.discovery,
20+
org.eclipse.smarthome.core.common.registry,
21+
org.eclipse.smarthome.core.library.types,
22+
org.eclipse.smarthome.core.thing,
23+
org.eclipse.smarthome.core.thing.binding,
24+
org.eclipse.smarthome.core.types,
25+
org.openhab.library.tel.items,
26+
org.osgi.framework;version="1.8.0",
27+
org.slf4j
28+
Service-Component: OSGI-INF/*
29+
Export-Package: org.openhab.binding.freebox,
30+
org.openhab.binding.freebox.handler
31+
Require-Bundle: com.google.guava;bundle-version="15.0.0",
32+
org.apache.commons.io;bundle-version="2.2.0",
33+
org.apache.commons.codec;bundle-version="1.6.0"

‎addons/binding/org.openhab.binding.freebox/OSGI-INF/FreeboxHandlerFactory.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2014 openHAB UG (haftungsbeschraenkt) and others.
5+
All rights reserved. This program and the accompanying materials
6+
are made available under the terms of the Eclipse Public License v1.0
7+
which accompanies this distribution, and is available at
8+
http://www.eclipse.org/legal/epl-v10.html
9+
10+
-->
11+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.binding.freebox.internal.FreeboxHandlerFactory">
12+
13+
<implementation class="org.openhab.binding.freebox.internal.FreeboxHandlerFactory"/>
14+
15+
<service>
16+
<provide interface="org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory"/>
17+
</service>
18+
19+
</scr:component>

0 commit comments

Comments
 (0)