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

Start bug fixing, update FHEM bulk add issue

Browse Source
This commit is contained in:
bsamuels
2018-03-09 09:18:23 -06:00
parent 5c1f1f5b96
commit 3b22e3f711
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -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. 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 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 ### 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 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:~ $ mkdir habridge
pi@raspberrypi:~ $ cd 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) #### System Control Setup on a pi (preferred)
@@ -99,7 +99,7 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
WorkingDirectory=/home/pi/habridge 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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
@@ -134,7 +134,7 @@ Then cut and past this, modify any locations that are not correct
``` ```
cd /home/pi/habridge cd /home/pi/habridge
rm /home/pi/habridge/habridge-log.txt 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 chmod 777 /home/pi/habridge/habridge-log.txt
``` ```

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>5.2.0</version> <version>5.2.0a</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>

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

@@ -3984,7 +3984,7 @@ app.controller('FhemController', function ($scope, $location, bridgeService, ngD
$scope.clearDevice(); $scope.clearDevice();
for(var i = 0; i < $scope.bulk.devices.length; i++) { for(var i = 0; i < $scope.bulk.devices.length; i++) {
for(var x = 0; x < bridgeService.state.fhemdevices.length; x++) { 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); $scope.buildDeviceUrls(bridgeService.state.fhemdevices[x],dim_control,true);
devicesList[i] = { devicesList[i] = {
name: $scope.device.name, name: $scope.device.name,
@@ -4047,7 +4047,7 @@ app.controller('FhemController', function ($scope, $location, bridgeService, ngD
$scope.selectAll = true; $scope.selectAll = true;
for(var x = 0; x < bridgeService.state.fhemdevices.length; x++) { for(var x = 0; x < bridgeService.state.fhemdevices.length; x++) {
if($scope.bulk.devices.indexOf(bridgeService.state.fhemdevices[x]) < 0) 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);
} }
} }
}; };

6
src/main/resources/public/views/fhemdevice.html
View File

@@ -70,9 +70,9 @@
<tr ng-repeat="fhemdevice in bridge.fhemdevices"> <tr ng-repeat="fhemdevice in bridge.fhemdevices">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td><input type="checkbox" name="bulk.devices[]" <td><input type="checkbox" name="bulk.devices[]"
value="{{fhemdevice.item.name}}" value="{{fhemdevice.item.Name}}"
ng-checked="bulk.devices.indexOf(fhemdevice.item.name) > -1" ng-checked="bulk.devices.indexOf(fhemdevice.item.Name) > -1"
ng-click="toggleSelection(fhemdevice.item.name)"> ng-click="toggleSelection(fhemdevice.item.Name)">
{{fhemdevice.item.Name}}</td> {{fhemdevice.item.Name}}</td>
<td>{{fhemdevice.name}}</td> <td>{{fhemdevice.name}}</td>
<td>{{fhemdevice.item.PossibleSets}}</td> <td>{{fhemdevice.item.PossibleSets}}</td>