ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixed merge issues

Browse source
This commit is contained in:
Ziver Koc 2019-11-12 14:26:37 +01:00
parent 81a85320a2
commit 09ae1b2667
37 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Hal.iml
View file

@ -6,18 +6,22 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/resource" type="java-resource" relativeOutputPath="resource" />
<sourceFolder url="file://$MODULE_DIR$/plugins/zwave/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/tellstick/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/tellstick/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/plugins/raspberry/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/hal-zwave/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/hal-tellstick/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/hal-tellstick/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/plugins/hal-raspberry/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/hal-zigbee/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/hal-raspberry/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/hal-tellstick/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/hal-zigbee/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/hal-zwave/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/raspberry/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/tellstick/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/zwave/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="wzwave" exported="" />
<orderEntry type="module" module-name="Zutil" exported="" />
<orderEntry type="module-library" exported="">
<library name="lib">
@ -36,29 +40,23 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="lib ZWave">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/plugins/zwave/lib" />
</CLASSES>
<JAVADOC />
<NATIVE>
<root url="file://$MODULE_DIR$/plugins/zwave/lib" />
</NATIVE>
<SOURCES>
<root url="jar://$USER_HOME$/.ideaLibSources/netty-all-4.0.46.Final-sources.jar!/" />
<root url="jar://$USER_HOME$/.ideaLibSources/wzwave-0.0.3-sources.jar!/" />
</SOURCES>
<jarDirectory url="file://$MODULE_DIR$/plugins/zwave/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library name="lib Raspberry">
<CLASSES>
<root url="file://$MODULE_DIR$/plugins/raspberry/lib" />
<root url="file://$MODULE_DIR$/plugins/hal-raspberry/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/plugins/raspberry/lib" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/plugins/hal-raspberry/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/plugins/hal-zwave/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/plugins/hal-zwave/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">

0
plugins/raspberry/build.xml → plugins/hal-raspberry/build.xml Executable file → Normal file
View file

0
plugins/raspberry/lib/pi4j-core-1.1.jar → plugins/hal-raspberry/lib/pi4j-core-1.1.jar Executable file → Normal file
View file

0
plugins/raspberry/lib/pi4j-device-1.1.jar → plugins/hal-raspberry/lib/pi4j-device-1.1.jar Executable file → Normal file
View file

0
plugins/raspberry/lib/pi4j-gpio-extension-1.1.jar → plugins/hal-raspberry/lib/pi4j-gpio-extension-1.1.jar Executable file → Normal file
View file

0
plugins/raspberry/lib/pi4j-service-1.1.jar → plugins/hal-raspberry/lib/pi4j-service-1.1.jar Executable file → Normal file
View file

0
plugins/raspberry/lib/pi4j.LICENSE.txt → plugins/hal-raspberry/lib/pi4j.LICENSE.txt Executable file → Normal file
View file

0
plugins/raspberry/lib/pi4j.NOTICE.txt → plugins/hal-raspberry/lib/pi4j.NOTICE.txt Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiController.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiController.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiSensor.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiUtility.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiUtility.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java Executable file → Normal file
View file

0
plugins/raspberry/src/se/hal/plugin/raspberry/plugin.json → plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json Executable file → Normal file
View file

0
plugins/tellstick/build.xml → plugins/hal-tellstick/build.xml Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/TellstickParser.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickParser.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json → plugins/hal-tellstick/src/se/hal/plugin/tellstick/plugin.json Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java Executable file → Normal file
View file

0
plugins/tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java → plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java Executable file → Normal file
View file

0
plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java → plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java Executable file → Normal file
View file

0
plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java → plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java Executable file → Normal file
View file

0
plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java → plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java Executable file → Normal file
View file

0
plugins/tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java → plugins/hal-tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java Executable file → Normal file
View file

BIN
plugins/hal-zwave/lib/zwave4j-0.3.jar Normal file
View file

Binary file not shown.

0
plugins/zwave/src/se/hal/plugin/zwave/HalZWaveController.java → plugins/hal-zwave/src/se/hal/plugin/zwave/HalZWaveController.java Executable file → Normal file
View file