dzVents 2.5.0 ( to be used with Lua version 5.3 or newer )

	modified:   History.txt
	modified:   dzVents/documentation/README.md
	modified:   dzVents/documentation/README.wiki
	modified:   dzVents/documentation/history.md
	modified:   dzVents/runtime/Camera.lua
	modified:   dzVents/runtime/Device.lua
	modified:   dzVents/runtime/Time.lua
	modified:   dzVents/runtime/Utils.lua
	modified:   dzVents/runtime/Variable.lua
	modified:   dzVents/runtime/device-adapters/evohome_device.lua
	modified:   dzVents/runtime/device-adapters/generic_device.lua
	modified:   dzVents/runtime/device-adapters/rgbw_device.lua
	modified:   dzVents/runtime/device-adapters/switch_device.lua
	modified:   dzVents/runtime/integration-tests/README.md
	modified:   dzVents/runtime/integration-tests/scriptTestRename.lua
	modified:   dzVents/runtime/integration-tests/stage2.lua
	modified:   dzVents/runtime/misc/testdzVents.sh
	modified:   dzVents/runtime/tests/README.md
	modified:   dzVents/runtime/tests/testDomoticz.lua
	modified:   main/EventSystem.cpp
	modified:   main/dzVents.cpp

Author: rwaaren

History.txt

@@ -22,7 +22,7 @@ Version 4.xxxxx (xxx 2019)
 - Fixed: notification, Telegram error when odd number of underscores in text
 - Fixed: API, allow variabletype to be entered as text or integer in adduservariable and updateuservariable (#3320)
 - Updated: OpenZWave version 1.6
-- Updated: dzVents (version 2.4.29, See dzVents/documentation/history.md)
+- Updated: dzVents (version 2.5.0 for Lua 5.3) See dzVents/documentation/history.md)
 
 Version 4.10717 (May 9th 2019)
 - Fixed: dzVents, Allowing no error message for HTTP calls (#3191)

dzVents/documentation/README.md

@@ -2071,6 +2071,8 @@ In 2.x it is no longer needed to make timed json calls to Domoticz to get extra
 On the other hand, you have to make sure that dzVents can access the json without the need for a password because some commands are issued using json calls by dzVents. Make sure that in Domoticz settings under **Local Networks (no username/password)** you add `127.0.0.1` and you're good to go.
 
 # History
+##[2.5.0]
+- Prepared for Lua 5.3
 
 ##[2.4.29]
 - Add error message including affected module when module got corrupted on disk.

dzVents/documentation/README.wiki

@@ -1,3 +1,6 @@
+[2.5.0]
+- Prepared for Lua 5.3
+
 [2.4.29]
 - Add error message including affected module when module got corrupted on disk.
 - Add setLevel method for switchTypes.

dzVents/documentation/history.md

@@ -14,7 +14,7 @@ local function Camera(domoticz, data, dummyLogger)
 
 	self['name'] = data.name
 	self['id'] = data.id -- actually, this is the idx
-	self['idx'] = data.id -- for completeness
+	self['idx'] = self.id -- for completeness
 	self['baseType'] = data.baseType
 
 	if (_G.TESTMODE) then

dzVents/runtime/Camera.lua

@@ -9,7 +9,6 @@ local function Device(domoticz, data, dummyLogger)
 	local state
 	local adapterManager = Adapters(dummyLogger)
 
-
 	function self.update(nValue, sValue, protected)
 		local params = {
 			idx = self.id,
@@ -27,7 +26,7 @@ local function Device(domoticz, data, dummyLogger)
 
 	self['name'] = data.name
 	self['id'] = data.id -- actually, this is the idx
-	self['idx'] = data.id -- for completeness
+	self['idx'] = self.id -- for completeness
 	self['_data'] = data
 	self['baseType'] = data.baseType
 

dzVents/runtime/Device.lua

@@ -187,14 +187,14 @@ local function Time(sDate, isUTC, _testMS)
 	end
 
 	if sDate == nil or sDate == '' then
-		sDate = makesDate() 
+		sDate = makesDate()
 	end
 
 	local y, mon, d, h, min, s = parseDate(sDate)
 	if not(y and mon and d and h and min and s) then
 		sDate = makesDate()
 		y, mon, d, h, min, s = parseDate(sDate)
-		utils.log('sDate was invalid. Reset to ' .. sDate , utils.LOG_ERROR)  
+		utils.log('sDate was invalid. Reset to ' .. sDate , utils.LOG_ERROR) 
 	end
 
 	-- extract s and ms
@@ -252,10 +252,10 @@ local function Time(sDate, isUTC, _testMS)
 		now.month==time.month and
 		now.day==time.day)
 
-	self['msAgo'] = msDiff
-	self['millisecondsAgo'] = msDiff
+	self['msAgo'] = math.floor(msDiff)
+	self['millisecondsAgo'] = self.msAgo
 	self['minutesAgo'] = minDiff
-	self['secondsAgo'] = secDiff
+	self['secondsAgo'] = math.floor(secDiff)
 	self['hoursAgo'] = hourDiff
 	self['daysAgo'] = dayDiff
 
@@ -285,12 +285,12 @@ local function Time(sDate, isUTC, _testMS)
 			return {
 				mins = minDiff,
 				hours = hourDiff,
-				secs = secDiff,
-				seconds = secDiff,
+				secs = math.floor(secDiff),
+				seconds = math.floor(secDiff),
 				minutes = minDiff,
 				days = dayDiff,
-				ms = msDiff,
-				milliseconds = msDiff,
+				ms = math.floor(msDiff),
+				milliseconds = math.floor(msDiff),
 				compare = cmp -- 0 == equal, -1==(t earlier than self), 1=(t later than self)
 			}
 		else

dzVents/runtime/Time.lua

@@ -8,7 +8,7 @@ local self = {
 	LOG_MODULE_EXEC_INFO = 2,
 	LOG_INFO = 3,
 	LOG_DEBUG = 4,
-	DZVERSION = '2.4.29',
+	DZVERSION = '2.5.0', -- for Lua 5.3
 }
 
 function self.rightPad(str, len, char)
@@ -69,7 +69,8 @@ function self.inTable(searchTable, element)
 end
 
 function self.round(x, n)
-	n = math.pow(10, n or 0)
+	-- n = math.pow(10, n or 0)
+	n = 10^(n or 0)
 	x = x * n
 	if x >= 0 then
 		x = math.floor(x + 0.5)

dzVents/runtime/Utils.lua

@@ -2,7 +2,6 @@ local Time = require('Time')
 local TimedCommand = require('TimedCommand')
 
 local function Variable(domoticz, data)
-
 	local self = {
 		['value'] = data.data.value,
 		['name'] = data.name,
@@ -43,11 +42,15 @@ local function Variable(domoticz, data)
 		self['time'] = Time(time)
 	end
 
-
 	-- send an update to domoticz
 	function self.set(value)
-		if (value == nil) then value = '' end
-
+		 
+		if self.type == 'integer'  then 
+			value = math.floor(value)
+		elseif value == nil then 
+			value = '' 
+		end 
+	
 		-- return TimedCommand(domoticz, 'Variable:' .. data.name, tostring(value), 'variable')
 		return TimedCommand(domoticz, 'Variable', {
 			idx = data.id,
@@ -64,11 +67,15 @@ local function Variable(domoticz, data)
 	end
 
 	function self.rename(newName)
+		local newValue = domoticz.utils.urlEncode(self.value)
+		if self.type == 'integer' then 
+			newValue = math.floor(self.value)
+		end
 		local url = domoticz.settings['Domoticz url'] .. '/json.htm?type=command&param=updateuservariable' ..
 					'&idx=' .. data.id ..
 					'&vname=' .. domoticz.utils.urlEncode(newName) ..
 					'&vtype=' ..  self.type ..
-					'&vvalue=' .. domoticz.utils.urlEncode(self.value)
+					'&vvalue=' .. newValue
 		domoticz.openURL(url)
 	end
 

dzVents/runtime/Variable.lua

@@ -43,14 +43,14 @@ return {
 					"&used=true"
 				return domoticz.openURL(url)
 			end
-		elseif device.deviceSubType == "Relay" then
-			if device._state == "On" then
-				device.state = "On"
-				device.active = true
-			else
-				device.state = "Off"
-				device.active = false
-			end
+		elseif device.deviceSubType == "Relay" then 
+            if device._state == "On" then 
+                device.state = "On" 
+                device.active = true 
+            else 
+                device.state = "Off" 
+                device.active = false 
+            end
 		else
 			device.state = device.rawData[2]
 			device.setPoint = tonumber(device.rawData[1] or 0)
@@ -84,8 +84,8 @@ return {
 						return epoch >= now.dDate and tmISO
 					end
 
-					if type(tm) == 'string' and tm:find(iso8601Pattern) then return inFuture(tm) end				-- Something like '2016-04-29T06:32:58Z'
-					if type(tm) == 'table' and tm.getISO then return inFuture(tm.getISO()) end					  -- a dzVents time object
+					if type(tm) == 'string' and tm:find(iso8601Pattern) then return inFuture(tm) end                -- Something like '2016-04-29T06:32:58Z'
+					if type(tm) == 'table' and tm.getISO then return inFuture(tm.getISO()) end                      -- a dzVents time object
 					if type(tm) == 'table' and tm.day then return inFuture(os.date(iso8601Format,os.time(tm))) end  -- a standard time object
 					if type(tm) == 'number' and tm > now.dDate then return inFuture(os.date(iso8601Format,tm)) end  -- seconds since epoch
 					if type(tm) == 'number' and tm > 0 and tm < ( 365 * 24 * 60 ) then return inFuture(os.date(iso8601Format,now.dDate + ( tm * 60 ))) end  -- seconds since epoch + tm
@@ -99,7 +99,7 @@ return {
 						local res =  type(value) == 'string' and value == mode
 						if res then return res end
 					end
-					return mode == 'Busted' or false
+					return mode == 'Busted' or false 
 				end
 
 				local function binary(num, default)
@@ -108,14 +108,14 @@ return {
 
 				if isValid( tostring(mode) ) then -- is it in the list of valid modes ?
 					local dParm = dParm and checkTimeAndReturnISO(dParm) -- if there is a dParm then check if valid and make a valid ISO date
-					dParm = ( dParm and '&until=' .. dParm ) or ''
-					local action = ( action and '&action=' .. binary(action, 1) ) or '&action=1'
+					dParm = ( dParm and '&until=' .. dParm ) or '' 
+					local action = ( action and '&action=' .. binary(action, 1) ) or '&action=1' 
 					local ooc = ( ooc and '&ooc=' .. binary(ooc, 0) ) or '&ooc=0'
-				   
+					
 					local url = domoticz.settings['Domoticz url'] ..
 								'/json.htm?type=command&param=switchmodal&idx=' .. device.id ..
 								"&status=" .. mode ..
-								dParm ..
+								dParm .. 
 								action ..
 								ooc
 					return domoticz.openURL(url)