From 1fe72e93a999fe38ab3704c30bd2fdab46352466 Mon Sep 17 00:00:00 2001 From: Zaid Abdulla Date: Sat, 7 Dec 2013 01:18:25 +0300 Subject: [PATCH] Fixed bug in getting the configured parameter type. Fixed bug in processing object presets. --- parameters.coffee | 2 +- presets.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parameters.coffee b/parameters.coffee index 011ba2d..c2b5d81 100644 --- a/parameters.coffee +++ b/parameters.coffee @@ -13,9 +13,9 @@ MAX_PARAMETERS = 52 getLsb = (num) -> i = -1 while num > 0 + ++ i break if num & 1 num >>= 1 - ++ i return i diff --git a/presets.coffee b/presets.coffee index c1e8189..b0565ea 100644 --- a/presets.coffee +++ b/presets.coffee @@ -200,7 +200,7 @@ exports.processDevicePreset = (deviceId, devicePreset, callback) -> for objectName, objectDetails of object continue if not objectDetails.current? if objectDetails.preset? - if Object.keys(objectDetails.current) > 0 + if Object.keys(objectDetails.current).length > 0 for i, obj of objectDetails.current for paramName, paramValue of objectDetails.preset continue if paramName[0] == '_' @@ -214,7 +214,7 @@ exports.processDevicePreset = (deviceId, devicePreset, callback) -> for k,v of objectDetails.preset vals.push([k, v]) if k[0] != '_' taskList.push({device : deviceId, name : 'addObject', objectName : parameterPath, parameterValues : vals, instanceName : objectName}) - else if Object.keys(objectDetails.current) > 0 + else if Object.keys(objectDetails.current).length > 0 for i, obj of objectDetails.current taskList.push({device : deviceId, name : 'deleteObject', objectName : "#{parameterPath}.#{i}"})