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

Changed device listener to be a list instead of single listener

Browse source
This commit is contained in:
Ziver Koc 2021-06-25 22:26:02 +02:00
parent 8d9896f8b4
commit 53d471c0aa
24 changed files with 120 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,15 @@
package se.hal.plugin.raspberry;
import se.hal.intf.*;
import se.hal.plugin.raspberry.device.RPiPowerConsumptionSensor;
import se.hal.plugin.raspberry.device.RPiTemperatureSensor;
import se.hal.plugin.raspberry.hardware.RPiDS18B20;
import se.hal.plugin.raspberry.hardware.RPiInteruptPulseFlankCounter;
import zutil.log.LogUtil;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -13,34 +17,31 @@ public class RPiController implements HalSensorController {
private static final Logger logger = LogUtil.getLogger();
private HashMap<String, RPiSensor> pinToSensorMap = new HashMap<>();
private HalDeviceReportListener sensorListener;
private List<HalDeviceReportListener> deviceListeners = new CopyOnWriteArrayList<>();
public RPiController(){
}
public RPiController() {}
@Override
public void initialize() throws Exception {
}
public void initialize() {}
@Override
public void register(HalDeviceConfig deviceConfig) {
if (deviceConfig instanceof RPiPowerConsumptionSensor){
RPiPowerConsumptionSensor powerConsumptionSensor = (RPiPowerConsumptionSensor) deviceConfig;
int gpioPin = powerConsumptionSensor.getGpioPin();
if (!pinToSensorMap.containsKey("GPIO_"+gpioPin)){
if (!pinToSensorMap.containsKey("GPIO_" + gpioPin)){
RPiInteruptPulseFlankCounter impulseCounter = new RPiInteruptPulseFlankCounter(gpioPin, this);
pinToSensorMap.put("GPIO_"+gpioPin, impulseCounter);
pinToSensorMap.put("GPIO_" + gpioPin, impulseCounter);
} else {
logger.warning("Cannot create a RPiPowerConsumptionSensor on GPIO pin " + gpioPin + " since is already is in use by another sensor.");
}
} else if (deviceConfig instanceof RPiTemperatureSensor){
RPiTemperatureSensor temperatureSensor = (RPiTemperatureSensor) deviceConfig;
String w1Address = temperatureSensor.get1WAddress();
if (!pinToSensorMap.containsKey("W1_"+w1Address)){
if (!pinToSensorMap.containsKey("W1_" + w1Address)){
RPiDS18B20 ds12b20 = new RPiDS18B20(w1Address, this);
pinToSensorMap.put("W1_"+w1Address, ds12b20);
pinToSensorMap.put("W1_" + w1Address, ds12b20);
} else {
logger.warning("Cannot create a RPi1WireTemperatureSensor on 1-Wire address " + w1Address + " since is already is in use by another sensor.");
}
@ -53,13 +54,13 @@ public class RPiController implements HalSensorController {
public void deregister(HalDeviceConfig deviceConfig) {
if (deviceConfig instanceof RPiPowerConsumptionSensor){
RPiPowerConsumptionSensor powerConsumptionSensor = (RPiPowerConsumptionSensor) deviceConfig;
RPiSensor sensorToDeregister = pinToSensorMap.remove("GPIO_"+powerConsumptionSensor.getGpioPin());
RPiSensor sensorToDeregister = pinToSensorMap.remove("GPIO_" + powerConsumptionSensor.getGpioPin());
if (sensorToDeregister != null){
sensorToDeregister.close();
}
} else if (deviceConfig instanceof RPiTemperatureSensor){
RPiTemperatureSensor temperatureSensor = (RPiTemperatureSensor) deviceConfig;
RPiSensor sensorToDeregister = pinToSensorMap.remove("W1_"+temperatureSensor.get1WAddress());
RPiSensor sensorToDeregister = pinToSensorMap.remove("W1_" + temperatureSensor.get1WAddress());
if (sensorToDeregister != null){
sensorToDeregister.close();
}
@ -75,8 +76,8 @@ public class RPiController implements HalSensorController {
}
@Override
public void setListener(HalDeviceReportListener listener) {
sensorListener = listener;
public void addListener(HalDeviceReportListener listener) {
deviceListeners.add(listener);
}
@Override
@ -88,10 +89,8 @@ public class RPiController implements HalSensorController {
}
public void sendDataReport(HalSensorConfig sensorConfig, HalSensorData sensorData){
if (sensorListener != null){
sensorListener.reportReceived(sensorConfig, sensorData);
} else {
logger.log(Level.WARNING, "Could not report data. No registered listener");
for (HalDeviceReportListener deviceListener : deviceListeners) {
deviceListener.reportReceived(sensorConfig, sensorData);
}
}

3
plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/device/RPiPowerConsumptionSensor.java
View file

@ -1,8 +1,9 @@
package se.hal.plugin.raspberry;
package se.hal.plugin.raspberry.device;
import se.hal.intf.HalSensorConfig;
import se.hal.intf.HalSensorController;
import se.hal.intf.HalSensorData;
import se.hal.plugin.raspberry.RPiController;
import se.hal.struct.devicedata.PowerConsumptionSensorData;
import zutil.ui.conf.Configurator;

3
plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/device/RPiTemperatureSensor.java
View file

@ -1,8 +1,9 @@
package se.hal.plugin.raspberry;
package se.hal.plugin.raspberry.device;
import se.hal.intf.HalSensorConfig;
import se.hal.intf.HalSensorController;
import se.hal.intf.HalSensorData;
import se.hal.plugin.raspberry.RPiController;
import se.hal.struct.devicedata.TemperatureSensorData;
import zutil.ui.conf.Configurator;

5
plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
View file

@ -5,7 +5,7 @@ import com.pi4j.io.w1.W1Master;
import com.pi4j.temperature.TemperatureScale;
import se.hal.plugin.raspberry.RPiController;
import se.hal.plugin.raspberry.RPiSensor;
import se.hal.plugin.raspberry.RPiTemperatureSensor;
import se.hal.plugin.raspberry.device.RPiTemperatureSensor;
import se.hal.struct.devicedata.TemperatureSensorData;
import zutil.log.LogUtil;
@ -33,12 +33,11 @@ public class RPiDS18B20 implements RPiSensor, Runnable {
//print out all sensors found
for (TemperatureSensor device : w1Mater.getDevices(TemperatureSensor.class)) {
logger.info(String.format("1-Wire temperature sensor divice found: %-20s: %3.1f"+DEGREE_SIGN+"C\n", device.getName(), device.getTemperature(TemperatureScale.CELSIUS)));
logger.info(String.format("1-Wire temperature sensor device found: %-20s: %3.1f"+DEGREE_SIGN+"C\n", device.getName(), device.getTemperature(TemperatureScale.CELSIUS)));
}
//schedule job
scheduler.scheduleAtFixedRate(this, 10, 60, TimeUnit.SECONDS); //wait 10s and run every 60s
}
public void close() {

2
plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
View file

@ -5,7 +5,7 @@ import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;
import com.pi4j.io.gpio.event.GpioPinListenerDigital;
import com.pi4j.wiringpi.GpioUtil;
import se.hal.plugin.raspberry.RPiController;
import se.hal.plugin.raspberry.RPiPowerConsumptionSensor;
import se.hal.plugin.raspberry.device.RPiPowerConsumptionSensor;
import se.hal.plugin.raspberry.RPiSensor;
import se.hal.plugin.raspberry.RPiUtility;
import se.hal.struct.devicedata.PowerConsumptionSensorData;

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

@ -2,7 +2,7 @@
"version": 1.0,
"name": "Hal-RaspberryPi Sensors",
"interfaces": [
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiTemperatureSensor"}
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.device.RPiPowerConsumptionSensor"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.device.RPiTemperatureSensor"}
]
}