From 990db6a74aef10f52d8991eb5f99d17cdeca9e36 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 30 Sep 2016 16:58:11 +0200 Subject: [PATCH] initial implementation of netscanner plugin --- hal.conf.example | 4 +++- src/se/hal/plugin/netscan/NetScanController.java | 7 +++++++ src/se/hal/plugin/nutups/NutUpsController.java | 3 +-- src/se/hal/plugin/nutups/NutUpsDevice.java | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100755 src/se/hal/plugin/netscan/NetScanController.java diff --git a/hal.conf.example b/hal.conf.example index cab36709..919a078a 100755 --- a/hal.conf.example +++ b/hal.conf.example @@ -4,4 +4,6 @@ sync_port=6666 # Plugin configurations #tellstick.com_port=COM5 #nutups.host= -#nutups.port= \ No newline at end of file +#nutups.port= +# Network scanning is disabled by default as it is not appropriate for all networks +#netscan.scanip=true \ No newline at end of file diff --git a/src/se/hal/plugin/netscan/NetScanController.java b/src/se/hal/plugin/netscan/NetScanController.java new file mode 100755 index 00000000..a6328461 --- /dev/null +++ b/src/se/hal/plugin/netscan/NetScanController.java @@ -0,0 +1,7 @@ +package se.hal.plugin.netscan; + +/** + * Created by Ziver on 2016-09-30. + */ +public class NetScanController { +} diff --git a/src/se/hal/plugin/nutups/NutUpsController.java b/src/se/hal/plugin/nutups/NutUpsController.java index da05a339..a780eacb 100755 --- a/src/se/hal/plugin/nutups/NutUpsController.java +++ b/src/se/hal/plugin/nutups/NutUpsController.java @@ -6,9 +6,8 @@ import se.hal.intf.HalSensorController; import se.hal.intf.HalSensorConfig; import se.hal.intf.HalSensorReportListener; import zutil.log.LogUtil; -import zutil.osal.app.linux.NutUPSClient; +import zutil.osal.linux.app.NutUPSClient; -import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/se/hal/plugin/nutups/NutUpsDevice.java b/src/se/hal/plugin/nutups/NutUpsDevice.java index 995495c5..6c4f2151 100755 --- a/src/se/hal/plugin/nutups/NutUpsDevice.java +++ b/src/se/hal/plugin/nutups/NutUpsDevice.java @@ -4,7 +4,7 @@ import se.hal.intf.HalSensorConfig; import se.hal.intf.HalSensorController; import se.hal.intf.HalSensorData; import se.hal.struct.devicedata.PowerConsumptionSensorData; -import zutil.osal.app.linux.NutUPSClient; +import zutil.osal.linux.app.NutUPSClient; import zutil.ui.Configurator; /**