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

Fixed RC test issues for:

Browse Source 
FHEM device decode
on for first dim
default OpoenHab Port
Fibaro request debugging enhancement
This commit is contained in:
bsamuels
2018-01-12 15:44:10 -06:00
parent b2a30f5771
commit 37b381085c
7 changed files with 166 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1166,7 +1166,24 @@ public class HueMulator {
isOnRequest = true;
}
if(isOnRequest || (isDimRequest && device.isOnFirstDim() && !device.getDeviceState().isOn())) {
if(device.isOnFirstDim() && isDimRequest && !device.getDeviceState().isOn()) {
isOnRequest = true;
isDimRequest = false;
isColorRequest = false;
} else if(device.isOnFirstDim() && isDimRequest && device.getDeviceState().isOn()) {
if(device.getDeviceState().getBri() == theStateChanges.getBri()) {
isOnRequest = true;
isDimRequest = false;
isColorRequest = false;
} else {
isOnRequest = false;
isDimRequest = true;
isColorRequest = false;
}
}
if(isOnRequest) {
log.debug("Calling on-off as requested.");
if (theStateChanges.isOn()) {
url = device.getOnUrl();
} else if (!theStateChanges.isOn()) {
@@ -1191,6 +1208,7 @@ public class HueMulator {
}
if (isDimRequest && !previousError) {
log.debug("Calling dim as requested.");
if(!device.isOnFirstDim() )
url = device.getDimUrl();
@@ -1222,6 +1240,7 @@ public class HueMulator {
}
if (isColorRequest && !previousError) {
log.debug("Calling color as requested.");
url = device.getColorUrl();
// code for backwards compatibility
if(device.getMapType() != null && device.getMapType().equalsIgnoreCase(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) {
@@ -1248,7 +1267,6 @@ public class HueMulator {
}
if (responseString == null || !responseString.contains("[{\"error\":")) {
log.debug("Response is in error: " + ((responseString == null) ? "null" : responseString));
if(!device.isNoState()) {
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, state, targetBri, targetBriInc, device.isOffState());
device.setDeviceState(state);
@@ -1257,6 +1275,7 @@ public class HueMulator {
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, dummyState, targetBri, targetBriInc, device.isOffState());
}
}
return responseString;
}