Merge pull request #7 from domoticz/master

merge

Author: szczukot

.travis.yml

@@ -4,62 +4,95 @@ branches:
 
 language: cpp
 
-compiler:
-  - gcc
-
-os:
-  - linux
-  - osx
-
 cache:
   - apt
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-      - boost-latest
-    packages:
-      - gcc-4.9
-      - g++-4.9
-      - libboost1.55-all-dev
-      - cmake
-      - libsqlite3-dev
-      - curl
-      - libcurl4-openssl-dev
-      - libusb-dev
-      - zlib1g-dev
-      - libssl-dev
-      - libudev-dev
-      - git
-    on:
-      os: linux
-
 update-alternatives:
   - install /usr/bin/gcc gcc /usr/bin/gcc-4.9 50
   - install /usr/bin/g++ g++ /usr/bin/g++-4.9 50
 
 sources:
   - trusty
 
+
+# Domoticz ftp server account & encrypted password
+env:
+  global:
+    - "FTP_HOST=62.84.241.110"
+    - "FTP_USER=uploads@domoticz.com"
+
+# What to install before the build
 before_install:
-  - if [ ${TRAVIS_OS_NAME} == "linux" ]; then git clone https://github.com/OpenZWave/open-zwave.git; fi
-  - if [ ${TRAVIS_OS_NAME} == "linux" ]; then ln -s open-zwave open-zwave-read-only; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew install cmake; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew install boost || true; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew install libusb; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew install libusb-compat; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew install zlib || true; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew install openssl; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then brew link openssl --force; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then export LDFLAGS=-L/usr/local/opt/openssl/lib; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then export CPPFLAGS=-I/usr/local/opt/openssl/include; fi
+  # Domoticz needs the full history to be able to calculate the version string
   - git fetch --unshallow
+  # OpenZWave
+  - git clone https://github.com/OpenZWave/open-zwave.git
+  - ln -s open-zwave open-zwave-read-only
+
+
+# Build matrix definition
+# * Two builds
+#   1. Linux amd64
+#   2. Apple OSX
+matrix:
+  include:
+  # Linux amd64
+  - os: linux
+    compiler:
+      - gcc
+    env: TARGET_ARCHITECTURE=amd64
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+          - boost-latest
+        packages:
+          - gcc-4.9
+          - g++-4.9
+          - libboost1.55-all-dev
+          - cmake
+          - libsqlite3-dev
+          - curl
+          - libcurl4-openssl-dev
+          - libusb-dev
+          - zlib1g-dev
+          - libssl-dev
+          - libudev-dev
+          - git
+    script:
+      - (cd open-zwave-read-only; make)
+      - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=open-zwave-read-only
+      - make
+    before_deploy:
+      - tar czf domoticz_${TRAVIS_OS_NAME}_x86_64_latest.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease --exclude .svn www/ scripts/ Config/
+  # Apple OSX
+  - os: osx
+    compiler:
+      - gcc
+    env: TARGET_ARCHITECTURE=amd64
+    install:
+      - brew install cmake
+      - brew install boost|| true
+      - brew install libusb
+      - brew install libusb-compat
+      - brew install zlib || true
+      - brew install openssl
+      - brew link openssl --force
+      - export LDFLAGS=-L/usr/local/opt/openssl/lib
+      - export CPPFLAGS=-I/usr/local/opt/openssl/include
+    script:
+      - cmake -DCMAKE_BUILD_TYPE=Release
+      - make
+    before_deploy:
+      - tar czf domoticz_${TRAVIS_OS_NAME}_x86_64_latest.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease
+
 
-script:
-  - if [ ${TRAVIS_OS_NAME} == "linux" ]; then (cd open-zwave-read-only; make); fi
-  - if [ ${TRAVIS_OS_NAME} == "linux" ]; then cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=open-zwave-read-only; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then cmake -DCMAKE_BUILD_TYPE=Release; fi
-  - make
-  - if [ ${TRAVIS_OS_NAME} == "linux" ]; then tar czf domoticz_${TRAVIS_OS_NAME}_x86_64.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease --exclude .svn www/ scripts/ Config/; fi
-  - if [ ${TRAVIS_OS_NAME} == "osx" ];   then tar czf domoticz_${TRAVIS_OS_NAME}_x86_64.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease; fi
+# What to do with the build artifacts
+# - Upload to the Domoticz file server
+deploy:
+  skip_cleanup: true
+  provider: script
+  script: echo curl --ftp-ssl -T domoticz_${TRAVIS_OS_NAME}_x86_64_latest.tgz -k -u "$FTP_USER:$FTP_PASSWORD" "ftp://$FTP_HOST"
+  on:
+    branch: master
+    repo: domoticz/domoticz

History.txt

@@ -1,123 +1,127 @@
 Version 2.xxx (xxxx 2015)
-- Implemented: Notifications, new option "Ignore Interval"
-- Improved: Notifications
-- Implemented: MySensors added support for S_SMOKE/S_DIMMER
-- Fixed: Tooltip bug for the Dusk sensor in the Lights tab
+- Implemented "Stop" state in blockly in switch states
+- Implemented: Ability to parse data coming from an HTTP POST data with a lua script (seb)
+- Implemented: Added Logitech Media Server support (thanks to EddyK69!!)
+- Implemented: Added pushbullet notifications (thanks to tofra!!)
+- Implemented: Arabic translation (big thanks to Mo7sen!!)
+- Implemented: Blockly, Option to compare sensor value against another sensor value
+- Implemented: Blockly, Split Utility Sensors into multiple groups
 - Implemented: Blockly/Lua SendSMS
-- Fixed: Battery low (typo) notification
-- Changed: EventSystem, not adding sensors from disable hardware
+- Implemented: Catch SIGHUP signal for log rotation (LarsForum)
+- Implemented: Danish translation (big thanks to jokkemokke!!)
+- Implemented: Devices Tab, now displaying scenes/groups
+- Implemented: Dummy Hardware, Ampere Single (single ampere value, other ampere sensor expects 3 values)
+- Implemented: Hebrew translation (big thanks to mickeyv!!)
 - Implemented: HTTP Data push, new types for Type/SubType/Hostname/Device Name
 - Implemented: HTTPS support for On/Off actions
+- Implemented: Icon Uploader, now possible to edit name and description
+- Implemented: Icon Uploader, now possible to upload zip files with multiple folders
+- Implemented: Icons for RFXMeter Gas/Water
+- Implemented: Kodi Hardware device (Big thanks to dnpwwo!)
+- Implemented: Logwindow, Added option to filter text
+- Implemented: Mochad secure support (thanks to Simon)
+- Implemented: MySensors added support for S_SCENE_CONTROLLER, V_SCENE_ON, V_SCENE_OFF
+- Implemented: MySensors added support for S_SMOKE/S_DIMMER
+- Implemented: MySensors added support for V_IMPEDANCE
+- Implemented: MySensors, now using ACK for node commands (and fails if no ACK is received)
+- Implemented: MySensors, renamed V_LIGHT to V_STATUS and V_DIMMER to V_PERCENTAGE to be compliant to the 1.5 API
+- Implemented: MySensors, some more default naming of sensors if they where presented with a name
+- Implemented: MySensors, V_IR_RECEIVE and V_IR_SEND
+- Implemented: MySensors, V_TEXT, V_HVAC_SETPOINT_COOL and V_HVAC_SETPOINT_HEAT
+- Implemented: Netatmo Weather Station (Big thanks to Sebastien!)
+- Implemented: Notifications, new option "Ignore Interval"
+- Implemented: OpenZWave, added Ultraviolet sensor type support
+- Implemented: OpenZWave, Include/Exclude progress dialog-
+- Implemented: OpenZWave, multi instance association support (thanks to xs4!!!)
+- Implemented: Option for Dummy device to create Soil Moisture,Leaf Wetness, RGB Switch
+- Implemented: Option how to display the kWh day graph (Power or (k)W/h)
+- Implemented: Option to add a log message via the json api (see wiki)
+- Implemented: Option to enter a description for each sensor/switch/scene
+- Implemented: Option to flash sensors when an update is received (enable in the settings page)
+- Implemented: Option to hide scenes/groups (placing a $ in front of the name)
+- Implemented: Option to rename unused devices
+- Implemented: Option to replace an Energy device
 - Implemented: Rain Report
+- Implemented: Revolt, added support for Voltage/PowerFactor/Frequency
+- Implemented: RFLink SmokeDetector support
+- Implemented: RFLink: Added various sensors/devices (stuntteam)
+- Implemented: RFXCom (Serial) option to update the firmware via the web interface
+- Implemented: RFXtrx ASA protocol implemented
+- Implemented: RGB Popup to select color/on/off
+- Implemented: Satel Integra hardware support (big thanks to Fantom)
+- Implemented: Scene codes now handles again seperate status (on/off)
+- Implemented: Scene, option for 'stop'
+- Implemented: Serbian language support, big thanks to siklosi!!
+- Implemented: Settings/Backup/Restore, when performing a database backup/restore the database is cleaned
+- Implemented: Settings/Log, option to clear all short-log data
+- Implemented: Slovenian language support, big thanks to eden86!!
+- Implemented: smartwares thermostat, Logging of Day/Night switch
+- Implemented: smartwares thermostat, Logging of setpoint value
+- Implemented: smartwares thermostat, Setpoint popup
+- Implemented: smartwares thermostat, Setpoint, now always logged
+- Implemented: Support for browsers that do not support gzip compression (thanks to ash77)
+- Implemented: Support for multiple scene/group codes
+- Implemented: Support for the Plugwise Anna Thermostat (NEM)
 - Implemented: Temperature Report
-- Fixed: 1-Wire negative values
-- Implemented: Netatmo Weather Station (Big thanks to Sebastien!)
-- Changed: json "udevice" Perecentage sensor, you might get new ID's, now also creates an event for blockly/lua
 - Implemented: Text/Alert Sensor logging (when called from json api)
-- Implemented: Support for browsers that do not support gzip compression (thanks to ash77)
+- Implemented: Thermosmart Thermostat
+- Implemented: Web Server can now be bind to specific address (-wwwbind) (seb)
 - Implemented: When clicking on the log button, browser page now always go to the top
-- Implemented "Stop" state in blockly in switch states
-- Implemented: Kodi Hardware device (Big thanks to dnpwwo!)
-- Fixed: Devices Tab, set device to unused
 - Changed: Air Quality chart will now not begin at 0
-- Implemented: Mochad secure support (thanks to Simon)
-- Fixed: HTTP Push table localization (thanks to cgaudry)
-- Changed: OpenZWave, when receiving a timeout notification, do not flag node as 'dead', only log the message
-- Fixed: Davis Logger
-- Changed: Short Log cleanup method
-- Implemented: Option to flash sensors when an update is received (enable in the settings page)
-- Changed: Lowered HTTP connection timeout to 10 seconds
-- Fixed: Post command handling
+- Changed: All Energy sensors have been transfered to General kWh sensors (more accurate)
 - Changed: BMP085, when forecast is unknown, its calculated directly based on the pressure
-- Implemented: Option to rename unused devices
-- Implemented: RFXCom (Serial) option to update the firmware via the web interface
-- Implemented: OpenZWave, multi instance association support (thanks to xs4!!!)
-- Fixed: OpenZWave with large homeid values
-- Fixed: pushover sound notification (thanks to Eduard)
-- Implemented: Danish translation (big thanks to jokkemokke!!)
-- Add Kodi media command interface to web server
-- Implemented: RFLink SmokeDetector support
+- Changed: disabled timeout for smartwares thermostat (no incomming data from device)
+- Changed: EnOcean rocker inclusion (thanks to zorgluf!)
+- Changed: EventSystem, not adding sensors from disable hardware
+- Changed: forced fixed icon sizes on some locations (in case of to big user defined icons)
+- Changed: Internal HTML/JS changes to support all types of characters in the sensors name
+- Changed: json "udevice" Perecentage sensor, you might get new ID's, now also creates an event for blockly/lua
 - Changed: KMTronic LAN, now using actual On/Off commands instead of 'Toggle'
-- Implemented: OpenZWave, added Ultraviolet sensor type support
-- Implemented: Revolt, added support for Voltage/PowerFactor/Frequency
-- Fixed: Revolt, Enery Graph
-- Fixed: EventSystem, SIGSEGV (cgaudry)
-- Fixed: EventSystem, splitresults has missing values because m_devicestates is modified while using an iterator on the map (cgaudry)
-- Fixed: EventSystem, _tEventItem.Conditions should not be modified while reading m_events (cgaudry)
-- Fixed: EventSystem, asctime is not thread-safe (replaced with strftime) (cgaudry)
+- Changed: Lowered HTTP connection timeout to 10 seconds
+- Changed: Main, all fatal signals where not handled (e.g. SIGILL, SIGABRT,SIGFPE) (cgaudry)
+- Changed: Main, application should be stopped after fatal signal receiving (cgaudry)
 - Changed: Main, dumptrace is not logged because the stderr handle is closed on startup (cgaudry)
 - Changed: Main, signal code received is not logged (cgaudry)
-- Changed: Main, application should be stopped after fatal signal receiving (cgaudry)
-- Changed: Main, all fatal signals where not handled (e.g. SIGILL, SIGABRT,SIGFPE) (cgaudry)
-- Changed: SQLHelper, spelling mistake (cgaudry)
+- Changed: migrated to github
+- Changed: MySensors, rebuild
+- Changed: non-windows systems, scripts can now use a relative patch to the scripts folder if script does not start with a '/'
+- Changed: OpenZWave, Alarm/Notification mappings update (xs4)
+- Changed: OpenZWave, Fibaro Wall Plug, now using multisensor for power reading
+- Changed: OpenZWave, when receiving a timeout notification, do not flag node as 'dead', only log the message
 - Changed: RFXCom, fixed confusing logs (cgaudry)
-- Fixed: Security Panel delay, now again possible to set delay to 0 (directly)
-- Implemented: Support for the Plugwise Anna Thermostat (NEM)
-- Fixed: Temperatures not updated on UI without refreshing browser or changing tabs
-- Fixed: Email Notifications where always enabled after restart
+- Changed: Short Log cleanup method
 - Changed: SQL Queries, now using safe_query to escape all strings (big thanks to Thibaut!)
-- Changed: Internal HTML/JS changes to support all types of characters in the sensors name
-- Changed: disabled timeout for smartwares thermostat (no incomming data from device)
-- Implemented: smartwares thermostat, Setpoint popup
-- Implemented: smartwares thermostat, Setpoint, now always logged
-- Fixed: MySensors, switch names where always set to default name (was caused by safe_query changes)
-- Implemented: RGB Popup to select color/on/off
-- Implemented: RFLink: Added various sensors/devices (stuntteam)
-- Implemented: smartwares thermostat, Logging of setpoint value
-- Implemented: smartwares thermostat, Logging of Day/Night switch
-- Implemented: Web Server can now be bind to specific address (-wwwbind) (seb)
-- Implemented: Ability to parse data coming from an HTTP POST data with a lua script (seb)
-- Implemented: Option to enter a description for each sensor/switch/scene
-- Changed: OpenZWave, Alarm/Notification mappings update (xs4)
+- Changed: SQLHelper, spelling mistake (cgaudry)
+- Changed: Switch icon picker now has a fixed height
 - Changed: Windows serial port Enumeration (now also supports windows 10)
-- Implemented: Thermosmart Thermostat
-- Implemented: Option for Dummy device to create Soil Moisture,Leaf Wetness, RGB Switch
-- Implemented: Catch SIGHUP signal for log rotation (LarsForum)
-- Implemented: MySensors added support for S_SCENE_CONTROLLER, V_SCENE_ON, V_SCENE_OFF
-- Implemented: MySensors, renamed V_LIGHT to V_STATUS and V_DIMMER to V_PERCENTAGE to be compliant to the 1.5 API
-- Fixed: Scenes RFY switch command now correctly handled
+- Fixed: 1-Wire negative values
+- Fixed: Battery low (typo) notification
+- Fixed: Counter Incremental small icon display on devices tab
+- Fixed: Davis Logger
+- Fixed: Devices Tab, set device to unused
+- Fixed: Display correct energy graph in devices view (spline instead of bars for short log)
+- Fixed: Email Notifications where always enabled after restart
+- Fixed: EventSystem, _tEventItem.Conditions should not be modified while reading m_events (cgaudry)
+- Fixed: EventSystem, asctime is not thread-safe (replaced with strftime) (cgaudry)
+- Fixed: EventSystem, SIGSEGV (cgaudry)
+- Fixed: EventSystem, splitresults has missing values because m_devicestates is modified while using an iterator on the map (cgaudry)
+- Fixed: HTTP Push table localization (thanks to cgaudry)
+- Fixed: Icon Uploader, uploading went wrong with large files
+- Fixed: MySensors, corrected sending localtime
 - Fixed: MySensors, Negative temperature sensor
-- Implemented: MySensors added support for V_IMPEDANCE
-- Changed: MySensors, rebuild
-- Changed: migrated to github
-- Implemented: Option to add a log message via the json api (see wiki)
 - Fixed: MySensors, S_LIGHT now creates an initial switch again
+- Fixed: MySensors, switch names where always set to default name (was caused by safe_query changes)
 - Fixed: Netatmo, Rain Sensor
+- Fixed: OpenZWave with large homeid values
+- Fixed: Post command handling
+- Fixed: pushover sound notification (thanks to Eduard)
+- Fixed: Revolt, Enery Graph
+- Fixed: Scenes RFY switch command now correctly handled
+- Fixed: Security Panel delay, now again possible to set delay to 0 (directly)
+- Fixed: Temperatures not updated on UI without refreshing browser or changing tabs
+- Fixed: Tooltip bug for the Dusk sensor in the Lights tab
 - Fixed: upgrading via the web interface (some users had experienced a problem)
-- Implemented: Satel Integra hardware support (big thanks to Fantom)
-- Fixed: Icon Uploader, uploading went wrong with large files
-- Implemented: Icon Uploader, now possible to upload zip files with multiple folders
-- Implemented: Icon Uploader, now possible to edit name and description
-- Changed: Switch icon picker now has a fixed height
-- Fixed: Counter Incremental small icon display on devices tab
-- Changed: forced fixed icon sizes on some locations (in case of to big user defined icons)
 - Fixed: Weather tab, nofications
-- Changed: EnOcean rocker inclusion (thanks to zorgluf!)
-- Implemented: Icons for RFXMeter Gas/Water
-- Fixed: MySensors, corrected sending localtime
-- Implemented: OpenZWave, Include/Exclude progress dialog-
-- Changed: non-windows systems, scripts can now use a relative patch to the scripts folder if script does not start with a '/'
-- Implemented: Support for multiple scene/group codes
-- Implemented: Devices Tab, now displaying scenes/groups
-- Implemented: Option to hide scenes/groups (placing a $ in front of the name)
-- Implemented: Scene codes now handles again seperate status (on/off)
-- Implemented: RFXtrx ASA protocol implemented
-- Implemented: Scene, option for 'stop'
-- Implemented: MySensors, V_TEXT, V_HVAC_SETPOINT_COOL and V_HVAC_SETPOINT_HEAT
-- Implemented: MySensors, V_IR_RECEIVE and V_IR_SEND
-- Implemented: Serbian language support, big thanks to siklosi!!
-- Implemented: Slovenian language support, big thanks to eden86!!
-- Implemented: Option to replace an Energy device
-- Changed: OpenZWave, Fibaro Wall Plug, now using multisensor for power reading
-- Fixed: Display correct energy graph in devices view (spline instead of bars for short log)
-- Implemented: MySensors, some more default naming of sensors if they where presented with a name
-- Changed: All Energy sensors have been transfered to General kWh sensors (more accurate)
-- Implemented: Added pushbullet notifications (thanks to tofra!!)
-- Implemented: Added Logitech Media Server support (thanks to EddyK69!!)
-- Implemented: Option how to display the kWh day graph (Power or (k)W/h)
-- Implemented: Dummy Hardware, Ampere Single (single ampere value, other ampere sensor expects 3 values)
-- Implemented: Settings/Log, option to clear all short-log data
-- Implemented: Settings/Backup/Restore, when performing a database backup/restore the database is cleaned
 
 Version 2.2563 (June 14th 2015)
 - Implemented: WebServer, native SSL and keep-alive, big thanks to chimit!!!!