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

Fixed an introduced issue with the edit screen. Finished the press time

Browse Source 
implementation.
This commit is contained in:
Admin
2017-06-21 16:22:03 -05:00
parent 63ac729967
commit 3d4724ac57
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHandler.java
View File

@@ -94,7 +94,7 @@ public class HarmonyHandler {
} }
public Boolean pressButton(ButtonPress aDeviceButton) { public Boolean pressButton(ButtonPress aDeviceButton) {
log.debug("Harmony api press a button requested for device: " + aDeviceButton.getDevice() + " and a for button: " + aDeviceButton.getButton() + " for a hub: " + aDeviceButton.getHub() + " noop mode: " + noopCalls); log.debug("Harmony api press a button requested for device: " + aDeviceButton.getDevice() + " and a for button: " + aDeviceButton.getButton() + " with pressTime of: " + aDeviceButton.getPressTime() + " for a hub: " + aDeviceButton.getHub() + " noop mode: " + noopCalls);
if (aDeviceButton.isValid()) { if (aDeviceButton.isValid()) {
try { try {
if (noopCalls || devMode) { if (noopCalls || devMode) {

2
src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHome.java
View File

@@ -181,7 +181,7 @@ public class HarmonyHome implements Home {
aMultiUtil.setTheDelay(anItem.getDelay()); aMultiUtil.setTheDelay(anItem.getDelay());
else else
aMultiUtil.setTheDelay(aMultiUtil.getDelayDefault()); aMultiUtil.setTheDelay(aMultiUtil.getDelayDefault());
log.debug("pressing button: " + deviceButtons[z].getDevice() + " - " + deviceButtons[z].getButton() + " - iteration: " + String.valueOf(z) + " - count: " + String.valueOf(y)); log.debug("pressing button: " + deviceButtons[z].getDevice() + " - " + deviceButtons[z].getButton() + " with pressTime of: " + deviceButtons[z].getPressTime() + " - iteration: " + String.valueOf(z) + " - count: " + String.valueOf(y));
if(deviceButtons[z].getHub() == null || deviceButtons[z].getHub().isEmpty()) if(deviceButtons[z].getHub() == null || deviceButtons[z].getHub().isEmpty())
deviceButtons[z].setHub(device.getTargetDevice()); deviceButtons[z].setHub(device.getTargetDevice());
HarmonyHandler myHarmony = getHarmonyHandler(deviceButtons[z].getHub()); HarmonyHandler myHarmony = getHarmonyHandler(deviceButtons[z].getHub());

6
src/main/resources/public/scripts/app.js
View File

@@ -1936,12 +1936,12 @@ app.controller('HarmonyController', function ($scope, $location, bridgeService,
var postCmd = "\"}"; var postCmd = "\"}";
if(onpresstime !== undefined && onpresstime !== "0") if(onpresstime !== undefined && onpresstime !== "0")
postCmd = "\",\"pressTime\":" + onpresstime + "}"; postCmd = "\",\"pressTime\":" + onpresstime + "}";
onpayload = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOn.command + "\",\"hub\":\"" + harmonydevice.hub + "\"}"; onpayload = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOn.command + "\",\"hub\":\"" + harmonydevice.hub + postCmd;
if(offpresstime !== undefined && offpresstime !== "0") if(offpresstime !== undefined && offpresstime !== "0")
postCmd = "\",\"pressTime\":" + offpresstime + "}"; postCmd = "\",\"pressTime\":" + offpresstime + "}";
else else
postCmd = "\"}"; postCmd = "\"}";
offpayload = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOff.command + "\",\"hub\":\"" + harmonydevice.hub + "\"}"; offpayload = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOff.command + "\",\"hub\":\"" + harmonydevice.hub + postCmd;
bridgeService.buildUrls(onpayload, null, offpayload, true, actionOn.command, harmonydevice.device.label, harmonydevice.hub, "button", "harmonyButton", null, null); bridgeService.buildUrls(onpayload, null, offpayload, true, actionOn.command, harmonydevice.device.label, harmonydevice.hub, "button", "harmonyButton", null, null);
$scope.device = bridgeService.state.device; $scope.device = bridgeService.state.device;
@@ -3065,7 +3065,7 @@ app.controller('EditController', function ($scope, $location, bridgeService) {
$scope.onDevices = null; $scope.onDevices = null;
$scope.dimDevices = null; $scope.dimDevices = null;
$scope.offDevices = null; $scope.offDevices = null;
if ($scope.devicec && $scope.device.name !== undefined) { if ($scope.device !== undefined && $scope.device.name !== undefined) {
if($scope.bridge.device.onUrl !== undefined) if($scope.bridge.device.onUrl !== undefined)
$scope.onDevices = bridgeService.getCallObjects($scope.bridge.device.onUrl); $scope.onDevices = bridgeService.getCallObjects($scope.bridge.device.onUrl);
if($scope.bridge.device.dimUrl !== undefined) if($scope.bridge.device.dimUrl !== undefined)