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

Update Fibaro and Fhem for small changes.

Browse Source
This commit is contained in:
bsamuels
2018-01-23 14:34:49 -06:00
parent 047a7de612
commit 47074ff60f
16 changed files with 259 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1218,7 +1218,7 @@ app.service ('bridgeService', function ($rootScope, $http, $base64, $location, n
content:"HABridge is re-initializing, waiting for completion..."});
setTimeout(function(){
self.checkForBridge();
}, 2000);
}, 5000);
},
function (error) {
if (error.status === 401)
@@ -1550,11 +1550,12 @@ app.controller ('SystemController', function ($scope, $location, bridgeService,
}
}
};
$scope.addFibarotoSettings = function (newfibaroname, newfibaroip, newfibaroport, newfibarousername, newfibaropassword) {
$scope.addFibarotoSettings = function (newfibaroname, newfibaroip, newfibaroport, newfibarousername, newfibaropassword, filters) {
if($scope.bridge.settings.fibaroaddress === undefined || $scope.bridge.settings.fibaroaddress === null) {
$scope.bridge.settings.fibaroaddress = { devices: [] };
}
var newFibaro = {name: newfibaroname, ip: newfibaroip, port: newfibaroport, username: newfibarousername, password: newfibaropassword }
var stringFilter = angular.toJson(filters);
var newFibaro = {name: newfibaroname, ip: newfibaroip, port: newfibaroport, username: newfibarousername, password: newfibaropassword, extensions: filters}
$scope.bridge.settings.fibaroaddress.devices.push(newFibaro);
$scope.newfibaroname = null;
$scope.newfibaroip = null;