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

Merge branch 'master' into dev 

* master:
  Bump version to 0.15.1
  Only require the API/Express when using it
This commit is contained in:
Andrew Stewart 2014-06-18 15:19:53 -07:00
parent d35b3d8438 c5989c2028
commit a9b874a917
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.markdown
View File

@ -244,6 +244,8 @@ on the [https://github.com/hybridgroup/cylon-site](https://github.com/hybridgrou
## Release History
Version 0.15.1 - Fixed issue with the API on Tessel
Version 0.15.0 - Better halting, cleaner startup, removed 'connect' and 'start'
events, and misc other cleanups/refactors.

5
lib/cylon.js
View File

@ -10,8 +10,7 @@
var Async = require('async');
var API = require('./api'),
Logger = require('./logger'),
var Logger = require('./logger'),
Robot = require('./robot'),
Utils = require('./utils');
@ -60,6 +59,8 @@ Cylon.api = function api(opts) {
opts = {};
}
var API = require('./api');
this.api_instance = new API(opts);
this.api_instance.listen();
};

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "cylon",
"version": "0.15.0",
"version": "0.15.1",
"main": "lib/cylon.js",
"description": "A JavaScript robotics framework using Node.js",
"homepage": "http://cylonjs.com",