Merge pull request #53 from theyosh/feature/remote_data

Feature/remote data

CHANGELOG.md

@@ -2,6 +2,43 @@ Changelog
 =========
 
 
+3.2.0 (2017-11-24)
+------------------
+
+**New**
+- Add TOC. [TheYOSH]
+- Add config upgrade. [TheYOSH]
+- Add files via upload. [TheYOSH]
+- Add remote switches support. For now READONLY [#51](https://github.com/theyosh/TerrariumPI/issues/51). [TheYOSH]
+- Add support for remote (HTTP/HTTPS) temperature and humidity sensors
+  through JSON REST API. [#51](https://github.com/theyosh/TerrariumPI/issues/51). [TheYOSH]
+- Add static url parser. [TheYOSH]
+- Add CORS headers for Ajax REST calls. [TheYOSH]
+
+**Fixes**
+- Fix for remote data timeouts. [TheYOSH]
+- Fix remote dimmer data collectin. [TheYOSH]
+- Fix remote dimmer state updates. [TheYOSH]
+
+**Updates**
+- Update README.md. [TheYOSH]
+- Update README.md. [TheYOSH]
+- Update language files. [TheYOSH]
+- Update dashboard. Hide not enabled environment parts. [TheYOSH]
+- Small player updates. [TheYOSH]
+- Update soundcard code to support random soundcard order (2) [TheYOSH]
+- Update soundcard code to support random soundcard order. [TheYOSH]
+- Update readme. [TheYOSH]
+- Update version number. [TheYOSH]
+
+**Other**
+- Better load indicator. (2) [TheYOSH]
+- Better load indicator. [TheYOSH]
+- Merge branch 'master' into feature/remote_data. [TheYOSH]
+- Merge branch 'master' into feature/remote_data. [TheYOSH]
+- Code cleanup and add connection timeouts. [TheYOSH]
+
+
 3.1.1 (2017-11-20)
 ------------------
 
@@ -10,6 +47,7 @@ Changelog
 - Add Apple icon. [TheYOSH]
 
 **Updates**
+- Update changelog. [TheYOSH]
 - Updated top indicators. Hide disabled indicators on small screens.
   [TheYOSH]
 

README.md

@@ -1,4 +1,4 @@
-# TerrariumPI 3.1.0
+# TerrariumPI 3.2.0
 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.
@@ -12,6 +12,19 @@ Think off:
 - Growhouse
 
 And all this is controlled with a nice webinterface based on [Gentelella a Bootstrap 3 template](https://github.com/puikinsh/gentelella/).
+
+## Table of Contents
+1. [Features](#features)
+2. [Translations](#translations)
+3. [Installation](#installation)
+4. [Updating](#updating)
+5. [Hardware](#hardware)
+   1. [GPIO numbering](#gpio-numbering)
+   2. [New hardware](#new-hardware)
+6. [Remote data](#remote-data)
+7. [Screenshots](#screenshots)
+8. [About](#about)
+
 ## Features
 - Controlling electronic devices like lights, sprayers, heating and cooling equipment
 - Support for dimming electronic devices
@@ -35,6 +48,7 @@ And all this is controlled with a nice webinterface based on [Gentelella a Boots
   - Volume controle in the webinterface
   - Uploadig audio files through webinterface
   - Audio meta data support
+- 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).
 
 It is currently controling my reptile terrarium for more then three years! And my Madagascar Day Gecko is very happy with it!
 
@@ -92,9 +106,20 @@ This software requires a Raspberry Pi and some extra hardware in order to run an
   - OWFS
   - GPIO
   - 1 Wire interface
+
+### GPIO numbering
+All hardware that connects to the GPIO pins use Physical GPIO numbering (1 - 40). The software will translate it to BCM if needed for a supported device or sensor. [More information about GPIO pin numbering](https://pinout.xyz/)
 
+### New hardware
 If there is some other hardware which is not working with TerrariumPI, open an issue on [Github](https://github.com/theyosh/TerrariumPI/issues) and we will try to support it. Raspberry Pi Zero is not tested.
 
+## Remote data
+It is possible to use external sensor data that is available through HTTP(S) in JSON format. This way you can combine multiple Raspberry Pi's with TerrariumPI running to one single system. By using multiple Rapsberry PI's you can cover a bigger area. But there are limitations.
+
+Currently it is READONLY. So you can read out remote sensors and switches but you cannot control the remote switches. But this way you can combine the power swiches total costs and power usage.
+
+more information is here: [Remote data wiki](https://github.com/theyosh/TerrariumPI/wiki/Remote-data)
+
 ## Screenshots
 (made on a very big screen :P )
 ### Dashboard

defaults.cfg

@@ -1,7 +1,7 @@
 [terrariumpi]
 host = ::
 port = 8090
-version = 3.1.1
+version = 3.2.0
 title = TerrariumPI %(version)s
 power_usage = 5
 owfs_port = 4304
@@ -11,7 +11,7 @@ language = en_US
 temperature_indicator = C
 power_price = 0
 water_price = 0
-soundcard = 0
+soundcard = bcm2835 ALSA
 
 [weather]
 location = http://www.yr.no/place/Netherlands/Groningen/Groningen

install.sh

@@ -15,7 +15,7 @@ apt-get -y autoremove
 # Install required packages to get the terrarium software running
 aptitude -y update
 aptitude -y safe-upgrade
-aptitude -y install libftdi1 screen python-imaging python-dateutil python-ow python-rpi.gpio python-psutil git subversion watchdog build-essential python-dev python-picamera python-opencv python-pip python-pigpio i2c-tools owfs ow-shell sqlite3 vlc-nox python-mediainfodll libasound2-dev
+aptitude -y install libftdi1 screen python-imaging python-dateutil python-ow python-rpi.gpio python-psutil git subversion watchdog build-essential python-dev python-picamera python-opencv python-pip python-pigpio python-requests i2c-tools owfs ow-shell sqlite3 vlc-nox python-mediainfodll libasound2-dev
 
 # Basic config:
 raspi-config