Always pass hashes with this to resolve param. Fixes #3

lib/tosr0x.js

@@ -272,7 +272,7 @@ T.prototype.send = function (cmd, callback) {
 				s.drain(function (err) {
 					if (resolved(err, rej, callback)) {
 						call(callback, bytesWritten);
-						res(bytesWritten);
+						res({bytesWritten:bytesWritten, ctl: t});
 					}
 				});
 			}
@@ -292,7 +292,7 @@ T.prototype.switch = function (relay, on, callback) {
 	}
 	var cmd = !!on ? T.commands.on : T.commands.off;
 	return this.send(String.fromCharCode(cmd + relay), function (err, ret) {
-		callback(err, ret);
+		call(callback, err, ret);
 		if (!!err) {
 			return;
 		}
@@ -329,7 +329,7 @@ T.prototype.states = T.prototype.refreshStates = function (callback) {
 				t.states[relayCount - x] = (binStates & mask) === mask;
 			}
 			call(callback, t.states);
-			res(t.states);
+			res({states: t.states, ctl: t});
 		});
 	}, this._options.timeout, function () { t.closeImmediate(); });
 	this.send(T.commands.states);
@@ -346,8 +346,8 @@ T.prototype.version = function (callback) {
 			if (data[0] == T.device.moduleId) {
 				v = data[1];
 			}
-			call(callback, v);
-			res(v);
+			call(callback, v, t);
+			res({version: v, ctl: t});
 		});
 	}, this._options.timeout, function () { t.closeImmediate(); });
 	this.send(T.commands.version);
@@ -362,7 +362,7 @@ T.prototype.voltage = function (callback) {
 			// is a fixed floating point with precision of 1
 			var v = data[0] * 0.1;
 			call(callback, v);
-			res(v);
+			res({voltage: v, ctl: t});
 		});
 	}, this._options.timeout, function () { t.closeImmediate(); });
 	this.send(T.commands.voltage);
@@ -374,6 +374,7 @@ T.prototype.temperature = function (callback) {
 	var promise = ptime(function temperature(res, rej) {
 		t.receive(function (data) {
 			call(callback, data);
+			res({temperature: data, ctl: t});
 		}, true);
 	}, this._options.timeout, function () { t.closeImmediate(); });
 	this.send(T.commands.temperature);

test.js

@@ -1,54 +1,72 @@
+'use strict';
 var Tosr0x = require('./lib/tosr0x').Tosr0x;
 var relay = 1;
-var ctl;
 
-//Tosr0x.fromPortScan(null, function (err, ctl) {
-Tosr0x.fromPortScan().then(function (c) {
-	ctl = c;
+console.time('');
+Tosr0x.create().then(function (ctl) {
 	console.log('Controller found!');
+	console.timeEnd('');
+	console.time('');
 	//ctl.open(function (err, ctl) {
 	return ctl.open();
 })
 .then(function (ctl) {
 	console.log('Connected!!!');
+	console.timeEnd('');
+	console.time('');
 	return ctl.version();
 })
-.then(function (version) {
-	console.log('Version is ' + version);
-	return ctl.voltage();
+.then(function (ret) {
+	console.log('Version is ' + ret.version);
+	console.timeEnd('');
+	console.time('');
+	return ret.ctl.voltage();
 })
-.then(function (voltage) {
-	console.log('Voltage is ' + voltage);
-	return ctl.refreshStates();
+.then(function (ret) {
+	console.log('Voltage is ' + ret.voltage);
+	console.timeEnd('');
+	console.time('');
+	return ret.ctl.refreshStates();
 })
-.then(function (states) {
-	console.log('State', states);
+.then(function (ret) {
+	console.log('State', ret.states);
+	console.timeEnd('');
+	console.time('');
+	return ret.ctl;
 })
-.then(function () {
+.then(function (ctl) {
 	console.log('Turning realy ' + relay + ' on');
+	console.timeEnd('');
+	console.time('');
 	//ctl.on(1, function () {
 	return ctl.on(relay);
 })
-.then(function () {
+.then(function (ret) {
 	console.log('Relay ' + relay + ' is on!!!');
+	console.timeEnd('');
 	return new (require('rsvp').Promise)(function (res, rej) {
 		setTimeout(function () {
-			res();
+			console.time('');
+			res(ret.ctl);
 		}, 2000);
 	});
 })
-.then(function () {
+.then(function (ctl) {
+	console.log('Turning relay ' + relay + ' off');
+	console.timeEnd('');
+	console.time('');
 	return ctl.off(relay);
 })
-.then(function () {
-	return ctl.close();
+.then(function (ret) {
+	console.log('Closing...');
+	console.timeEnd('');
+	console.time('');
+	return ret.ctl.close();
 })
 .catch(function (err) {
 	console.error('ERROR ' + err);
 })
 .finally(function () {
-	if (!!ctl) {
-		ctl.closeImmediate();
-	}
+	console.timeEnd('');
 	console.log('Exit.');
 });