Merge pull request #224 from theyosh/development

New release 3.9.1

CHANGELOG.md

@@ -2,16 +2,88 @@ Changelog
 =========
 
 
-3.9.0 (2018-11-18)
+3.9.1 (2018-12-08)
 ------------------
 
 **New**
 ------
+- Add archive and raw image to live webcam settings menu. [#223](https://github.com/theyosh/TerrariumPI/issues/223).
+  [TheYOSH]
+- Add motion archiving for Raspicam live and fixed webcam offline image.
+  [TheYOSH]
+- Add variables in url. [#222](https://github.com/theyosh/TerrariumPI/issues/222). [TheYOSH]
+- Add first attempt for JSON POST webhook. [#222](https://github.com/theyosh/TerrariumPI/issues/222). [TheYOSH]
+- Add date time to live Raspicam. [TheYOSH]
+- Add resolution and rotations to live RPICam. [#223](https://github.com/theyosh/TerrariumPI/issues/223). [TheYOSH]
+- Add live HLS streaming in Full HD from the Raspberry webcam. [#223](https://github.com/theyosh/TerrariumPI/issues/223).
+  [TheYOSH]
+- Add missing volume icon. [TheYOSH]
+- Add extra information in startup with OWFS issues. [#212](https://github.com/theyosh/TerrariumPI/issues/212). [TheYOSH]
+- Add LXML package. [#215](https://github.com/theyosh/TerrariumPI/issues/215). [TheYOSH]
+
+**Fixes**
+------
+- Fix empty subjects for notification rate limiter. [TheYOSH]
+- Python3 fixes and failing USB hardware for FTDI switches. [TheYOSH]
+- Fix bash issues. [TheYOSH]
+- Not sure why this was in the code... should fix adding new sensors.
+  [#219](https://github.com/theyosh/TerrariumPI/issues/219). [TheYOSH]
+- Fix dropdowns. [TheYOSH]
+- Fix API switch call [#217](https://github.com/theyosh/TerrariumPI/issues/217). [TheYOSH]
+- Fix weather updating. [TheYOSH]
+
+**Updates**
+------
+- Update version. [TheYOSH]
+- Update translations. [TheYOSH]
+- Update README.md. [TheYOSH]
+- Update README.md. [TheYOSH]
+- Update README.md. [TheYOSH]
+- Update README.md. [TheYOSH]
+- Updated the installer to give more information during pip installs.
+  [#220](https://github.com/theyosh/TerrariumPI/issues/220). [TheYOSH]
+- Updated live webcam annotations. [TheYOSH]
+- Update power switch logging(3) [TheYOSH]
+- Update power switch logging(2) [TheYOSH]
+- Update power switch logging. [TheYOSH]
+- Update mobile look. [TheYOSH]
+
+**Other**
+------
+- Code cleanup. [TheYOSH]
+- Remove debug. [TheYOSH]
+- Merge branch 'master' into development. [TheYOSH]
+- Merge branch 'master' into development. [TheYOSH]
+- Merge branch 'master' into development. [TheYOSH]
+- Remove debug. [TheYOSH]
+- Merge branch 'master' into development. [TheYOSH]
+- Write chunks to memory storage. Will save the SDcard. [#223](https://github.com/theyosh/TerrariumPI/issues/223). [TheYOSH]
+- Cleanup. [TheYOSH]
+- Merge branch 'master' into development. [TheYOSH]
+- Refactoring power switches code and logic. [#202](https://github.com/theyosh/TerrariumPI/issues/202). [TheYOSH]
+- Make max diff a float value. [TheYOSH]
+- Change package installation. [TheYOSH]
+- Allow per sensor max difference in measurement with absolute values.
+  Better controll and easier to understand for the user. [#205](https://github.com/theyosh/TerrariumPI/issues/205) (2)
+  [TheYOSH]
+- Allow per sensor max difference in measurement with absolute values.
+  Better controll and easier to understand for the user. [#205](https://github.com/theyosh/TerrariumPI/issues/205). [TheYOSH]
+
+
+3.9.0 (2018-11-19)
+------------------
+
+**New**
+------
+- Add warning when upgrade database. It can take some time and will look
+  not running. [#209](https://github.com/theyosh/TerrariumPI/issues/209). [TheYOSH]
+- Add files via upload. [TheYOSH]
 - Add Kelvin and Gallons to unit values. Code cleanup. [TheYOSH]
 - Add remote JSON example file. [TheYOSH]
 - Add image support for Pushover. [TheYOSH]
 - Add support for sending images trough telegram. [TheYOSH]
 - Add missing package. [TheYOSH]
+- Add usage documentation link. [TheYOSH]
 - Add volume sensor type through remote sensors. [#198](https://github.com/theyosh/TerrariumPI/issues/198). [TheYOSH]
 - Add support for SHT3X sensors. (untested) [#201](https://github.com/theyosh/TerrariumPI/issues/201). [TheYOSH]
 - Add support for Energenie Pi-Mote. [#199](https://github.com/theyosh/TerrariumPI/issues/199). [TheYOSH]
@@ -43,6 +115,7 @@ Changelog
 - Fix major sensors caching bug.... this should improve a lot. [TheYOSH]
 - Python2/3 fixes part(3) [TheYOSH]
 - More Python3 fixes. [TheYOSH]
+- Fix saving CO2 and fertility environment settings. [#198](https://github.com/theyosh/TerrariumPI/issues/198). [TheYOSH]
 - Serial LCD fix. [#193](https://github.com/theyosh/TerrariumPI/issues/193). [TheYOSH]
 - Fix SHT3X sensor. [#201](https://github.com/theyosh/TerrariumPI/issues/201). [TheYOSH]
 - Fix saving dc-dimmer settings. [#178](https://github.com/theyosh/TerrariumPI/issues/178). [TheYOSH]
@@ -60,6 +133,7 @@ Changelog
 
 **Updates**
 ------
+- Update changelog. [TheYOSH]
 - Update translations. [TheYOSH]
 - Update README.md. [TheYOSH]
 - Update weather and system config. Moving windspeed indicator from
@@ -70,6 +144,7 @@ Changelog
 - Update submodules. [TheYOSH]
 - Update README.md. [TheYOSH]
 - Update README.md. [TheYOSH]
+- Update README.md. [TheYOSH]
 - Update translations. [TheYOSH]
 - Update for LCD serial. [#193](https://github.com/theyosh/TerrariumPI/issues/193). [TheYOSH]
 - Update LCD Serial. [#193](https://github.com/theyosh/TerrariumPI/issues/193). [TheYOSH]
@@ -86,6 +161,13 @@ Changelog
 
 **Other**
 ------
+- After x erratic values we have to beleve that it is a new valid value.
+  [#205](https://github.com/theyosh/TerrariumPI/issues/205). [TheYOSH]
+- Make weather changes possible without restarting. Adding some new
+  exceptions. [TheYOSH]
+- Merge pull request [#208](https://github.com/theyosh/TerrariumPI/issues/208) from theyosh/python3. [TheYOSH]
+
+  Python3 support
 - More cleanup. [TheYOSH]
 - Changes for new release. [TheYOSH]
 - Refactor terrariumWeather code. [TheYOSH]

README.md

@@ -1,10 +1,12 @@
-# TerrariumPI 3.9.0
+# TerrariumPI 3.9.1
 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.
 
 The software is that flexible that there is no limit in amount of sensors, relay boards or door sensors. The usage can be endless. All power switches have support for timers to trigger based on a time pattern.
 
+If you are using this software for your animals or plants, **[please post some pictures](https://github.com/theyosh/TerrariumPI/issues/210)**
+
 It can either run on Python 2.7 or [Python 3.5+](https://github.com/theyosh/TerrariumPI/wiki/FAQ#how-to-use-python-35)
 
 Think off:
@@ -52,6 +54,8 @@ And all this is controlled with a nice webinterface based on [Gentelella a Boots
   - Fertility
   - Volume
 - Support for webcams and native Raspberry Pi cam out of the box
+  - Raspberry Pi cam can be streamed live with 6 seconds delay
+  - Archiving images based on motion or time interval
 - Support for analog devices through a MCP3008
   - Support for PH probe SKU SEN0161
 - Support for MiFlora Bluetooth sensors
@@ -76,7 +80,7 @@ And all this is controlled with a nice webinterface based on [Gentelella a Boots
   - Audio meta data support (mediainfo)
 - Remote temperature and humidity sensors through HTTP(S) JSON API's. JSON Data format can be found on [Remote data wiki](https://github.com/theyosh/TerrariumPI/wiki/Remote-data).
 - Display support
-  - LCD 16x2 or 20x4 screens
+  - LCD 16x2 or 20x4 screens either through I2C or [Serial](https://www.instructables.com/id/Raspberry-Pi-Arduino-LCD-Screen/)
   - OLED based on SSD1306
 - Notifications system. Custom messages for custom actions with use of variables in the messages
   - Get notifications through
@@ -85,6 +89,7 @@ And all this is controlled with a nice webinterface based on [Gentelella a Boots
     - Pushover
     - Telegram bot
     - Display
+    - Webhooks
   - Notifications for
     - Environment part low and high alarm
     - Sensor high and low measurements

defaults.cfg

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

install.sh

@@ -98,20 +98,43 @@ PIP_MODULES="python-dateutil rpi.gpio psutil picamera pigpio requests gpiozero g
 if [ $PYTHON -eq 3 ]; then
   PIP_MODULES="${PIP_MODULES} opencv-python-headless"
 fi
+NUMBER_OF_MODULES=($PIP_MODULES)
+NUMBER_OF_MODULES=${#NUMBER_OF_MODULES[@]}
+MODULE_COUNTER=1
 for PIP_MODULE in ${PIP_MODULES}
 do
   PROGRESS=$((PROGRESS + 2))
-  cat <<EOF
+  ATTEMPT=1
+  MAX_ATTEMPTS=5
+  while [ $ATTEMPT -le $MAX_ATTEMPTS ]
+  do
+
+    cat <<EOF
 XXX
 $PROGRESS
-Install required software (some modules will take 5-10 min.)\n\nInstalling python${PYTHON} module ${PIP_MODULE} ...
+Install required software (some modules will take 5-10 min.)
+
+Installing python${PYTHON} module ${MODULE_COUNTER} out of ${NUMBER_OF_MODULES}: ${PIP_MODULE} (attempt ${ATTEMPT}) ...
 XXX
 EOF
-  if [ $PYTHON -eq 2 ]; then
-    pip2 install -q --upgrade ${PIP_MODULE}
-  elif [ $PYTHON -eq 3 ]; then
-    pip3 install -q --upgrade ${PIP_MODULE}
-  fi
+    if [ $PYTHON -eq 2 ]; then
+      pip2 install -q --upgrade ${PIP_MODULE}
+    elif [ $PYTHON -eq 3 ]; then
+      pip3 install -q --upgrade ${PIP_MODULE}
+    fi
+
+    if [ $? -eq 0 ]; then
+      # PIP install succeeded normally
+      ATTEMPT=$((ATTEMPT + 99))
+    else
+      # PIP install failure... retry..
+      ATTEMPT=$((ATTEMPT + 1))
+    fi
+
+  done
+
+  MODULE_COUNTER=$((MODULE_COUNTER + 1))
+
 done
 
 cd "${BASEDIR}"

live_rpicam.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-WIDTH=$1
-HEIGHT=$2
-ROTATION=$3
-DIR=$4
+NAME=$1
+WIDTH=$2
+HEIGHT=$3
+ROTATION=$4
+DIR=$5
 
 if [[ "{ROTATION}" == "h" ]];
 then
@@ -15,5 +16,5 @@ else
   ROTATION="-rot ${ROTATION}"
 fi
 
-raspivid -b 2000000 -o - -t 0 -w ${WIDTH} -h ${HEIGHT} ${ROTATION} -fps 30 -g 30 -pf main -lev 4.1 -a 12 | \
- ffmpeg -nostdin -re -i - -c:v copy -f hls -hls_time 2 -hls_list_size 3 -hls_flags delete_segments+split_by_time -hls_segment_filename "${DIR}/chunk_%03d.ts" "${DIR}/stream.m3u8"
+`which raspivid` -o - -b 2000000 -t 0 -w ${WIDTH} -h ${HEIGHT} ${ROTATION} --drc low -fps 30 -g 30 -pf main -lev 4.1 -ae 16,0xff,0x808000 -a 8 -a " ${NAME} @ %d/%m/%Y %X " -a 1024 | \
+ `which ffmpeg` -hide_banner -nostdin -re -i - -c:v copy -f hls -hls_time 2 -hls_list_size 3 -hls_flags delete_segments+split_by_time -hls_segment_filename "${DIR}/chunk_%03d.ts" "${DIR}/stream.m3u8"