Commit 0c9d9982 authored by aw613's avatar aw613
Browse files

this version works on demo lightbulb device

parent c1e85ac9
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/xmlpull.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-core.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-core-javadoc.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-core-sources.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-device.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-device-javadoc.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-device-sources.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-example.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-example-javadoc.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-example-sources.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-gpio-extension.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-gpio-extension-javadoc.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-gpio-extension-sources.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-service.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-service-javadoc.jar"/>
<classpathentry kind="lib" path="D:/Arbeit/Development/Java/3rdparty/pi4j/pi4j-service-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jmeds2.0-beta10"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/jmeds2.0-beta10"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/junit.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-core.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-core-javadoc.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-core-sources.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-device.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-device-javadoc.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-device-sources.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-example.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-example-javadoc.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-example-sources.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-gpio-extension.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-gpio-extension-javadoc.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-gpio-extension-sources.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-service.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-service-javadoc.jar"/>
<classpathentry exported="true" kind="lib" path="C:/Users/aw436/ThirdPartyLib/pi4j-1.0/lib/pi4j-service-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
......
......@@ -51,7 +51,7 @@ public class LightBulbServiceProvider {
// Disable debug output
Log.setLogLevel(Log.DEBUG_LEVEL_INFO);
DPWSProperties properties = DPWSProperties.getInstance();
// properties.setDiscoveryButton0(1);
// properties.setDiscoveryButton0(1); //einen von beiden aktivieren
// properties.setDiscoveryButton1(3);
properties.addSupportedDPWSVersion(DPWSProtocolVersion.DPWS_VERSION_2006);
// properties.removeSupportedDPWSVersion(DPWSProtocolVersion.DPWS_VERSION_2009);
......@@ -116,14 +116,14 @@ public class LightBulbServiceProvider {
// Select control buttons if on Pi
if (environment != null && environment.equals("pi")) {
Log.info("Starting GPIO Controller");
GpioListener.getInstance().bindButton0(0);
GpioListener.getInstance().bindButton0(1);
//GpioListener.getInstance().bindButton0(3);
GpioListener.getInstance().registerDevice(device);
GpioListener.getInstance().registerClient(client);
GpioListener.getInstance().activateHello(true);
GpioListener.getInstance().activateProbe(true);
//BulbGPIOListener.getInstance().pulse(500);
BulbGPIOListener.getInstance().pulse(500);
}
} catch (IOException e) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment