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

Added scanning button animation, detection of scannable controllers and scan start

Browse source
This commit is contained in:
Ziver Koc 2021-06-09 22:17:32 +02:00
parent 6656882859
commit a80a1c5cdc
26 changed files with 100 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/hal-mqtt/src/se/hal/plugin/mqtt/HalMqttController.java
View file

@ -39,7 +39,7 @@ import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
public class HalMqttController implements HalAutoScannableController, MqttSubscriptionListener, HalEventController {
public class HalMqttController implements HalAutostartController, MqttSubscriptionListener, HalEventController {
private final Logger logger = LogUtil.getLogger();
private MulticastDnsServer mDns;

2
plugins/hal-mqtt/src/se/hal/plugin/mqtt/plugin.json
View file

@ -2,6 +2,6 @@
"version": 0.1,
"name": "Hal-MQTT",
"interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.mqtt.HalMqttController"}
{"se.hal.intf.HalAutostartController": "se.hal.plugin.mqtt.HalMqttController"}
]
}

2
plugins/hal-netscan/src/se/hal/plugin/netscan/NetScanController.java
View file

@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
public class NetScanController implements HalEventController, HalAutoScannableController, InetScanListener, Runnable {
public class NetScanController implements HalEventController, HalAutostartController, InetScanListener, Runnable {
public static Logger logger = LogUtil.getLogger();
private static final int NETWORK_SYNC_INTERVAL = 3 * 60 * 60 * 1000; // 3 hours
private static final int PING_INTERVAL = 10 * 1000; // 10 sec

2
plugins/hal-netscan/src/se/hal/plugin/netscan/plugin.json
View file

@ -2,7 +2,7 @@
"version": 1.0,
"name": "Hal-Network Scanner",
"interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.netscan.NetScanController"},
{"se.hal.intf.HalAutostartController": "se.hal.plugin.netscan.NetScanController"},
{"se.hal.intf.HalEventConfig": "se.hal.plugin.netscan.NetworkDevice"}
]
}

4
plugins/hal-nutups/src/se/hal/plugin/nutups/NutUpsController.java
View file

@ -49,7 +49,7 @@
package se.hal.plugin.nutups;
import se.hal.HalContext;
import se.hal.intf.HalAutoScannableController;
import se.hal.intf.HalAutostartController;
import se.hal.intf.HalDeviceConfig;
import se.hal.intf.HalDeviceReportListener;
import se.hal.intf.HalSensorController;
@ -64,7 +64,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
public class NutUpsController implements HalSensorController, HalAutoScannableController, Runnable {
public class NutUpsController implements HalSensorController, HalAutostartController, Runnable {
public static Logger logger = LogUtil.getLogger();
private static final int SYNC_INTERVAL = 60 * 1000;

2
plugins/hal-nutups/src/se/hal/plugin/nutups/plugin.json
View file

@ -2,7 +2,7 @@
"version": 1.0,
"name": "Hal-NUT UPS",
"interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.nutups.NutUpsController"},
{"se.hal.intf.HalAutostartController": "se.hal.plugin.nutups.NutUpsController"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.nutups.NutUpsDevice"}
]
}

5
plugins/hal-nvr/src/se/hal/plugin/nvr/CameraControllerManager.java
View file

@ -47,11 +47,6 @@ public class CameraControllerManager extends HalAbstractControllerManager<HalCam
}
@Override
public Collection<HalCameraController> getControllers() {
return null;
}
public void initialize(PluginManager pluginManager){
super.initialize(pluginManager);

6
plugins/hal-nvr/src/se/hal/plugin/nvr/page/CameraConfigWebPage.java
View file

@ -29,7 +29,7 @@ import se.hal.intf.HalWebPage;
import se.hal.page.HalAlertManager;
import se.hal.plugin.nvr.CameraControllerManager;
import se.hal.plugin.nvr.struct.Camera;
import se.hal.struct.ClassConfigurationData;
import se.hal.util.ClassConfigurationFacade;
import se.hal.struct.User;
import zutil.ObjectUtil;
import zutil.db.DBConnection;
@ -47,7 +47,7 @@ public class CameraConfigWebPage extends HalWebPage {
private static final Logger logger = LogUtil.getLogger();
private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/camera_config.tmpl";
private ArrayList<ClassConfigurationData> cameraConfigurations;
private ArrayList<ClassConfigurationFacade> cameraConfigurations;
public CameraConfigWebPage() {
@ -56,7 +56,7 @@ public class CameraConfigWebPage extends HalWebPage {
cameraConfigurations = new ArrayList<>();
for (Class c : CameraControllerManager.getInstance().getAvailableDeviceConfigs())
cameraConfigurations.add(new ClassConfigurationData(c));
cameraConfigurations.add(new ClassConfigurationFacade(c));
}
@Override

2
plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
View file

@ -46,7 +46,7 @@ import java.util.logging.Logger;
* communication and reporting to Hal
*/
public class TellstickSerialComm implements Runnable,
HalSensorController, HalEventController, HalAutoScannableController {
HalSensorController, HalEventController, HalAutostartController {
private static final Logger logger = LogUtil.getLogger();
private static String CONFIG_TELLSTICK_COM_PORT = "tellstick.com_port";

2
plugins/hal-tellstick/src/se/hal/plugin/tellstick/plugin.json
View file

@ -2,7 +2,7 @@
"version": 1.0,
"name": "Hal-Tellstick",
"interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.tellstick.TellstickSerialComm"},
{"se.hal.intf.HalAutostartController": "se.hal.plugin.tellstick.TellstickSerialComm"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.tellstick.device.Oregon0x1A2D"},
{"se.hal.intf.HalEventConfig": "se.hal.plugin.tellstick.device.NexaSelfLearning"}

2
plugins/hal-zigbee-deconz/src/se/hal/plugin/zigbee/deconz/zigbee/DeConzZigbeeController.java
View file

@ -36,7 +36,7 @@ import java.util.logging.Logger;
* <p>
* Rest documentatiuon for deConz: https://dresden-elektronik.github.io/deconz-rest-doc/
*/
public class DeConzZigbeeController implements HalSensorController, HalEventController, HalAutoScannableController {
public class DeConzZigbeeController implements HalSensorController, HalEventController, HalAutostartController {
private static final Logger logger = LogUtil.getLogger();
public static final String CONFIG_ZIGBEE_REST_URL = "zigbee.rest_url";

2
plugins/hal-zigbee-deconz/src/se/hal/plugin/zigbee/deconz/zigbee/plugin.json_disabled
View file

@ -3,6 +3,6 @@
"name": "Hal-Zigbee-DeConz",
"description": "A Zigbee plugin interfacing with a DeConz service.",
"interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.zigbee.deconz.zigbee.HalDeconzZigbeeController"}
{"se.hal.intf.HalAutostartController": "se.hal.plugin.zigbee.deconz.zigbee.HalDeconzZigbeeController"}
]
}

2
plugins/hal-zigbee/src/se/hal/plugin/zigbee/HalZigbeeController.java
View file

@ -31,7 +31,7 @@ import java.util.logging.Logger;
*/
public class HalZigbeeController implements HalSensorController,
HalEventController,
HalAutoScannableController,
HalAutostartController,
ZigBeeAnnounceListener,
ZigBeeNetworkNodeListener,
HalScannableController {

2
plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json
View file

@ -3,6 +3,6 @@
"name": "Hal-Zigbee",
"description": "A Zigbee plugin for directly connecting to a CC2531 device over serial port.",
"interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.zigbee.HalZigbeeController"}
{"se.hal.intf.HalAutostartController": "se.hal.plugin.zigbee.HalZigbeeController"}
]
}

2
plugins/hal-zwave/src/se/hal/plugin/zwave/HalZWaveController.java
View file

@ -15,7 +15,7 @@ import java.util.logging.Logger;
*
* @author Ziver Koc
*/
public class HalZWaveController implements HalSensorController, HalEventController, HalAutoScannableController, NotificationWatcher {
public class HalZWaveController implements HalSensorController, HalEventController, HalAutostartController, NotificationWatcher {
private static final Logger logger = LogUtil.getLogger();
public static final String CONFIG_ZWAVE_PORT = "zwave.com_port";