Skip to content

Added 'validatevalues' global config option & default options bug fix #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bencpeters wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added 'validatevalues' global config option & default options bug fix #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions lib/openzwave.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,32 @@ var _options = {
driverattempts: 3,
pollinterval: 500,
suppressrefresh: true,
}
validatevalues: true,
};
var ZWave = function(path, options) {
options = options || {};
options.modpath = options.modpath || _options.modpath;
options.consoleoutput = options.consoleoutput || _options.consoleoutput;
options.logging = options.logging || _options.logging;
options.saveconfig = options.saveconfig || _options.saveconfig;
options.driverattempts = options.driverattempts || _options.driverattempts;
options.pollinterval = options.pollinterval || _options.pollinterval;
options.suppressrefresh = options.suppressrefresh || _options.suppressrefresh;
options.modpath = options.hasOwnProperty("modpath") ? options.modpath : _options.modpath;
options.consoleoutput = options.hasOwnProperty("consoleoutput") ? options.consoleoutput : _options.consoleoutput;
options.logging = options.hasOwnProperty("logging") ? options.logging : _options.logging;
options.saveconfig = options.hasOwnProperty("saveconfig") ? options.saveconfig : _options.saveconfig;
options.driverattempts = options.hasOwnProperty("driverattempts") ? options.driverattempts : _options.driverattempts;
options.pollinterval = options.hasOwnProperty("pollinterval") ? options.pollinterval : _options.pollinterval;
options.suppressrefresh = options.hasOwnProperty("suppressrefresh") ? options.suppressrefresh : _options.suppressrefresh;
options.validatevalues = options.hasOwnProperty('validatevalues') ? options.validatevalues : _options.validatevalues;
this.path = path;
this.addon = new addon(options);
this.addon.emit = this.emit.bind(this);
}
};

inherits(ZWave, events.EventEmitter);
inherits(ZWave, addon);

ZWave.prototype.connect = function() {
this.addon.connect(this.path);
}
};

ZWave.prototype.disconnect = function() {
this.addon.disconnect(this.path);
}
};

module.exports = ZWave;
10 changes: 9 additions & 1 deletion src/openzwave.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ static std::list<NodeInfo *> znodes;

static uint32_t homeid;

// Validate values option flag
static bool validate_values;

/*
* Return the node for this request.
*/
Expand Down Expand Up @@ -223,7 +226,7 @@ void async_cb_handler(uv_async_t *handle, int status)
node->values.push_back(value);
pthread_mutex_unlock(&znodes_mutex);
}
OpenZWave::Manager::Get()->SetChangeVerified(value, true);
OpenZWave::Manager::Get()->SetChangeVerified(value, validate_values);
}

/*
Expand Down Expand Up @@ -442,6 +445,11 @@ Handle<Value> OZW::New(const Arguments& args)
OpenZWave::Options::Get()->AddOptionBool("SuppressValueRefresh", opts->Get(String::New("suppressrefresh"))->BooleanValue());
OpenZWave::Options::Get()->Lock();

//Validation is technically set on a per-value basis, but requires a reference to the ValueID class to set,
//so would require a more major change to how Values are currently handled on the JS side. Instead this just
//saves to a static/file-scope config var which is picked up in the async callback
validate_values = opts->Get(String::New("validatevalues"))->BooleanValue();

return scope.Close(args.This());
}

Expand Down