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

Finished MQTT support and some testing. Updated harmony-java-client to

Browse Source 
v1.1.1 to fix authentication error.
This commit is contained in:
Admin
2016-11-18 15:14:58 -06:00
parent 68f38e1d95
commit 08166c0ebf
9 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -797,11 +797,13 @@ public class HueMulator implements HueErrorStringSet {
else
setCount = 1;
for(int x = 0; x < setCount; x++) {
if( x > 0) {
if( x > 0 || i > 0) {
Thread.sleep(theDelay);
}
if(deviceButtons[i].getDelay() != null &&deviceButtons[i].getDelay() > 0)
if(deviceButtons[i].getDelay() != null && deviceButtons[i].getDelay() > 0)
theDelay = deviceButtons[i].getDelay();
else
theDelay = bridgeSettings.getButtonsleep();
log.debug("pressing button: " + deviceButtons[i].getDevice() + " - " + deviceButtons[i].getButton() + " - iteration: " + String.valueOf(i) + " - count: " + String.valueOf(x));
myHarmony.pressButton(deviceButtons[i]);
}
@@ -883,11 +885,13 @@ public class HueMulator implements HueErrorStringSet {
else
setCount = 1;
for(int x = 0; x < setCount; x++) {
if( x > 0) {
if( x > 0 || i > 0) {
Thread.sleep(theDelay);
}
if(mqttMessages[i].getDelay() != null &&mqttMessages[i].getDelay() > 0)
theDelay = mqttMessages[i].getDelay();
else
theDelay = bridgeSettings.getButtonsleep();
log.debug("publishing message: " + mqttMessages[i].getClientId() + " - " + mqttMessages[i].getTopic() + " - " + mqttMessages[i].getMessage() + " - iteration: " + String.valueOf(i) + " - count: " + String.valueOf(x));
mqttHandler.publishMessage(mqttMessages[i].getTopic(), mqttMessages[i].getMessage());
}
@@ -915,11 +919,13 @@ public class HueMulator implements HueErrorStringSet {
else
setCount = 1;
for(int x = 0; x < setCount; x++) {
if( x > 0) {
if( x > 0 || i > 0) {
Thread.sleep(theDelay);
}
if(callItems[i].getDelay() != null && callItems[i].getDelay() > 0)
theDelay = callItems[i].getDelay();
else
theDelay = bridgeSettings.getButtonsleep();
String intermediate;
if(callItems[i].getItem().contains("exec://"))
intermediate = callItems[i].getItem().substring(callItems[i].getItem().indexOf("://") + 3);
@@ -950,11 +956,13 @@ public class HueMulator implements HueErrorStringSet {
else
setCount = 1;
for(int x = 0; x < setCount; x++) {
if( x > 0) {
if( x > 0 || i > 0) {
Thread.sleep(theDelay);
}
if(callItems[i].getDelay() != null && callItems[i].getDelay() > 0)
theDelay = callItems[i].getDelay();
else
theDelay = bridgeSettings.getButtonsleep();
try {
if(callItems[i].getItem().contains("udp://") || callItems[i].getItem().contains("tcp://")) {
String intermediate = callItems[i].getItem().substring(callItems[i].getItem().indexOf("://") + 3);