diff --git a/README.md b/README.md index bd01ec7..dca14ab 100644 --- a/README.md +++ b/README.md @@ -33,28 +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. ``` -<<<<<<< HEAD java -jar ha-bridge-4.1.0.jar -======= -java -jar ha-bridge-4.0.3.jar ->>>>>>> refs/remotes/origin/master ``` ### 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 -<<<<<<< HEAD Create the directory and make sure that ha-bridge-4.1.0.jar is in your /home/pi/habridge directory. -======= -Create the directory and make sure that ha-bridge-4.0.3.jar is in your /home/pi/habridge directory. ->>>>>>> refs/remotes/origin/master ``` pi@raspberrypi:~ $ mkdir habridge pi@raspberrypi:~ $ cd habridge -<<<<<<< HEAD + +pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.0/ha-bridge-4.1.0.jar + +Create the directory and make sure that ha-bridge-4.1.0.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/v4.1.0/ha-bridge-4.1.0.jar -======= -pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.0.3/ha-bridge-4.0.3.jar ->>>>>>> refs/remotes/origin/master ``` #### 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 @@ -73,11 +68,8 @@ After=network.target [Service] Type=simple -<<<<<<< HEAD + ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.0.jar -======= -ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.0.3.jar ->>>>>>> refs/remotes/origin/master [Install] WantedBy=multi-user.target @@ -112,11 +104,8 @@ Then cut and past this, modify any locations that are not correct ``` cd /home/pi/habridge rm /home/pi/habridge/habridge-log.txt -<<<<<<< HEAD nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.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-4.0.3.jar > /home/pi/habridge/habridge-log.txt 2>&1 & ->>>>>>> refs/remotes/origin/master + chmod 777 /home/pi/habridge/habridge-log.txt ``` Exit and save the file with ctrl-X and follow the prompts and then execute on the command line: diff --git a/pom.xml b/pom.xml index d3340e8..4d63f0a 100644 --- a/pom.xml +++ b/pom.xml @@ -217,4 +217,4 @@ - + \ No newline at end of file diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java index e9a68e5..1e096f3 100644 --- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java +++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java @@ -47,6 +47,7 @@ public class HTTPHome implements Home { String anUrl = BrightnessDecode.calculateReplaceIntensityValue(anItem.getItem().getAsString(), intensity, targetBri, targetBriInc, false); + anUrl = TimeDecode.replaceTimeValue(anUrl); String aBody = null; if(anItem.getHttpBody()!= null && !anItem.getHttpBody().isEmpty()) {