Fixed closing homes to actually call the close on the homes. Updated the

lowest setting on the test dim function to b 1.

Fixes #438
Fixes #440
This commit is contained in:
bwssystems
2017-02-05 14:37:35 -06:00
parent 6b3ae1b971
commit 3016712ad8
14 changed files with 44 additions and 19 deletions

View File

@@ -33,23 +33,23 @@ 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-4.1.3.jar java -jar ha-bridge-4.1.4.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-4.1.3.jar is in your /home/pi/habridge directory. Create the directory and make sure that ha-bridge-4.1.4.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/v4.1.3/ha-bridge-4.1.3.jar pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.4/ha-bridge-4.1.4.jar
``` ```
Create the directory and make sure that ha-bridge-4.1.3.jar is in your /home/pi/habridge directory. Create the directory and make sure that ha-bridge-4.1.4.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/v4.1.3/ha-bridge-4.1.3.jar pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.4/ha-bridge-4.1.4.jar
``` ```
#### System Control Setup on a pi (preferred) #### System Control Setup on a pi (preferred)
For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
@@ -69,7 +69,7 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.3.jar ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.4.jar
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
@@ -104,7 +104,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-4.1.3.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-4.1.4.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
``` ```

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>4.1.3</version> <version>4.1.4</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>

View File

@@ -87,6 +87,7 @@ public class HABridge {
bridgeSettings.save(bridgeSettings.getBridgeSettingsDescriptor()); bridgeSettings.save(bridgeSettings.getBridgeSettingsDescriptor());
homeManager.closeHomes(); homeManager.closeHomes();
udpSender.closeResponseSocket(); udpSender.closeResponseSocket();
udpSender = null;
} }
bridgeSettings.getBridgeControl().setReinit(false); bridgeSettings.getBridgeControl().setReinit(false);
stop(); stop();

View File

@@ -1,5 +1,6 @@
package com.bwssystems.HABridge; package com.bwssystems.HABridge;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -96,6 +97,11 @@ public class HomeManager {
} }
public void closeHomes() { public void closeHomes() {
Collection<Home> theHomes = homeList.values();
for(Home aHome : theHomes) {
aHome.closeHome();
}
homeList.clear();
homeList = null;
} }
} }

View File

@@ -94,10 +94,10 @@ public class NestHome implements com.bwssystems.HABridge.Home {
public void closeHome() { public void closeHome() {
if(theSession != null) { if(theSession != null) {
theNest.endNestSession(); theNest.endNestSession();
theNest = null;
theSession = null;
nestItems = null;
} }
theNest = null;
theSession = null;
nestItems = null;
} }
@Override @Override

View File

@@ -185,4 +185,11 @@ public class HalInfo {
this.halAddress = halAddress; this.halAddress = halAddress;
} }
public void closeInfo() {
if(httpClient != null)
httpClient.closeHandler();
httpClient = null;
halAddress = null;
theToken = null;
}
} }

View File

@@ -151,10 +151,14 @@ public class HassHome implements Home {
public void closeHome() { public void closeHome() {
if(!validHass) if(!validHass)
return; return;
if(hassMap == null)
return;
Iterator<String> keys = hassMap.keySet().iterator(); Iterator<String> keys = hassMap.keySet().iterator();
while(keys.hasNext()) { while(keys.hasNext()) {
String key = keys.next(); String key = keys.next();
hassMap.get(key).closeClient(); hassMap.get(key).closeClient();
} }
hassMap = null;
} }
} }

View File

@@ -104,5 +104,6 @@ public class HomeAssistant {
protected void closeClient() { protected void closeClient() {
anHttpHandler.closeHandler(); anHttpHandler.closeHandler();
anHttpHandler = null;
} }
} }

View File

@@ -81,7 +81,9 @@ public class HTTPHome implements Home {
@Override @Override
public void closeHome() { public void closeHome() {
anHttpHandler.closeHandler(); if(anHttpHandler != null)
anHttpHandler.closeHandler();
anHttpHandler = null;
} }
} }

View File

@@ -124,10 +124,13 @@ public class HueHome implements Home {
public void closeHome() { public void closeHome() {
if(!validHue) if(!validHue)
return; return;
if(hues == null)
return;
Iterator<String> keys = hues.keySet().iterator(); Iterator<String> keys = hues.keySet().iterator();
while(keys.hasNext()) { while(keys.hasNext()) {
String key = keys.next(); String key = keys.next();
hues.get(key).closeHue();; hues.get(key).closeHue();;
} }
hues = null;
} }
} }

View File

@@ -68,5 +68,6 @@ public class MQTTHandler {
} catch (MqttException e) { } catch (MqttException e) {
log.warn("Could not disconnect MQTT client for name: " + myConfig.getName() + " and ip: " + myConfig.getIp()); log.warn("Could not disconnect MQTT client for name: " + myConfig.getName() + " and ip: " + myConfig.getIp());
} }
myClient = null;
} }
} }

View File

@@ -42,6 +42,7 @@ public class MQTTHome implements Home {
handlers.get(key).shutdown(); handlers.get(key).shutdown();
} }
} }
handlers = null;
} }
public MQTTHandler getMQTTHandler(String aName) { public MQTTHandler getMQTTHandler(String aName) {

View File

@@ -106,7 +106,6 @@ public class VeraHome implements Home {
@Override @Override
public void closeHome() { public void closeHome() {
// TODO Auto-generated method stub veras = null;
} }
} }

View File

@@ -1145,7 +1145,7 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
$scope.slider = { $scope.slider = {
value: 100, value: 100,
options: { options: {
floor: 0, floor: 1,
ceil: 100, ceil: 100,
showSelectionBar: true showSelectionBar: true
} }
@@ -1154,8 +1154,8 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
$scope.valueType = "percentage"; $scope.valueType = "percentage";
$scope.changeScale = function () { $scope.changeScale = function () {
if($scope.valueType === "raw") { if($scope.valueType === "raw") {
$scope.slider.options.ceil = 255; $scope.slider.options.ceil = 254;
$scope.slider.value = 255; $scope.slider.value = 254;
} }
else { else {
$scope.slider.options.ceil = 100; $scope.slider.options.ceil = 100;
@@ -1164,7 +1164,7 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
}; };
$scope.setValue = function () { $scope.setValue = function () {
ngDialog.close('ngdialog1'); ngDialog.close('ngdialog1');
var theValue = 0; var theValue = 1;
if($scope.valueType === "percentage") if($scope.valueType === "percentage")
theValue = Math.round(($scope.slider.value * .01) * 255); theValue = Math.round(($scope.slider.value * .01) * 255);
else else