Update (#2)

Added error to InfluxDB and store config file location in single file

src/main/java/com/github/zeekoe/bluebird/Const.java

@@ -0,0 +1,5 @@
+package com.github.zeekoe.bluebird;
+
+public class Const {
+ public static final String CONFIG_FILE_PATH = "/etc/bluebird.config";
+}

src/main/java/com/github/zeekoe/bluebird/heatpump/Auth.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.zeekoe.bluebird.heatpump.model.Token;
 import com.github.zeekoe.bluebird.infrastructure.MyHttpClient;
+import com.github.zeekoe.bluebird.Const;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -14,7 +15,7 @@ public class Auth {
  static {
  Properties properties = new Properties();
  try {
- properties.load(new FileInputStream("/etc/bluebird.config"));
+ properties.load(new FileInputStream(Const.CONFIG_FILE_PATH));
  USERNAME = properties.getProperty("bluebird.username");
  PASSWORD = properties.getProperty("bluebird.password");
  API_KEY = properties.getProperty("bluebird.apikey");

src/main/java/com/github/zeekoe/bluebird/heatpump/Heatpump.java

@@ -70,6 +70,7 @@ private void influx(HeatpumpLog heatpumpLog) {
  .addField("cm_mass_flow", heatpumpLog.getCm_mass_flow())
  .addField("ot_boiler_feed_temperature", heatpumpLog.getOt_boiler_feed_temperature())
  .addField("ot_boiler_return_temperature", heatpumpLog.getOt_boiler_return_temperature())
+ .addField("error", heatpumpLog.getError())
  .build();
  influx.writePoint(point);
  }

src/main/java/com/github/zeekoe/bluebird/heatpump/model/HeatpumpLog.java

@@ -10,6 +10,7 @@ public class HeatpumpLog {
  private LocalDateTime timestamp;
  private long unix_time_mcu;
  private int state;
+ private int error;
  private double t1;
  private double t2;
  private double fanPower;
@@ -61,6 +62,14 @@ public void setState(int state) {
  this.state = state;
  }
 
+ public int getError() {
+ return error;
+ }
+
+ public void setError(int error) {
+ this.error = error;
+ }
+
  public double getT1() {
  return t1;
  }
@@ -274,19 +283,20 @@ public boolean equals(Object o) {
  if (this == o) return true;
  if (o == null || getClass() != o.getClass()) return false;
  HeatpumpLog that = (HeatpumpLog) o;
- return state == that.state && Double.compare(t1, that.t1) == 0 && Double.compare(t2, that.t2) == 0 && Double.compare(fanPower, that.fanPower) == 0 && Double.compare(tCompressorIn, that.tCompressorIn) == 0 && Double.compare(tCompressorInTransient, that.tCompressorInTransient) == 0 && Double.compare(tCompressorOut, that.tCompressorOut) == 0 && Double.compare(tAirIn, that.tAirIn) == 0 && Double.compare(tAirOut, that.tAirOut) == 0 && Double.compare(tWaterIn, that.tWaterIn) == 0 && Double.compare(tWaterOut, that.tWaterOut) == 0 && Double.compare(t_compressor_out_transient, that.t_compressor_out_transient) == 0 && Double.compare(p_compressor_in, that.p_compressor_in) == 0 && Double.compare(p_compressor_out, that.p_compressor_out) == 0 && Double.compare(rpm, that.rpm) == 0 && Double.compare(fan, that.fan) == 0 && Double.compare(t_inverter, that.t_inverter) == 0 && Double.compare(compressor_power_low_accuracy, that.compressor_power_low_accuracy) == 0 && Double.compare(tRoom, that.tRoom) == 0 && Double.compare(tRoomTarget, that.tRoomTarget) == 0 && Double.compare(cmMassPowerIn, that.cmMassPowerIn) == 0 && Double.compare(cmMassPowerOut, that.cmMassPowerOut) == 0 && Double.compare(tWaterHouseIn, that.tWaterHouseIn) == 0 && Double.compare(cm_mass_flow, that.cm_mass_flow) == 0 && Double.compare(ot_boiler_feed_temperature, that.ot_boiler_feed_temperature) == 0 && Double.compare(ot_boiler_return_temperature, that.ot_boiler_return_temperature) == 0 && Objects.equals(timestamp, that.timestamp);
+ return state == that.state && error == that.error && Double.compare(t1, that.t1) == 0 && Double.compare(t2, that.t2) == 0 && Double.compare(fanPower, that.fanPower) == 0 && Double.compare(tCompressorIn, that.tCompressorIn) == 0 && Double.compare(tCompressorInTransient, that.tCompressorInTransient) == 0 && Double.compare(tCompressorOut, that.tCompressorOut) == 0 && Double.compare(tAirIn, that.tAirIn) == 0 && Double.compare(tAirOut, that.tAirOut) == 0 && Double.compare(tWaterIn, that.tWaterIn) == 0 && Double.compare(tWaterOut, that.tWaterOut) == 0 && Double.compare(t_compressor_out_transient, that.t_compressor_out_transient) == 0 && Double.compare(p_compressor_in, that.p_compressor_in) == 0 && Double.compare(p_compressor_out, that.p_compressor_out) == 0 && Double.compare(rpm, that.rpm) == 0 && Double.compare(fan, that.fan) == 0 && Double.compare(t_inverter, that.t_inverter) == 0 && Double.compare(compressor_power_low_accuracy, that.compressor_power_low_accuracy) == 0 && Double.compare(tRoom, that.tRoom) == 0 && Double.compare(tRoomTarget, that.tRoomTarget) == 0 && Double.compare(cmMassPowerIn, that.cmMassPowerIn) == 0 && Double.compare(cmMassPowerOut, that.cmMassPowerOut) == 0 && Double.compare(tWaterHouseIn, that.tWaterHouseIn) == 0 && Double.compare(cm_mass_flow, that.cm_mass_flow) == 0 && Double.compare(ot_boiler_feed_temperature, that.ot_boiler_feed_temperature) == 0 && Double.compare(ot_boiler_return_temperature, that.ot_boiler_return_temperature) == 0 && Objects.equals(timestamp, that.timestamp);
  }
 
  @Override
  public int hashCode() {
- return Objects.hash(timestamp, state, t1, t2, fanPower, tCompressorIn, tCompressorInTransient, tCompressorOut, tAirIn, tAirOut, tWaterIn, tWaterOut, t_compressor_out_transient, p_compressor_in, p_compressor_out, rpm, fan, t_inverter, compressor_power_low_accuracy, tRoom, tRoomTarget, cmMassPowerIn, cmMassPowerOut, tWaterHouseIn, cm_mass_flow, ot_boiler_feed_temperature, ot_boiler_return_temperature);
+ return Objects.hash(timestamp, state, error, t1, t2, fanPower, tCompressorIn, tCompressorInTransient, tCompressorOut, tAirIn, tAirOut, tWaterIn, tWaterOut, t_compressor_out_transient, p_compressor_in, p_compressor_out, rpm, fan, t_inverter, compressor_power_low_accuracy, tRoom, tRoomTarget, cmMassPowerIn, cmMassPowerOut, tWaterHouseIn, cm_mass_flow, ot_boiler_feed_temperature, ot_boiler_return_temperature);
  }
 
  @Override
  public String toString() {
  return "HeatpumpLog{" +
  "timestamp=" + timestamp +
  ", state=" + state +
+ ", error=" + error +
  ", t_1=" + t1 +
  ", t_2=" + t2 +
  ", fan_power=" + fanPower +

src/main/java/com/github/zeekoe/bluebird/influx/Influx.java

@@ -1,9 +1,10 @@
 package com.github.zeekoe.bluebird.influx;
 
+import com.github.zeekoe.bluebird.Const;
+
 import org.influxdb.InfluxDB;
 import org.influxdb.InfluxDBFactory;
 import org.influxdb.dto.Point;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
@@ -26,7 +27,7 @@ public void writePoint(Point point) {
  public Influx() {
  Properties properties = new Properties();
  try {
- properties.load(new FileInputStream("/etc/bluebird.config"));
+ properties.load(new FileInputStream(Const.CONFIG_FILE_PATH));
  } catch (IOException e) {
  e.printStackTrace();
  }