p71924506
/
cylon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly execute device commands

This commit is contained in:
Andrew Stewart 2014-08-07 13:44:25 -07:00
parent e6c567a090
commit 7a481f6767
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/hello/hello.js
View File

@ -1,12 +1,16 @@
var Cylon = require('../..'); var Cylon = require('../..');
Cylon.api();
Cylon.robot({ Cylon.robot({
name: 'test',
connection: { name: 'loopback', adaptor: 'loopback' }, connection: { name: 'loopback', adaptor: 'loopback' },
device: { name: 'ping', driver: 'ping' }, device: { name: 'ping', driver: 'ping' },
work: function() { work: function(my) {
every((1).seconds(), function(){ every((1).seconds(), function(){
console.log("Hello, human!") console.log("Hello, human!")
console.log(my.ping.ping());
}); });
after((5).seconds(), function(){ after((5).seconds(), function(){

7
lib/api/routes.js
View File

@ -102,13 +102,12 @@ router.get("/robots/:robot/devices/:device/events/:event", load, function(req, r
}); });
router.get("/robots/:robot/devices/:device/commands", load, function(req, res) { router.get("/robots/:robot/devices/:device/commands", load, function(req, res) {
res.json({ commands: req.device.toJSON().commands }); res.json({ commands: Object.keys(req.device.commands) });
}); });
router.all("/robots/:robot/devices/:device/commands/:command", load, function(req, res) { router.all("/robots/:robot/devices/:device/commands/:command", load, function(req, res) {
var command = req.params.command; var command = req.device.driver.commands[req.params.command];
var result = command.apply(req.device, req.commandParams);
var result = req.device[command].apply(req.device, req.commandParams);
res.json({ result: result }); res.json({ result: result });
}); });

4
lib/device.js
View File

@ -45,7 +45,7 @@ var Device = module.exports = function Device(opts) {
} }
} }
Utils.proxyFunctionsToObject(this.driver.commands, this.driver, this); Utils.proxyFunctionsToObject(Object.keys(this.driver.commands), this.driver, this);
}; };
Utils.subclass(Device, EventEmitter); Utils.subclass(Device, EventEmitter);
@ -86,7 +86,7 @@ Device.prototype.toJSON = function() {
name: this.name, name: this.name,
driver: this.driver.constructor.name || this.driver.name, driver: this.driver.constructor.name || this.driver.name,
connection: this.connection.name, connection: this.connection.name,
commands: this.driver.commands, commands: Object.keys(this.driver.commands),
details: this.details details: this.details
}; };
}; };

2
lib/test/ping.js
View File

@ -15,7 +15,7 @@ var Ping = module.exports = function Ping() {
Ping.__super__.constructor.apply(this, arguments); Ping.__super__.constructor.apply(this, arguments);
this.commands = { this.commands = {
ping: this.ping ping: this.ping.bind(this)
}; };
}; };

2
test/specs/device.spec.js
View File

@ -130,7 +130,7 @@ describe("Device", function() {
}); });
it("contains the device's driver commands", function() { it("contains the device's driver commands", function() {
expect(json.commands).to.be.eql(driver.commands); expect(json.commands).to.be.eql(Object.keys(driver.commands));
}); });
}); });