mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-19 00:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated with fixes for FHEM

Browse Source
This commit is contained in:
bsamuels
2018-01-16 16:18:53 -06:00
parent 27f77b9caa
commit 4b048c2a7f
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java
View File

@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Map;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.bwssystems.HABridge.api.NameValue;
//import com.bwssystems.HABridge.api.NameValue;
import com.bwssystems.HABridge.api.hue.HueConstants;
import com.bwssystems.HABridge.api.hue.WhitelistEntry;
@@ -108,9 +108,9 @@ public class BridgeSettingsDescriptor {
@SerializedName("fhemaddress")
@Expose
private IpList fhemaddress;
@SerializedName("activeloggers")
@Expose
private List<NameValue> activeloggers;
// @SerializedName("activeloggers")
// @Expose
// private List<NameValue> activeloggers;
private boolean settingsChanged;
private boolean veraconfigured;
@@ -158,7 +158,7 @@ public class BridgeSettingsDescriptor {
this.webaddress = "0.0.0.0";
this.hubversion = HueConstants.HUB_VERSION;
this.hubmac = null;
this.activeloggers = null;
// this.activeloggers = null;
this.upnpsenddelay = 1500;
}
public String getUpnpConfigAddress() {
@@ -467,12 +467,12 @@ public class BridgeSettingsDescriptor {
public void setFhemconfigured(boolean fhemconfigured) {
this.fhemconfigured = fhemconfigured;
}
public List<NameValue> getActiveloggers() {
return activeloggers;
}
public void setActiveloggers(List<NameValue> activeloggers) {
this.activeloggers = activeloggers;
}
// public List<NameValue> getActiveloggers() {
// return activeloggers;
// }
// public void setActiveloggers(List<NameValue> activeloggers) {
// this.activeloggers = activeloggers;
// }
public Boolean isValidVera() {
if(this.getVeraAddress() == null || this.getVeraAddress().getDevices().size() <= 0)
return false;