more debug info

Author: dannybloe

scripts/dzVents/runtime/Device.lua

@@ -46,7 +46,7 @@ local function Device(domoticz, data, dummyLogger)
 	local adapters = adapterManager.getDeviceAdapters(self)
 
 	for i, adapter in pairs(adapters) do
-		utils.log('Processing adapter for ' .. self.name .. ': ' .. adapter.name, utils.LOG_DEBUG)
+		utils.log('Processing device-adapter for ' .. self.name .. ': ' .. adapter.name, utils.LOG_DEBUG)
 		adapter.process(self, data, domoticz, utils, adapterManager)
 	end
 

scripts/dzVents/runtime/Domoticz.lua

@@ -199,7 +199,7 @@ local function Domoticz(settings)
 	-- have domoticz send an email
 	function self.email(subject, message, mailTo)
 		if (mailTo == nil) then
-			utils.log('No mail to is provide', utils.LOG_DEBUG)
+			utils.log('No mail-to is provided', utils.LOG_ERROR)
 		else
 			if (subject == nil) then subject = '' end
 			if (message == nil) then message = '' end

scripts/dzVents/runtime/EventHelpers.lua

@@ -264,18 +264,8 @@ local function EventHelpers(domoticz, mainMethod)
 
 	function self.processTimeRuleFunction(fn)
 
---		_G.domoticz = {
---			['LOG_INFO'] = utils.LOG_INFO,
---			['LOG_MODULE_EXEC_INFO'] = utils.LOG_MODULE_EXEC_INFO,
---			['LOG_DEBUG'] = utils.LOG_DEBUG,
---			['LOG_ERROR'] = utils.LOG_ERROR,
---			['log'] = self.domoticz.log
---		}
-
 		local ok, res = pcall(fn, self.domoticz)
 
---		_G.domoticz = nil
-
 		if (not ok) then
 			utils.log('Error executing custom timer function.', utils.LOG_ERROR)
 			utils.log(res, utils.LOG_ERROR)

scripts/dzVents/runtime/TimedCommand.lua

@@ -37,7 +37,7 @@ local function TimedCommand(domoticz, name, value)
 
 		local sCommand = table.concat(command, " ")
 
-		utils.log('Constructed command: ' .. sCommand, utils.LOG_DEBUG)
+		utils.log('Constructed timed-command: ' .. sCommand, utils.LOG_DEBUG)
 
 		return sCommand
 	end

scripts/dzVents/runtime/device-adapters/Adapters.lua

@@ -66,7 +66,7 @@ local function DeviceAdapters(dummyLogger)
 				if (adapter.baseType == device.baseType) then
 					local matches = adapter.matches(device, self)
 					if (matches) then
-						utils.log('Adapter found for ' .. device.name .. ': ' .. adapter.name, utils.LOG_DEBUG)
+						utils.log('Device-adapter found for ' .. device.name .. ': ' .. adapter.name, utils.LOG_DEBUG)
 						table.insert(adapters, adapter)
 					end
 				end

scripts/dzVents/runtime/dzVents.lua

@@ -15,14 +15,18 @@ package.path = package.path .. ';' .. currentPath .. 'data/?.lua'
 
 local EventHelpers = require('EventHelpers')
 local helpers = EventHelpers()
+local utils = require('Utils')
 
---local persistence = require('persistence')
---if (_G.TESTMODE == nil) then
---	persistence.store(currentPath .. '/domoticzData.lua', domoticzData)
---end
+if (tonumber(globalvariables['dzVents_log_level']) == utils.LOG_DEBUG) then
+	utils.log('Dumping domoticz data to ' .. currentPath .. '/domoticzData.lua', utils.LOG_DEBUG)
+	local persistence = require('persistence')
+	persistence.store(currentPath .. '/domoticzData.lua', domoticzData)
+end
 
 commandArray = {}
 
+utils.log('Event trigger type: ' .. triggerReason, utils.LOG_DEBUG)
+
 if triggerReason == "time" then
 	commandArray = helpers.dispatchTimerEventsToScripts()
 elseif triggerReason == "device" then
@@ -32,7 +36,7 @@ elseif triggerReason == "uservariable" then
 elseif triggerReason == 'security' then
 	commandArray = helpers.dispatchSecurityEventsToScripts()
 else
-	print ("Unknown trigger: ", triggerReason)
+	utils.log("Unknown trigger: ", triggerReason, utils.LOG_DEBUG)
 end
 
 return commandArray

scripts/dzVents/runtime/tests/testDevice.lua

@@ -330,6 +330,31 @@ describe('device', function()
 			assert.is_same({ { ["UpdateDevice"] = "1|44" } }, commandArray)
 		end)
 
+		it('should detect a security device', function()
+			local device = getDevice(domoticz, {
+				['name'] = 'myDevice',
+				['type'] = 'Security',
+				['subType'] = 'Security Panel'
+			})
+
+			device.disarm()
+
+			assert.is_same({ { ['myDevice'] = 'Disarm' } }, commandArray)
+
+			commandArray = {}
+
+			device.armAway()
+
+			assert.is_same({ { ['myDevice'] = 'Arm Away' } }, commandArray)
+
+			commandArray = {}
+
+			device.armHome()
+
+			assert.is_same({ { ['myDevice'] = 'Arm Home' } }, commandArray)
+
+		end)
+
 		describe('dummy methods', function()
 
 			it('should set dummy methods', function()

scripts/dzVents/runtime/todo.md

@@ -4,10 +4,6 @@
 
 *co2 device?
 
-* define function for all device methods with a warning
-* debug info in each adapater inside the matches
-* check all places for debug info
-* create domoticzdata dump when in debug mode
 
 changes:
 counterToday > number