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

Renamed AbstractDevice to HalAbstractDevice and moved int intf package

Browse source
This commit is contained in:
Ziver Koc 2021-03-21 19:40:36 +01:00
parent 8d51526481
commit 7e8938c38c
17 changed files with 37 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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, HalAutoScannableController, 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-nutups/src/se/hal/plugin/nutups/NutUpsController.java
View file

@ -61,7 +61,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
public class NutUpsController implements HalSensorController, HalAutoScannableController, Runnable{
public class NutUpsController implements HalSensorController, HalAutoScannableController, Runnable {
public static Logger logger = LogUtil.getLogger();
private static final int SYNC_INTERVAL = 60 * 1000;

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

@ -4,7 +4,6 @@ import se.hal.intf.HalAbstractControllerManager;
import se.hal.plugin.nvr.intf.HalCameraConfig;
import se.hal.plugin.nvr.intf.HalCameraController;
import se.hal.plugin.nvr.struct.Camera;
import se.hal.struct.AbstractDevice;
import zutil.log.LogUtil;
import zutil.plugin.PluginManager;

4
plugins/hal-nvr/src/se/hal/plugin/nvr/struct/Camera.java
View file

@ -27,7 +27,7 @@ package se.hal.plugin.nvr.struct;
import se.hal.intf.HalAbstractController;
import se.hal.plugin.nvr.intf.HalCameraConfig;
import se.hal.plugin.nvr.intf.HalCameraData;
import se.hal.struct.AbstractDevice;
import se.hal.intf.HalAbstractDevice;
import zutil.db.DBConnection;
import zutil.db.bean.DBBean;
@ -35,7 +35,7 @@ import java.sql.SQLException;
import java.util.List;
public class Camera extends AbstractDevice<Camera, HalCameraConfig, HalCameraData> {
public class Camera extends HalAbstractDevice<Camera, HalCameraConfig, HalCameraData> {
public static List<Camera> getCameras(DBConnection db) throws SQLException{
return DBBean.load(db, Camera.class);

4
plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiController.java
View file

@ -16,7 +16,7 @@ public class RPiController implements HalSensorController {
private HalDeviceReportListener sensorListener;
public RPiController(){
}
@Override
@ -86,7 +86,7 @@ public class RPiController implements HalSensorController {
pinToSensorMap.remove(key);
}
}
public void sendDataReport(HalSensorConfig sensorConfig, HalSensorData sensorData){
if(sensorListener != null){
sensorListener.reportReceived(sensorConfig, sensorData);

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

@ -16,7 +16,7 @@ import com.zsmartsystems.zigbee.serialization.DefaultSerializer;
import com.zsmartsystems.zigbee.transport.*;
import se.hal.HalContext;
import se.hal.intf.*;
import se.hal.struct.AbstractDevice;
import se.hal.intf.HalAbstractDevice;
import zutil.log.LogUtil;
import java.util.List;
@ -40,7 +40,7 @@ public class HalZigbeeController implements HalSensorController, HalEventControl
protected ZigBeeNetworkManager networkManager;
private HalDeviceReportListener deviceListener;
private List<AbstractDevice> registeredDevices;
private List<HalAbstractDevice> registeredDevices;
public HalZigbeeController() {}

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

@ -3,7 +3,7 @@ package se.hal.plugin.zwave;
import org.zwave4j.*;
import se.hal.HalContext;
import se.hal.intf.*;
import se.hal.struct.AbstractDevice;
import se.hal.intf.HalAbstractDevice;
import zutil.log.LogUtil;
import java.util.List;
@ -16,7 +16,7 @@ import java.util.logging.Logger;
*
* @author Ziver Koc
*/
public class HalZWaveController implements HalSensorController, HalEventController, HalAutoScannableController, NotificationWatcher{
public class HalZWaveController implements HalSensorController, HalEventController, HalAutoScannableController, NotificationWatcher {
private static final Logger logger = LogUtil.getLogger();
public static final String CONFIG_ZWAVE_PORT = "zwave.com_port";
@ -30,7 +30,7 @@ public class HalZWaveController implements HalSensorController, HalEventControll
private HalDeviceReportListener sensorListener;
private HalDeviceReportListener deviceListener;
private List<AbstractDevice> registeredDevices;
private List<HalAbstractDevice> registeredDevices;
public HalZWaveController() {

7
plugins/hal-zwave/test/se/hal/plugin/zwave/HalZWaveControllerTest.java
View file

@ -1,17 +1,10 @@
package se.hal.plugin.zwave;
import org.zwave4j.*;
import se.hal.HalContext;
import se.hal.intf.*;
import se.hal.struct.AbstractDevice;
import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* @author zagumennikov