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

fixed dim addition in bulk add

Browse Source 
modified savef button to be active always in bridge settings
This commit is contained in:
Admin
2016-07-12 16:26:53 -05:00
parent 6a5fae583f
commit 9d84e2a180
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId> <groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId> <artifactId>ha-bridge</artifactId>
<version>2.0.7-hal-i</version> <version>2.0.7-hal-j</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>

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

@@ -247,6 +247,7 @@ public class HueMulator implements HueErrorStringSet {
return "{}"; return "{}";
}); });
// http://ip_address:port/api/{userId}/lights returns json objects of all lights configured
get(HUE_CONTEXT + "/:userid/lights", "application/json", (request, response) -> { get(HUE_CONTEXT + "/:userid/lights", "application/json", (request, response) -> {
String userId = request.params(":userid"); String userId = request.params(":userid");
if(bridgeSettings.isTraceupnp()) if(bridgeSettings.isTraceupnp())

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

@@ -970,6 +970,7 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
deviceType: $scope.device.deviceType, deviceType: $scope.device.deviceType,
targetDevice: $scope.device.targetDevice, targetDevice: $scope.device.targetDevice,
onUrl: $scope.device.onUrl, onUrl: $scope.device.onUrl,
dimUrl: $scope.device.dimUrl,
offUrl: $scope.device.offUrl, offUrl: $scope.device.offUrl,
headers: $scope.device.headers, headers: $scope.device.headers,
httpVerb: $scope.device.httpVerb, httpVerb: $scope.device.httpVerb,
@@ -1302,6 +1303,7 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic
deviceType: $scope.device.deviceType, deviceType: $scope.device.deviceType,
targetDevice: $scope.device.targetDevice, targetDevice: $scope.device.targetDevice,
onUrl: $scope.device.onUrl, onUrl: $scope.device.onUrl,
dimUrl: $scope.device.dimUrl,
offUrl: $scope.device.offUrl, offUrl: $scope.device.offUrl,
headers: $scope.device.headers, headers: $scope.device.headers,
httpVerb: $scope.device.httpVerb, httpVerb: $scope.device.httpVerb,
@@ -1619,6 +1621,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
deviceType: $scope.device.deviceType, deviceType: $scope.device.deviceType,
targetDevice: $scope.device.targetDevice, targetDevice: $scope.device.targetDevice,
onUrl: $scope.device.onUrl, onUrl: $scope.device.onUrl,
dimUrl: $scope.device.dimUrl,
offUrl: $scope.device.offUrl, offUrl: $scope.device.offUrl,
headers: $scope.device.headers, headers: $scope.device.headers,
httpVerb: $scope.device.httpVerb, httpVerb: $scope.device.httpVerb,

2
src/main/resources/public/views/system.html
View File

@@ -40,7 +40,7 @@
</form> </form>
<form name="form"> <form name="form">
<p> <p>
<button ng-disabled="form.$pristine || bridge.isInControl" <button ng-disabled="bridge.isInControl"
class="btn btn-success" type="submit" ng-click="saveSettings()">Save</button> class="btn btn-success" type="submit" ng-click="saveSettings()">Save</button>
<button ng-disabled="bridge.isInControl" class="btn btn-warning" <button ng-disabled="bridge.isInControl" class="btn btn-warning"
type="submit" ng-click="bridgeReinit()">Bridge type="submit" ng-click="bridgeReinit()">Bridge