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

Moved raspberry pi plugin into its own plugin folder

Browse source
This commit is contained in:
Ziver Koc 2017-08-29 15:46:29 +02:00
parent 26ed8584c8
commit eab6c72800
21 changed files with 471 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Hal.iml
View file

@ -9,7 +9,9 @@
<sourceFolder url="file://$MODULE_DIR$/plugins/zwave/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/tellstick/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/plugins/tellstick/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/plugins/raspberry/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/raspberry/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/tellstick/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/zwave/build" />
</content>
@ -49,6 +51,16 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lib Raspberry">
<CLASSES>
<root url="file://$MODULE_DIR$/plugins/raspberry/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/plugins/raspberry/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="JUnit4">
<CLASSES>

23
plugins/raspberry/build.xml Executable file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RaspberryPi Plugin" >
<!-- ________________________ PROPERTIES AND SETTINGS ________________________ -->
<!--common properties-->
<property name="root" value="." />
<property name="srcDir" value="${root}/src" />
<property name="testDir" value="${root}/test" />
<property name="libDir" value="${root}/lib" />
<property name="buildRoot" value="${root}/build" />
<property name="compileDir" value="${buildRoot}/production" />
<property name="compileTestDir" value="${buildRoot}/test" />
<property name="releaseDir" value="${buildRoot}/release" />
<property name="releaseJar" value="raspberry.jar" />
<property name="reportsDir" value="../../${buildRoot}/reports" /> <!-- Use Hal reports folder -->
<!-- ________________________ TARGETS ________________________ -->
<import file="../../build_plugin.xml"/>
</project>

0
lib/pi4j-core-1.1.jar → plugins/raspberry/lib/pi4j-core-1.1.jar
View file

0
lib/pi4j-device-1.1.jar → plugins/raspberry/lib/pi4j-device-1.1.jar
View file

0
lib/pi4j-gpio-extension-1.1.jar → plugins/raspberry/lib/pi4j-gpio-extension-1.1.jar
View file

0
lib/pi4j-service-1.1.jar → plugins/raspberry/lib/pi4j-service-1.1.jar
View file

0
lib/pi4j.LICENSE.txt → plugins/raspberry/lib/pi4j.LICENSE.txt
View file

0
lib/pi4j.NOTICE.txt → plugins/raspberry/lib/pi4j.NOTICE.txt
View file

98
plugins/raspberry/src/se/hal/plugin/raspberry/RPiController.java Executable file
View file

@ -0,0 +1,98 @@
package se.hal.plugin.raspberry;
import se.hal.intf.*;
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.logging.Level;
import java.util.logging.Logger;
public class RPiController implements HalSensorController {
private static final Logger logger = LogUtil.getLogger();
private HashMap<String, RPiSensor> pinToSensorMap = new HashMap<>();
private HalSensorReportListener sensorListener;
public RPiController(){
}
@Override
public void initialize() throws Exception {
}
@Override
public void register(HalSensorConfig sensor) {
if(sensor instanceof RPiPowerConsumptionSensor){
RPiPowerConsumptionSensor powerConsumptionSensor = (RPiPowerConsumptionSensor) sensor;
int gpioPin = powerConsumptionSensor.getGpioPin();
if(!pinToSensorMap.containsKey("GPIO_"+gpioPin)){
RPiInteruptPulseFlankCounter impulseCounter = new RPiInteruptPulseFlankCounter(gpioPin, this);
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(sensor instanceof RPiTemperatureSensor){
RPiTemperatureSensor temperatureSensor = (RPiTemperatureSensor) sensor;
String w1Address = temperatureSensor.get1WAddress();
if(!pinToSensorMap.containsKey("W1_"+w1Address)){
RPiDS18B20 ds12b20 = new RPiDS18B20(w1Address, this);
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.");
}
}else{
logger.warning("Cannot register a non-supported sensor");
}
}
@Override
public void deregister(HalSensorConfig sensor) {
if(sensor instanceof RPiPowerConsumptionSensor){
RPiPowerConsumptionSensor powerConsumprtionSensor = (RPiPowerConsumptionSensor) sensor;
RPiSensor sensorToDeregister = pinToSensorMap.remove("GPIO_"+powerConsumprtionSensor.getGpioPin());
if(sensorToDeregister != null){
sensorToDeregister.close();
}
} else if(sensor instanceof RPiTemperatureSensor){
RPiTemperatureSensor temperatureSensor = (RPiTemperatureSensor) sensor;
RPiSensor sensorToDeregister = pinToSensorMap.remove("W1_"+temperatureSensor.get1WAddress());
if(sensorToDeregister != null){
sensorToDeregister.close();
}
}else{
logger.warning("Cannot deregister a non-supported sensor");
return;
}
}
@Override
public int size() {
return pinToSensorMap.size();
}
@Override
public void setListener(HalSensorReportListener listener) {
sensorListener = listener;
}
@Override
public void close() {
for(String key : this.pinToSensorMap.keySet()){
pinToSensorMap.get(key).close();
pinToSensorMap.remove(key);
}
}
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");
}
}
}

0
src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java → plugins/raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java
View file

0
src/se/hal/plugin/raspberry/RPiSensor.java → plugins/raspberry/src/se/hal/plugin/raspberry/RPiSensor.java Normal file → Executable file
View file

0
src/se/hal/plugin/raspberry/RPiTemperatureSensor.java → plugins/raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java
View file

75
plugins/raspberry/src/se/hal/plugin/raspberry/RPiUtility.java Executable file
View file

@ -0,0 +1,75 @@
package se.hal.plugin.raspberry;
import com.pi4j.io.gpio.Pin;
import com.pi4j.io.gpio.RaspiPin;
public class RPiUtility {
public static Pin getPin(int gpioPin){
switch(gpioPin){
case 0:
return RaspiPin.GPIO_00;
case 1:
return RaspiPin.GPIO_01;
case 2:
return RaspiPin.GPIO_02;
case 3:
return RaspiPin.GPIO_03;
case 4:
return RaspiPin.GPIO_04;
case 5:
return RaspiPin.GPIO_05;
case 6:
return RaspiPin.GPIO_06;
case 7:
//used by 1-wire divices
case 8:
//used by I2C devices
case 9:
//used by I2C devices
case 10:
//used by SPI devices
case 11:
//used by SPI devices
case 12:
//used by SPI devices
case 13:
//used by SPI devices
case 14:
//used by SPI devices
case 15:
//used by Serial devices
case 16:
//used by Serial devices
case 17:
//reserved for future use
case 18:
//reserved for future use
case 19:
//reserved for future use
case 20:
//reserved for future use
case 21:
//reserved for future use
case 22:
//reserved for future use
case 23:
//reserved for future use
case 24:
//reserved for future use
case 25:
//reserved for future use
case 26:
//reserved for future use
case 27:
//reserved for future use
case 28:
//reserved for future use
case 29:
//reserved for future use
default:
return null;
}
}
}

68
plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java Executable file
View file

@ -0,0 +1,68 @@
package se.hal.plugin.raspberry.hardware;
import com.pi4j.component.temperature.TemperatureSensor;
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.struct.devicedata.TemperatureSensorData;
import zutil.log.LogUtil;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
public class RPiDS18B20 implements RPiSensor, Runnable {
private static final Logger logger = LogUtil.getLogger();
private final String DEGREE_SIGN = "\u00b0";
private RPiController controller;
private String w1Address;
private ScheduledExecutorService scheduler;
private W1Master w1Mater;
public RPiDS18B20(String w1Address, RPiController controller){
this.controller = controller;
this.w1Address = w1Address;
scheduler = Executors.newScheduledThreadPool(1);
w1Mater = new W1Master();
//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)));
}
//schedule job
scheduler.scheduleAtFixedRate(this, 10, 60, TimeUnit.SECONDS); //wait 10s and run every 60s
}
public void close() {
scheduler.shutdown();
try {
scheduler.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
//noop
}
}
@Override
public void run() {
for(TemperatureSensor device : w1Mater.getDevices(TemperatureSensor.class)){
if(device.getName().equals(w1Address)){
controller.sendDataReport(
new RPiTemperatureSensor(w1Address),
new TemperatureSensorData(
device.getTemperature(TemperatureScale.CELSIUS),
System.currentTimeMillis()
));
break;
}
}
}
}

0
src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java → plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
View file

8
plugins/raspberry/src/se/hal/plugin/raspberry/plugin.json Executable file
View file

@ -0,0 +1,8 @@
{
"version": 1.1,
"name": "Raspberry Pi Sensors",
"interfaces": [
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiTemperatureSensor"}
]
}

98
src/se/hal/plugin/raspberry/RPiController.java
View file

@ -1,98 +0,0 @@
package se.hal.plugin.raspberry;
import se.hal.intf.*;
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.logging.Level;
import java.util.logging.Logger;
public class RPiController implements HalSensorController {
private static final Logger logger = LogUtil.getLogger();
private HashMap<String, RPiSensor> pinToSensorMap = new HashMap<>();
private HalSensorReportListener sensorListener;
public RPiController(){
}
@Override
public void initialize() throws Exception {
}
@Override
public void register(HalSensorConfig sensor) {
if(sensor instanceof RPiPowerConsumptionSensor){
RPiPowerConsumptionSensor powerConsumptionSensor = (RPiPowerConsumptionSensor) sensor;
int gpioPin = powerConsumptionSensor.getGpioPin();
if(!pinToSensorMap.containsKey("GPIO_"+gpioPin)){
RPiInteruptPulseFlankCounter impulseCounter = new RPiInteruptPulseFlankCounter(gpioPin, this);
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(sensor instanceof RPiTemperatureSensor){
RPiTemperatureSensor temperatureSensor = (RPiTemperatureSensor) sensor;
String w1Address = temperatureSensor.get1WAddress();
if(!pinToSensorMap.containsKey("W1_"+w1Address)){
RPiDS18B20 ds12b20 = new RPiDS18B20(w1Address, this);
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.");
}
}else{
logger.warning("Cannot register a non-supported sensor");
}
}
@Override
public void deregister(HalSensorConfig sensor) {
if(sensor instanceof RPiPowerConsumptionSensor){
RPiPowerConsumptionSensor powerConsumprtionSensor = (RPiPowerConsumptionSensor) sensor;
RPiSensor sensorToDeregister = pinToSensorMap.remove("GPIO_"+powerConsumprtionSensor.getGpioPin());
if(sensorToDeregister != null){
sensorToDeregister.close();
}
} else if(sensor instanceof RPiTemperatureSensor){
RPiTemperatureSensor temperatureSensor = (RPiTemperatureSensor) sensor;
RPiSensor sensorToDeregister = pinToSensorMap.remove("W1_"+temperatureSensor.get1WAddress());
if(sensorToDeregister != null){
sensorToDeregister.close();
}
}else{
logger.warning("Cannot deregister a non-supported sensor");
return;
}
}
@Override
public int size() {
return pinToSensorMap.size();
}
@Override
public void setListener(HalSensorReportListener listener) {
sensorListener = listener;
}
@Override
public void close() {
for(String key : this.pinToSensorMap.keySet()){
pinToSensorMap.get(key).close();
pinToSensorMap.remove(key);
}
}
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");
}
}
}

75
src/se/hal/plugin/raspberry/RPiUtility.java
View file

@ -1,75 +0,0 @@
package se.hal.plugin.raspberry;
import com.pi4j.io.gpio.Pin;
import com.pi4j.io.gpio.RaspiPin;
public class RPiUtility {
public static Pin getPin(int gpioPin){
switch(gpioPin){
case 0:
return RaspiPin.GPIO_00;
case 1:
return RaspiPin.GPIO_01;
case 2:
return RaspiPin.GPIO_02;
case 3:
return RaspiPin.GPIO_03;
case 4:
return RaspiPin.GPIO_04;
case 5:
return RaspiPin.GPIO_05;
case 6:
return RaspiPin.GPIO_06;
case 7:
//used by 1-wire divices
case 8:
//used by I2C devices
case 9:
//used by I2C devices
case 10:
//used by SPI devices
case 11:
//used by SPI devices
case 12:
//used by SPI devices
case 13:
//used by SPI devices
case 14:
//used by SPI devices
case 15:
//used by Serial devices
case 16:
//used by Serial devices
case 17:
//reserved for future use
case 18:
//reserved for future use
case 19:
//reserved for future use
case 20:
//reserved for future use
case 21:
//reserved for future use
case 22:
//reserved for future use
case 23:
//reserved for future use
case 24:
//reserved for future use
case 25:
//reserved for future use
case 26:
//reserved for future use
case 27:
//reserved for future use
case 28:
//reserved for future use
case 29:
//reserved for future use
default:
return null;
}
}
}

68
src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
View file

@ -1,68 +0,0 @@
package se.hal.plugin.raspberry.hardware;
import com.pi4j.component.temperature.TemperatureSensor;
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.struct.devicedata.TemperatureSensorData;
import zutil.log.LogUtil;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
public class RPiDS18B20 implements RPiSensor, Runnable {
private static final Logger logger = LogUtil.getLogger();
private final String DEGREE_SIGN = "\u00b0";
private RPiController controller;
private String w1Address;
private ScheduledExecutorService scheduler;
private W1Master w1Mater;
public RPiDS18B20(String w1Address, RPiController controller){
this.controller = controller;
this.w1Address = w1Address;
scheduler = Executors.newScheduledThreadPool(1);
w1Mater = new W1Master();
//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)));
}
//schedule job
scheduler.scheduleAtFixedRate(this, 10, 60, TimeUnit.SECONDS); //wait 10s and run every 60s
}
public void close() {
scheduler.shutdown();
try {
scheduler.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
//noop
}
}
@Override
public void run() {
for(TemperatureSensor device : w1Mater.getDevices(TemperatureSensor.class)){
if(device.getName().equals(w1Address)){
controller.sendDataReport(
new RPiTemperatureSensor(w1Address),
new TemperatureSensorData(
device.getTemperature(TemperatureScale.CELSIUS),
System.currentTimeMillis()
));
break;
}
}
}
}

8
src/se/hal/plugin/raspberry/plugin.json
View file

@ -1,8 +0,0 @@
{
"version": 1.1,
"name": "Raspberry Pi Sensors",
"interfaces": [
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"},
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiTemperatureSensor"}
]
}