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

Updated test notifcation to a toast, added config button sleep time.

Browse Source
This commit is contained in:
Admin
2016-02-05 16:10:47 -06:00
parent d2e906caa3
commit 5d5b68209a
11 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ public class BridgeSettings {
private IpList harmonyaddress;
private String harmonyuser;
private String harmonypwd;
private Integer upnpresponsedevices;
private Integer buttonsleep;
private boolean upnpstrict;
private boolean traceupnp;
private boolean devmode;
@@ -67,12 +67,6 @@ public class BridgeSettings {
public void setHarmonyPwd(String harmonypwd) {
this.harmonypwd = harmonypwd;
}
public Integer getUpnpResponseDevices() {
return upnpresponsedevices;
}
public void setUpnpResponseDevices(Integer upnpresponsedevices) {
this.upnpresponsedevices = upnpresponsedevices;
}
public boolean isUpnpStrict() {
return upnpstrict;
}
@@ -109,6 +103,12 @@ public class BridgeSettings {
public void setNestConfigured(boolean isNestConfigured) {
this.nestconfigured = isNestConfigured;
}
public Integer getButtonsleep() {
return buttonsleep;
}
public void setButtonsleep(Integer buttonsleep) {
this.buttonsleep = buttonsleep;
}
public Boolean isValidVera() {
List<NamedIP> devicesList = this.veraaddress.getDevices();
if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))

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

@@ -11,4 +11,5 @@ public class Configuration {
public final static String DEFAULT_USER = "";
public final static String DEFAULT_PWD = "";
public final static String DFAULT_WEB_PORT = "8080";
public final static String DFAULT_BUTTON_SLEEP = "100";
}

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

@@ -120,7 +120,7 @@ public class HABridge {
bridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
bridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
bridgeSettings.setDevMode(Boolean.parseBoolean(System.getProperty("dev.mode", "false")));
bridgeSettings.setUpnpResponseDevices(Integer.parseInt(System.getProperty("upnp.response.devices", Configuration.UPNP_RESPONSE_DEVICES)));
bridgeSettings.setButtonsleep(Integer.parseInt(System.getProperty("button.sleep", Configuration.DFAULT_BUTTON_SLEEP)));
bridgeSettings.setNestuser(System.getProperty("nest.user", Configuration.DEFAULT_USER));
bridgeSettings.setNestpwd(System.getProperty("nest.pwd", Configuration.DEFAULT_PWD));

2
src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
View File

@@ -348,7 +348,7 @@ public class HueMulator {
else {
for(int i = 0; i < deviceButtons.length; i++) {
if( i > 0)
Thread.sleep(100);
Thread.sleep(bridgeSettings.getButtonsleep());
log.debug("pressing button: " + deviceButtons[i].getDevice() + " - " + deviceButtons[i].getButton() + " - iteration: " + String.valueOf(i));
myHarmony.pressButton(deviceButtons[i]);
}

2
src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java
View File

@@ -49,7 +49,7 @@ public class UpnpSettingsResource {
this.theSettings.setTraceupnp(theBridgeSettings.isTraceupnp());
this.theSettings.setUpnpConfigAddress(theBridgeSettings.getUpnpConfigAddress());
this.theSettings.setUpnpDeviceDb(theBridgeSettings.getUpnpDeviceDb());
this.theSettings.setUpnpResponseDevices(theBridgeSettings.getUpnpResponseDevices());
this.theSettings.setButtonsleep(theBridgeSettings.getButtonsleep());
this.theSettings.setUpnpResponsePort(theBridgeSettings.getUpnpResponsePort());
this.theSettings.setUpnpStrict(theBridgeSettings.isUpnpStrict());
this.theSettings.setVeraAddress(theBridgeSettings.getVeraAddress());