diff --git a/README.md b/README.md index 6a30117..5d0892a 100644 --- a/README.md +++ b/README.md @@ -63,22 +63,22 @@ ATTENTION: This requires JDK 1.8 to run ATTENTION: Due to port 80 being the default, Linux restricts this to super user. Use the instructions below. ``` -java -jar ha-bridge-5.2.0.jar +java -jar ha-bridge-5.2.1.jar ``` ATTENTION: If running Java9, you will need to add the xml bind module ``` -java -jar --add-modules java.xml.bind ha-bridge-5.2.0.jar +java -jar --add-modules java.xml.bind ha-bridge-5.2.1.jar ``` ### Automation on Linux systems To have this configured and running automatically there are a few resources to use. One is using Docker and a docker container has been built for this and can be gotten here: https://github.com/aptalca/docker-ha-bridge -Create the directory and make sure that ha-bridge-5.2.0.jar is in your /home/pi/habridge directory. +Create the directory and make sure that ha-bridge-5.2.1.jar is in your /home/pi/habridge directory. ``` pi@raspberrypi:~ $ mkdir habridge pi@raspberrypi:~ $ cd habridge -pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v5.2.0/ha-bridge-5.2.0.jar +pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v5.2.1/ha-bridge-5.2.1.jar ``` #### System Control Setup on a pi (preferred) @@ -99,7 +99,7 @@ After=network.target [Service] Type=simple WorkingDirectory=/home/pi/habridge -ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-5.2.0.jar +ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-5.2.1.jar [Install] WantedBy=multi-user.target @@ -134,7 +134,7 @@ Then cut and past this, modify any locations that are not correct ``` cd /home/pi/habridge rm /home/pi/habridge/habridge-log.txt -nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-5.2.0.jar > /home/pi/habridge/habridge-log.txt 2>&1 & +nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-5.2.1.jar > /home/pi/habridge/habridge-log.txt 2>&1 & chmod 777 /home/pi/habridge/habridge-log.txt ``` diff --git a/pom.xml b/pom.xml index a45ebfd..5395a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.bwssystems.HABridge ha-bridge - 5.2.0 + 5.2.0a jar HA Bridge diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js index 0915f74..910c5be 100644 --- a/src/main/resources/public/scripts/app.js +++ b/src/main/resources/public/scripts/app.js @@ -3984,7 +3984,7 @@ app.controller('FhemController', function ($scope, $location, bridgeService, ngD $scope.clearDevice(); for(var i = 0; i < $scope.bulk.devices.length; i++) { for(var x = 0; x < bridgeService.state.fhemdevices.length; x++) { - if(bridgeService.state.fhemdevices[x].devicename === $scope.bulk.devices[i]) { + if(bridgeService.state.fhemdevices[x].item.Name === $scope.bulk.devices[i]) { $scope.buildDeviceUrls(bridgeService.state.fhemdevices[x],dim_control,true); devicesList[i] = { name: $scope.device.name, @@ -4047,7 +4047,7 @@ app.controller('FhemController', function ($scope, $location, bridgeService, ngD $scope.selectAll = true; for(var x = 0; x < bridgeService.state.fhemdevices.length; x++) { if($scope.bulk.devices.indexOf(bridgeService.state.fhemdevices[x]) < 0) - $scope.bulk.devices.push(bridgeService.state.fhemdevices[x].devicename); + $scope.bulk.devices.push(bridgeService.state.fhemdevices[x].item.Name); } } }; diff --git a/src/main/resources/public/views/fhemdevice.html b/src/main/resources/public/views/fhemdevice.html index 84fe1ae..9e7d8f0 100644 --- a/src/main/resources/public/views/fhemdevice.html +++ b/src/main/resources/public/views/fhemdevice.html @@ -70,9 +70,9 @@ {{$index+1}} + value="{{fhemdevice.item.Name}}" + ng-checked="bulk.devices.indexOf(fhemdevice.item.Name) > -1" + ng-click="toggleSelection(fhemdevice.item.Name)"> {{fhemdevice.item.Name}} {{fhemdevice.name}} {{fhemdevice.item.PossibleSets}}