Merge pull request #235 from theyosh/development

New release

Author: theyosh

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "chirp-rpi"]
 	path = chirp-rpi
 	url = https://github.com/ageir/chirp-rpi.git
+[submodule "hls-proxy"]
+	path = hls-proxy
+	url = https://github.com/Viblast/hls-proxy.git

CHANGELOG.md

@@ -2,6 +2,52 @@ Changelog
 =========
 
 
+3.9.3 (2018-12-27)
+------------------
+
+**New**
+------
+- Add more precise values in gauge graphs. [#227](https://github.com/theyosh/TerrariumPI/issues/227). [TheYOSH]
+- Add missing translations. [#226](https://github.com/theyosh/TerrariumPI/issues/226). [TheYOSH]
+- Add helper for live hls webcam [#223](https://github.com/theyosh/TerrariumPI/issues/223). [TheYOSH]
+- Add remote HLS live streaming webcams. [#223](https://github.com/theyosh/TerrariumPI/issues/223). [TheYOSH]
+
+**Fixes**
+------
+- Fix bluetooth scanning. [TheYOSH]
+- Fix watertank measurement based on sensor type. [TheYOSH]
+- Fix OWFS sensors. [TheYOSH]
+- Fix empty sudoers file due to missing username. [#228](https://github.com/theyosh/TerrariumPI/issues/228). [TheYOSH]
+- Fix raw webcam image link. [#223](https://github.com/theyosh/TerrariumPI/issues/223). [TheYOSH]
+- Notification fix. [TheYOSH]
+- Fix pH indicator. [#227](https://github.com/theyosh/TerrariumPI/issues/227). [TheYOSH]
+
+**Updates**
+------
+- Update Dutch language. [TheYOSH]
+- Update environment sensors after upgrade. [TheYOSH]
+- Update live webcam streaming. [TheYOSH]
+- Update sensor refactoring. [TheYOSH]
+- Update README.md. [TheYOSH]
+
+**Other**
+------
+- Allow 30 seconds timer. Lower values are not possible. [#231](https://github.com/theyosh/TerrariumPI/issues/231). [TheYOSH]
+- Remove debug. [#227](https://github.com/theyosh/TerrariumPI/issues/227). [TheYOSH]
+- Return of the minimal 90dB receiver level for Bluetooth devices.
+  [TheYOSH]
+- Cleanup webcam code. [TheYOSH]
+- Write webcam images data to memory to save SD card wearing. Only
+  archived images will be saved on the SD card. [TheYOSH]
+- Full sensors code refactor... [#202](https://github.com/theyosh/TerrariumPI/issues/202). [TheYOSH]
+- Finetuning rate limits. [TheYOSH]
+- Code cleanup. [TheYOSH]
+- Remove timebar from live webcam. [TheYOSH]
+- Uninstall incompatible python3 pip numpy. [TheYOSH]
+- Finetuning... [TheYOSH]
+- Support LED dimming through DC Dimmer switch. [#200](https://github.com/theyosh/TerrariumPI/issues/200). [TheYOSH]
+
+
 3.9.1 (2018-12-08)
 ------------------
 
@@ -34,6 +80,7 @@ Changelog
 
 **Updates**
 ------
+- Update changelog. [TheYOSH]
 - Update version. [TheYOSH]
 - Update translations. [TheYOSH]
 - Update README.md. [TheYOSH]
@@ -50,6 +97,9 @@ Changelog
 
 **Other**
 ------
+- Merge pull request [#224](https://github.com/theyosh/TerrariumPI/issues/224) from theyosh/development. [TheYOSH]
+
+  New release 3.9.1
 - Code cleanup. [TheYOSH]
 - Remove debug. [TheYOSH]
 - Merge branch 'master' into development. [TheYOSH]
@@ -1933,3 +1983,5 @@ Changelog
 - Living on the edge.... use latest beta of Leaflet. [TheYOSH]
 - Initial release. [TheYOSH]
 - Initial commit. [TheYOSH]
+
+

README.md

@@ -1,4 +1,4 @@
-# TerrariumPI 3.9.1
+# TerrariumPI 3.9.3
 Software for cheap home automation of your reptile terrarium or any other enclosed environment. With this software you are able to control for example a terrarium so that the temperature and humidity is of a constant value. Controlling the temperature can be done with heat lights, external heating or cooling system. As long as there is one temperature sensor available the software is able to keep a constant temperature.
 
 For humidity control there is support for a spraying system. The sprayer can be configured to spray for an X amount of seconds and there is a minumal period between two spray actions. Use at least one humitidy sensors to get a constant humidity value. In order to lower the humidity you can add a dehumidifier.

defaults.cfg

@@ -1,7 +1,7 @@
 [terrariumpi]
 host = ::
 port = 8090
-version = 3.9.1
+version = 3.9.3
 title = TerrariumPI %(version)s
 power_usage = 5
 owfs_port = 4304

hls-proxy

@@ -1,6 +1,9 @@
 #!/bin/bash
 BASEDIR=$(dirname $(readlink -nf $0))
 SCRIPT_USER=`who -m | awk '{print $1}'`
+if [ "" == "${SCRIPT_USER}" ]; then
+  SCRIPT_USER="pi"
+fi
 SCRIPT_USER_ID=`id -u ${SCRIPT_USER}`
 VERSION=`grep ^version defaults.cfg | cut -d' ' -f 3`
 WHOAMI=`whoami`
@@ -60,7 +63,7 @@ fi
 
 debconf-apt-progress -- apt-get -y update
 debconf-apt-progress -- apt-get -y full-upgrade
-debconf-apt-progress -- apt-get -y install libftdi1 screen git subversion watchdog build-essential i2c-tools pigpio owserver sqlite3 vlc-nox ffmpeg libasound2-dev sispmctl lshw libffi-dev ntp libglib2.0-dev rng-tools libcblas3 libatlas3-base libjasper1 libgstreamer0.10-0 libgstreamer1.0-0 libilmbase12 libopenexr22 libgtk-3-0 libxml2-dev libxslt1-dev $PYTHON_LIBS
+debconf-apt-progress -- apt-get -y install libftdi1 screen git subversion watchdog build-essential i2c-tools pigpio owserver sqlite3 vlc-nox ffmpeg libasound2-dev sispmctl lshw libffi-dev ntp libglib2.0-dev rng-tools libcblas3 libatlas3-base libjasper1 libgstreamer0.10-0 libgstreamer1.0-0 libilmbase12 libopenexr22 libgtk-3-0 libxml2-dev libxslt1-dev python-twisted $PYTHON_LIBS
 
 PROGRESS=35
 # Update submodules if downloaded through tar or zip
@@ -137,6 +140,13 @@ EOF
 
 done
 
+if [ $PYTHON -eq 3 ]; then
+  # Remove pip numpy install that comes with an upgrade of another module. Does not work
+  # Removing this will fallback to OS default
+  pip3 uninstall -y -q numpy
+fi
+
+
 cd "${BASEDIR}"
 chown ${SCRIPT_USER}. .
 chown ${SCRIPT_USER}. * -Rf