diff --git a/src/main/java/de/hottis/mbusMaster/FinderThreePhasePowerMeter.java b/src/main/java/de/hottis/mbusMaster/FinderThreePhasePowerMeter.java index e0c1065..8076e7d 100644 --- a/src/main/java/de/hottis/mbusMaster/FinderThreePhasePowerMeter.java +++ b/src/main/java/de/hottis/mbusMaster/FinderThreePhasePowerMeter.java @@ -16,8 +16,8 @@ public class FinderThreePhasePowerMeter extends MbusDevice { this.dataPoints.add(new DataPoint("current3", 13)); this.dataPoints.add(new DataPoint("activePower3", 14)); this.dataPoints.add(new DataPoint("reactivePower3", 15)); - this.dataPoints.add(new DataPoint("activePowerTotal", 16)); - this.dataPoints.add(new DataPoint("reactivePowerTotal", 17)); + this.dataPoints.add(new DataPoint("activePowerTotal", 17)); + this.dataPoints.add(new DataPoint("reactivePowerTotal", 18)); } public ADataObject getDataObject() throws MbusException { diff --git a/src/main/java/de/hottis/mbusMaster/MbusScheduledQuerier.java b/src/main/java/de/hottis/mbusMaster/MbusScheduledQuerier.java index 513463a..d8b2194 100644 --- a/src/main/java/de/hottis/mbusMaster/MbusScheduledQuerier.java +++ b/src/main/java/de/hottis/mbusMaster/MbusScheduledQuerier.java @@ -66,8 +66,8 @@ public class MbusScheduledQuerier extends Thread { logger.error("Error " + e.toString() + " in Meterbus dialog for device " + device.shortString()); } } - logger.info("Cnt: " + cnt + ", SuccessCnt: " + successCnt + ", ErrCnt: " + errCnt); - this.queue.add(new MbusStatisticsDataObject("MbusgwChild", cnt, errCnt, successCnt)); + logger.info("CycleCnt: " + cnt + ", SuccessCnt: " + successCnt + ", ErrCnt: " + errCnt); + this.queue.add(new MbusStatisticsDataObject("MbusgwChild", errCnt, successCnt)); try { Thread.sleep(5*1000); } catch (InterruptedException e) { diff --git a/src/main/java/de/hottis/mbusMaster/MbusStatisticsDataObject.java b/src/main/java/de/hottis/mbusMaster/MbusStatisticsDataObject.java index 6ed4bde..e110e8d 100644 --- a/src/main/java/de/hottis/mbusMaster/MbusStatisticsDataObject.java +++ b/src/main/java/de/hottis/mbusMaster/MbusStatisticsDataObject.java @@ -4,16 +4,14 @@ import java.util.HashMap; public class MbusStatisticsDataObject extends ADataObject { private static final long serialVersionUID = 1L; - static final String TOTAL_CNT_KEY = "total"; static final String ERROR_CNT_KEY = "error"; static final String SUCCESS_CNT_KEY = "success"; static final String TABLE_NAME = "Statistics"; static final String KIND_NAME = "Statistics"; - public MbusStatisticsDataObject(String name, int total, int error, int success) { + public MbusStatisticsDataObject(String name, int error, int success) { super(name, KIND_NAME); HashMap values = new HashMap(); - values.put(TOTAL_CNT_KEY, total); values.put(ERROR_CNT_KEY, error); values.put(SUCCESS_CNT_KEY, success); setValues(values);