Merge branch 'proxyasynctcp' into proxycereal

Author: rkluwen

History.txt

@@ -6,7 +6,7 @@ Version 4.xxxx (October xxth 2018)
 - Implemented: RFXMeter, Option to specify meter divider
 - Implemented: Starting implementation of Taiwanese language (big thanks to berry lin!)
 - Fixed: Philips Hue, should work correctly now again
-- Updated: Dzvents (version 2.4.7, See dzVents/documentation/history.md)
+- Updated: Dzvents (version 2.4.8, See dzVents/documentation/history.md )
 
 Version 4.9700 (June 23th 2018)
 - Implemented: Blockly, now possible to directly add/update Text devices

dzVents/documentation/README.md

@@ -623,8 +623,7 @@ The domoticz object has these constants available for use in your code e.g. `dom
  - **HUM_COMFORTABLE**, **HUM_DRY**, **HUM_NORMAL**, **HUM_WET**: constant for humidity status.
  - **INTEGER**, **FLOAT**, **STRING**, **DATE**, **TIME**: variable types.
  - **LOG_DEBUG**, **LOG_ERROR**, **LOG_INFO**, **LOG_FORCE**: for logging messages. LOG_FORCE is at the same level as LOG_ERROR.
- - **NSS_GOOGLE_CLOUD_MESSAGING**, **NSS_HTTP**,
-**NSS_KODI**, **NSS_LOGITECH_MEDIASERVER**, **NSS_NMA**,**NSS_PROWL**, **NSS_PUSHALOT**, **NSS_PUSHBULLET**, **NSS_PUSHOVER**, **NSS_PUSHSAFER**: for notification subsystem
+ - **NSS_GOOGLE_CLOUD_MESSAGING**, **NSS_HTTP**, **NSS_KODI**, **NSS_LOGITECH_MEDIASERVER**, **NSS_NMA**,**NSS_PROWL**, **NSS_PUSHALOT**, **NSS_PUSHBULLET**, **NSS_PUSHOVER**, **NSS_PUSHSAFER**, **NSS_TELEGRAM** <sup>2.4.8</sup>: for notification subsystem
  - **PRIORITY_LOW**, **PRIORITY_MODERATE**, **PRIORITY_NORMAL**, **PRIORITY_HIGH**, **PRIORITY_EMERGENCY**: for notification priority.
  - **SECURITY_ARMEDAWAY**, **SECURITY_ARMEDHOME**, **SECURITY_DISARMED**: for security state.
  - **SOUND_ALIEN** , **SOUND_BIKE**, **SOUND_BUGLE**, **SOUND_CASH_REGISTER**, **SOUND_CLASSICAL**, **SOUND_CLIMB** , **SOUND_COSMIC**, **SOUND_DEFAULT** , **SOUND_ECHO**, **SOUND_FALLING**  , **SOUND_GAMELAN**, **SOUND_INCOMING**, **SOUND_INTERMISSION**, **SOUND_MAGIC** , **SOUND_MECHANICAL**, **SOUND_NONE**, **SOUND_PERSISTENT**, **SOUND_PIANOBAR** , **SOUND_SIREN** , **SOUND_SPACEALARM**, **SOUND_TUGBOAT**  , **SOUND_UPDOWN**: for notification sounds.
@@ -1954,6 +1953,9 @@ On the other hand, you have to make sure that dzVents can access the json withou
 
 # Change log
 
+[2.4.8]
+- Added telegram as option for domoticz.notify
+
 ##[2.4.7]
 - Added support for civil twilight in rules
 

dzVents/documentation/README.wiki

@@ -429,8 +429,14 @@ There are several options for time triggers. It is important to know that Domoti
            'on mon,tue',                -- on Mondays and Tuesdays
            'every hour on sat',         -- you guessed it correctly
            'at sunset',                 -- uses sunset/sunrise info from Domoticz
-           'at sunrise',
+           'at sunrise',           
+           'at civiltwilightstart',     -- uses civil twilight start/end info from Domoticz
+           'at civiltwilightend',
            'at sunset on sat,sun',
+           'xx minutes before civiltwilightstart',
+           'xx minutes after civiltwilightstart',
+           'xx minutes before civiltwilightend',
+           'xx minutes after civiltwilightend',
            'xx minutes before sunset',
            'xx minutes after sunset',
            'xx minutes before sunrise',
@@ -439,6 +445,8 @@ There are several options for time triggers. It is important to know that Domoti
                                         -- aa/bb can be sunrise/sunset
                                         -- aa/bb can be 'xx minutes before/after
                                            sunrise/sunset'
+           'at civildaytime',           -- between civil twilight start and civil twilight end
+           'at civilnighttime',         -- between civil twilight end and civil twilight start
            'at nighttime',              -- between sunset and sunrise
            'at daytime',                -- between sunrise and sunset
            'at daytime on mon,tue',     -- between sunrise and sunset
@@ -513,11 +521,15 @@ The domoticz object holds all information about your Domoticz system. It has glo
 * '''startTime''': ''[[#Time_object|Time Object]]''. Returns the startup time of the Domoticz service.
 * '''systemUptime''': ''Number''. Number of seconds the system is up.
 * '''time''': ''[[#Time_object|Time Object]]'': Current system time. Additional to Time object attributes:
-** '''isDayTime'''
-** '''isNightTime'''
+** '''isDayTime''': ''Boolean''
+** '''isNightTime''': ''Boolean''
+** '''isCivilDayTime''': ''Boolean''. <sup>2.4.7</sup>
+** '''isCivilNightTime''': ''Boolean''. <sup>2.4.7</sup>
 ** '''isToday''': ''Boolean''. Indicates if the device was updated today
 ** '''sunriseInMinutes''': ''Number''. Number of minutes since midnight when the sun will rise.
 ** '''sunsetInMinutes''': ''Number''. Number of minutes since midnight when the sun will set.
+** '''civTwilightStartInMinutes''': ''Number''. <sup>2.4.7</sup> Number of minutes since midnight when the civil twilight will start.
+** '''civTwilightEndInMinutes''': ''Number''. <sup>2.4.7</sup> Number of minutes since midnight when the civil twilight will end.
 * '''utils''': <sup>2.4.0</sup>. A subset of handy utilities:
 * _: Lodash. This is an entire collection with very handy Lua functions. Read more about [[#Lodash_for_Lua|Lodash]]. E.g.: <code>domoticz.utils._.size({'abc', 'def'}))</code> Returns 2.
 * '''fileExists(path)''': ''Function'': <sup>2.4.0</sup> Returns <code>true</code> if the file (with full path) exists.
@@ -602,7 +614,7 @@ The domoticz object has these constants available for use in your code e.g. <cod
 * '''HUM_COMFORTABLE''', '''HUM_DRY''', '''HUM_NORMAL''', '''HUM_WET''': constant for humidity status.
 * '''INTEGER''', '''FLOAT''', '''STRING''', '''DATE''', '''TIME''': variable types.
 * '''LOG_DEBUG''', '''LOG_ERROR''', '''LOG_INFO''', '''LOG_FORCE''': for logging messages. LOG_FORCE is at the same level as LOG_ERROR.
-* '''NSS_GOOGLE_CLOUD_MESSAGING''', '''NSS_HTTP''', '''NSS_KODI''', '''NSS_LOGITECH_MEDIASERVER''', '''NSS_NMA''','''NSS_PROWL''', '''NSS_PUSHALOT''', '''NSS_PUSHBULLET''', '''NSS_PUSHOVER''', '''NSS_PUSHSAFER''': for notification subsystem
+* '''NSS_GOOGLE_CLOUD_MESSAGING''', '''NSS_HTTP''', '''NSS_KODI''', '''NSS_LOGITECH_MEDIASERVER''', '''NSS_NMA''','''NSS_PROWL''', '''NSS_PUSHALOT''', '''NSS_PUSHBULLET''', '''NSS_PUSHOVER''', '''NSS_PUSHSAFER''', '''NSS_TELEGRAM''' <sup>2.4.8</sup>: for notification subsystem
 * '''PRIORITY_LOW''', '''PRIORITY_MODERATE''', '''PRIORITY_NORMAL''', '''PRIORITY_HIGH''', '''PRIORITY_EMERGENCY''': for notification priority.
 * '''SECURITY_ARMEDAWAY''', '''SECURITY_ARMEDHOME''', '''SECURITY_DISARMED''': for security state.
 * '''SOUND_ALIEN''' , '''SOUND_BIKE''', '''SOUND_BUGLE''', '''SOUND_CASH_REGISTER''', '''SOUND_CLASSICAL''', '''SOUND_CLIMB''' , '''SOUND_COSMIC''', '''SOUND_DEFAULT''' , '''SOUND_ECHO''', '''SOUND_FALLING''' , '''SOUND_GAMELAN''', '''SOUND_INCOMING''', '''SOUND_INTERMISSION''', '''SOUND_MAGIC''' , '''SOUND_MECHANICAL''', '''SOUND_NONE''', '''SOUND_PERSISTENT''', '''SOUND_PIANOBAR''' , '''SOUND_SIREN''' , '''SOUND_SPACEALARM''', '''SOUND_TUGBOAT''' , '''SOUND_UPDOWN''': for notification sounds.
@@ -2026,6 +2038,12 @@ In 2.x it is no longer needed to make timed json calls to Domoticz to get extra
 
 = Change log =
 
+[2.4.8] - Added telegram as option for domoticz.notify
+
+== [2.4.7] ==
+
+* Added support for civil twilight in rules
+
 == [2.4.6] ==
 
 * Added Youless device

dzVents/documentation/history.md

@@ -1,3 +1,6 @@
+[2.4.8]
+- Added telegram as option for domoticz.notify
+
 [2.4.7]
 - Added support for civil twilight in rules
 

dzVents/runtime/Domoticz.lua

@@ -136,6 +136,7 @@ local function Domoticz(settings)
 		['NSS_PUSHBULLET'] = 'pushbullet',
 		['NSS_PUSHOVER'] = 'pushover',
 		['NSS_PUSHSAFER'] = 'pushsafer',
+		['NSS_TELEGRAM'] = 'telegram',
 		['BASETYPE_DEVICE'] = 'device',
 		['BASETYPE_SCENE'] = 'scene',
 		['BASETYPE_GROUP'] = 'group',

dzVents/runtime/Utils.lua

@@ -103,7 +103,7 @@ function self.log(msg, level)
 
 
 	if (level == self.LOG_ERROR) then
-		marker = marker .. 'Error (2.4.7): '
+		marker = marker .. 'Error (2.4.8): '
 	elseif (level == self.LOG_DEBUG) then
 		marker = marker .. 'Debug: '
 	elseif (level == self.LOG_INFO or level == self.LOG_MODULE_EXEC_INFO) then

dzVents/runtime/dzVents.lua

@@ -39,7 +39,7 @@ if (tonumber(globalvariables['dzVents_log_level']) == utils.LOG_DEBUG or TESTMOD
 
 	local events, length = helpers.getEventSummary()
 	if (length > 0) then
-		print('Debug: dzVents version: 2.4.7')
+		print('Debug: dzVents version: 2.4.8')
 
 		print('Debug: Event triggers:')
 		for i, event in pairs(events) do

dzVents/runtime/tests/testUtils.lua

@@ -38,7 +38,7 @@ describe('event helpers', function()
 			end
 
 			utils.log('abc', utils.LOG_ERROR)
-			assert.is_same('Error (2.4.7): abc', printed)
+			assert.is_same('Error (2.4.8): abc', printed)
 		end)
 
 		it('shoud log INFO by default', function()

hardware/OpenZWave.cpp

@@ -1743,7 +1743,7 @@ void COpenZWave::AddValue(const OpenZWave::ValueID &vID, const NodeInfo *pNodeIn
 					else
 						_device.scaleID = SCALEID_POWER;
 					_device.scaleMultiply = 1;
-					if (vUnits == "kWh")
+					if ((vUnits == "kWh") || (vUnits == "kVAh"))
 					{
 						_device.scaleMultiply = 1000;
 						_device.devType = ZDTYPE_SENSOR_POWERENERGYMETER;
@@ -1928,7 +1928,7 @@ void COpenZWave::AddValue(const OpenZWave::ValueID &vID, const NodeInfo *pNodeIn
 					else
 						_device.scaleID = SCALEID_POWER;
 					_device.scaleMultiply = 1;
-					if (vUnits == "kWh")
+					if ((vUnits == "kWh") || (vUnits == "kVAh"))
 					{
 						_device.scaleMultiply = 1000;
 						_device.devType = ZDTYPE_SENSOR_POWERENERGYMETER;

hardware/P1MeterBase.cpp

@@ -254,9 +254,12 @@ bool P1MeterBase::MatchLine()
 					if (m_voltagel3)
 						SendVoltageSensor(0, 3, 255, m_voltagel3, "Voltage L3");
 				}
+				/* The ampere is rounded to whole numbers and therefor not accurate enough
+				//we could calculate this ourselfs I=P/U I1=(m_power.powerusage1/m_voltagel1)
 				if (m_amperagel1 || m_amperagel2 || m_amperagel3 ) {
 					SendCurrentSensor(1, 255, m_amperagel1, m_amperagel2, m_amperagel3, "Amperage" );
 				}
+				*/
 				if ((m_gas.gasusage > 0) && ((m_gas.gasusage != m_lastgasusage) || (difftime(atime, m_lastSharedSendGas) >= 300)))
 				{
 					//only update gas when there is a new value, or 5 minutes are passed