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

Adding Harmony Hub Control directly into the Bridge. First iteration

Browse Source 
updates the ui harness. Also, updated settings in the configuration
page.
This commit is contained in:
Admin
2015-10-26 16:35:51 -05:00
parent c872f3543d
commit 295b1e1a30
15 changed files with 387 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/bwssystems/HABridge/BridgeSettings.java
View File

@@ -6,6 +6,9 @@ public class BridgeSettings {
private String upnpresponseport;
private String upnpdevicedb;
private String veraaddress;
private String harmonyaddress;
private String harmonyuser;
private String harmonypwd;
private boolean upnpstrict;
private boolean traceupnp;
private boolean vtwocompatibility;
@@ -41,6 +44,24 @@ public class BridgeSettings {
this.veraaddress = veraAddress;
}
public String getHarmonyAddress() {
return harmonyaddress;
}
public void setHarmonyAddress(String harmonyaddress) {
this.harmonyaddress = harmonyaddress;
}
public String getHarmonyUser() {
return harmonyuser;
}
public void setHarmonyUser(String harmonyuser) {
this.harmonyuser = harmonyuser;
}
public String getHarmonyPwd() {
return harmonypwd;
}
public void setHarmonyPwd(String harmonypwd) {
this.harmonypwd = harmonypwd;
}
public boolean isUpnpStrict() {
return upnpstrict;
}
@@ -66,4 +87,9 @@ public class BridgeSettings {
return false;
return true;
}
public Boolean isValidHarmony() {
if(this.harmonyaddress.contains(Configuration.DEFAULT_HARMONY_ADDRESS))
return false;
return true;
}
}

3
src/main/java/com/bwssystems/HABridge/Configuration.java
View File

@@ -4,5 +4,8 @@ public class Configuration {
public final static String DEVICE_DB_DIRECTORY = "data/device.db";
public final static String UPNP_RESPONSE_PORT = "50000";
public final static String DEFAULT_VERA_ADDRESS = "1.1.1.1";
public final static String DEFAULT_HARMONY_ADDRESS = "1.1.1.1";
public final static String DEFAULT_HARMONY_USER = "";
public final static String DEFAULT_HARMONY_PWD = "";
public final static String DFAULT_WEB_PORT = "8080";
}

5
src/main/java/com/bwssystems/HABridge/HABridge.java
View File

@@ -40,7 +40,7 @@ public class HABridge {
String addressString;
BridgeSettings bridgeSettings;
log.info("HA Bridge (v0.4.10) starting setup....");
log.info("HA Bridge (v1.0.0) starting setup....");
//get ip address for upnp requests
try {
address = InetAddress.getLocalHost();
@@ -55,6 +55,9 @@ public class HABridge {
bridgeSettings.setUpnpDeviceDb(System.getProperty("upnp.device.db", Configuration.DEVICE_DB_DIRECTORY));
bridgeSettings.setUpnpResponsePort(System.getProperty("upnp.response.port", Configuration.UPNP_RESPONSE_PORT));
bridgeSettings.setVeraAddress(System.getProperty("vera.address", Configuration.DEFAULT_VERA_ADDRESS));
bridgeSettings.setHarmonyAddress(System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS));
bridgeSettings.setHarmonyUser(System.getProperty("harmony.user", Configuration.DEFAULT_HARMONY_USER));
bridgeSettings.setHarmonyPwd(System.getProperty("harmony.pwd", Configuration.DEFAULT_HARMONY_PWD));
bridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
bridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
bridgeSettings.setVtwocompatibility(Boolean.parseBoolean(System.getProperty("vtwo.compatibility", "false")));

5
src/main/java/com/bwssystems/harmony/HarmonyActivities.java Normal file
View File

@@ -0,0 +1,5 @@
package com.bwssystems.harmony;
public class HarmonyActivities {
}