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

Refactoring of of inheritance structure, ControllerManagers will now also be able to be provided through plugins

Browse source
This commit is contained in:
Ziver Koc 2021-03-16 22:24:43 +01:00
parent 28bc108921
commit c0188cd5cc
73 changed files with 1083 additions and 991 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,10 +49,7 @@
package se.hal.plugin.nutups;
import se.hal.HalContext;
import se.hal.intf.HalAutoScannableController;
import se.hal.intf.HalSensorController;
import se.hal.intf.HalSensorConfig;
import se.hal.intf.HalSensorReportListener;
import se.hal.intf.*;
import zutil.log.LogUtil;
import zutil.osal.linux.app.NutUPSClient;
@ -63,6 +60,7 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
public class NutUpsController implements HalSensorController, HalAutoScannableController, Runnable{
public static Logger logger = LogUtil.getLogger();
@ -73,7 +71,7 @@ public class NutUpsController implements HalSensorController, HalAutoScannableCo
private HashMap<String, NutUpsDevice> registeredDevices = new HashMap<>();
private NutUPSClient client;
private ScheduledExecutorService executor;
private HalSensorReportListener listener;
private HalDeviceReportListener listener;
@ -97,7 +95,7 @@ public class NutUpsController implements HalSensorController, HalAutoScannableCo
@Override
public void setListener(HalSensorReportListener listener) {
public void setListener(HalDeviceReportListener listener) {
this.listener = listener;
}
@ -126,16 +124,19 @@ public class NutUpsController implements HalSensorController, HalAutoScannableCo
@Override
public void register(HalSensorConfig sensor) {
registeredDevices.put(((NutUpsDevice) sensor).getUpsId(), (NutUpsDevice) sensor);
public void register(HalDeviceConfig deviceConfig) {
if (deviceConfig instanceof NutUpsDevice)
registeredDevices.put(((NutUpsDevice) deviceConfig).getUpsId(), (NutUpsDevice) deviceConfig);
}
@Override
public void deregister(HalSensorConfig sensor) {
registeredDevices.remove(((NutUpsDevice) sensor).getUpsId());
public void deregister(HalDeviceConfig deviceConfig) {
registeredDevices.remove(((NutUpsDevice) deviceConfig).getUpsId());
}
@Override
public int size() {
return 0;
return registeredDevices.size();
}
}

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

@ -102,11 +102,11 @@ public class NutUpsDevice implements HalSensorConfig{
return AggregationMethod.SUM;
}
@Override
public Class<? extends HalSensorController> getSensorControllerClass() {
public Class<? extends HalSensorController> getDeviceControllerClass() {
return NutUpsController.class;
}
@Override
public Class<? extends HalSensorData> getSensorDataClass() {
public Class<? extends HalSensorData> getDeviceDataClass() {
return PowerConsumptionSensorData.class;
}
}