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

Small updates

Browse source
This commit is contained in:
Ziver Koc 2016-05-25 14:27:44 +02:00
parent c894ba8a61
commit 31ab57dec1
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/zutil/osal/app/linux/NutUPSClient.java
View file

@ -33,6 +33,7 @@ public class NutUPSClient {
private static final String PARAMETER_POWER_LOAD = "ups.load"; //ups.power
private static final String PARAMETER_POWER_USAGE = "ups.realpower"; //ups.power
private static final String PARAMETER_BATTERY_CHARGE = "battery.charge";
private static final String PARAMETER_BATTERY_VOLTAGE = "battery.voltage";
private static final String PARAMETER_POLL_INTERVAL = "driver.parameter.pollinterval";
@ -66,7 +67,7 @@ public class NutUPSClient {
protected synchronized void update(){
if(pollTimer.hasTimedOut()){
logger.fine("Starting UPS data refresh");
logger.fine("Starting UPS data refresh ("+host+":"+port+")");
try(Socket s = new Socket(host, port)) {
Writer out = new OutputStreamWriter(s.getOutputStream());
BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream()));
@ -162,6 +163,9 @@ public class NutUPSClient {
public int getBatteryCharge(){
return Integer.parseInt(parameters.get(PARAMETER_BATTERY_CHARGE));
}
public double getBatteryVoltage(){
return Double.parseDouble(parameters.get(PARAMETER_BATTERY_VOLTAGE));
}
}
}