+ * @license MIT License – http://www.opensource.org/licenses/mit-license.php
+ * @url https://github.com/semu/noduino
+ */
+
define(function() {
function DigitalInput(options, Connector) {
@@ -5,7 +15,7 @@ define(function() {
return new DigitalInput(options); }
this.c = Connector;
- this.pin = options.pin;
+ this.pin = this.c.normalizePin(options.pin);
this.pushed = false;
this.events = {};
diff --git a/public/scripts/libs/LED.js b/public/scripts/libs/LED.js
index 37826df..f2b837b 100644
--- a/public/scripts/libs/LED.js
+++ b/public/scripts/libs/LED.js
@@ -1,17 +1,21 @@
-define(['./DigitalOutput'], function(LED) {
+define(['./DigitalOutput.js'], function(LED) {
LED.prototype.toggle = function(callback) {
if (this.mode == this.c.LOW) {
return this.setOn(callback); }
this.setOff(callback);
};
+
+ LED.prototype.stopBlinking = function() {
+ if (this.interval) {
+ clearInterval(this.interval); }
+ }
LED.prototype.blink = function(interval) {
if (interval*1 < 25) {
interval = 50; }
- if (this.interval) {
- clearInterval(this.interval); }
-
+ this.stopBlinking();
+
var that = this;
this.interval = setInterval(function(){
that.toggle();
diff --git a/public/scripts/libs/Logger.HTML.js b/public/scripts/libs/Logger.HTML.js
new file mode 100644
index 0000000..40a92d2
--- /dev/null
+++ b/public/scripts/libs/Logger.HTML.js
@@ -0,0 +1,62 @@
+define(function() {
+
+ function HTMLLogger(options) {
+ if (false === (this instanceof HTMLLogger)) {
+ return new HTMLLogger(options); }
+
+ this.container = 'connection-log';
+ this.counter = 0;
+ };
+
+ HTMLLogger.prototype.setOption = function(key, value) {
+ this[key] = value;
+ };
+
+ HTMLLogger.prototype.setContainer = function(selector) {
+ this.container = selector;
+ };
+
+ HTMLLogger.prototype.msg = function(level, msg) {
+ if (!msg) {
+ msg = level;
+ level = 'info';
+ }
+
+ this.addMessage(level, msg);
+ };
+
+ HTMLLogger.prototype.colorizeLogLevel = function(level) {
+ var levelclass = '';
+ switch (level) {
+ case 'info':
+ break;
+ case 'gui':
+ levelclass = 'label-important';
+ break;
+ case 'success':
+ levelclass = 'label-success';
+ break;
+ case 'socket-write':
+ levelclass = 'label-info';
+ break;
+ case 'socket-read':
+ levelclass = 'label-warning';
+ break;
+ }
+
+ return '' + level + '';
+ };
+
+ HTMLLogger.prototype.addMessage = function(level, msg) {
+ $("#connection-log").append($('$ > ' + Date.now() + ' – ' + this.colorizeLogLevel(level) + ' ' + msg + '
'));
+ // var objDiv = document.getElementById("connection-log");
+ // objDiv.scrollTop = objDiv.scrollHeight;
+
+ this.counter++;
+ if (this.counter > 18) {
+ $("#connection-log .item:nth-child(1)").remove();
+ }
+ };
+
+ return HTMLLogger;
+});
\ No newline at end of file
diff --git a/public/scripts/libs/Logger.js b/public/scripts/libs/Logger.js
new file mode 100644
index 0000000..8858d52
--- /dev/null
+++ b/public/scripts/libs/Logger.js
@@ -0,0 +1,29 @@
+define(function() {
+
+ function ConsoleLogger(options) {
+ if (false === (this instanceof ConsoleLogger)) {
+ return new ConsoleLogger(options); }
+ if (!options) {
+ var options = {}; }
+
+ this.delegate = null;
+ this.debug = options.debug || false;
+ };
+
+ ConsoleLogger.prototype.msg = function(level, msg) {
+ if (!msg) {
+ msg = level;
+ level = 'info';
+ }
+
+ this.addMessage(level, msg);
+ };
+
+ ConsoleLogger.prototype.addMessage = function(level, msg) {
+ if (!this.debug) {
+ return; }
+ console.log(arguments);
+ };
+
+ return ConsoleLogger;
+});
\ No newline at end of file
diff --git a/public/scripts/libs/Noduino.Serial.js b/public/scripts/libs/Noduino.Serial.js
index 1c0410e..7a7be72 100644
--- a/public/scripts/libs/Noduino.Serial.js
+++ b/public/scripts/libs/Noduino.Serial.js
@@ -7,6 +7,15 @@ define(function(require, exports, module) {
this.options = options;
this.boards = [];
this.board = null;
+ this.logger = null;
+ };
+
+ SerialNoduino.prototype.setLogger = function(Logger) {
+ this.logger = Logger;
+ };
+
+ SerialNoduino.prototype.log = function(level, msg) {
+ this.logger.msg(level, msg);
};
SerialNoduino.prototype.connection = 'serial';
@@ -35,7 +44,7 @@ define(function(require, exports, module) {
new Board({'debug': this.options.debug || false}, function(err, board) {
if (err) { return next(new Error('Unable to connect')); }
- // Disabled multi board support now
+ // Disabled multi board support now, but keep in mind…
that.boards = [board];
that.board = 0;
@@ -60,11 +69,10 @@ define(function(require, exports, module) {
}
SerialNoduino.prototype.digitalWrite = function(pin, mode, next) {
- console.log('set ' + pin + ': ' + mode);
this.current().digitalWrite(pin, mode, next);
};
- SerialNoduino.prototype.watchAnalogIn = function(AnalogInput) {
+ SerialNoduino.prototype.watchAnalogIn = function(AnalogInput, callback) {
var that = this;
setInterval(function () {
that.current().analogRead(AnalogInput.pin);
@@ -72,14 +80,13 @@ define(function(require, exports, module) {
this.current().on('data', function(m) {
m = m.split('::');
- var eventPin = m[0]*1;
- if (m[0].indexOf('A') > -1) {
- eventPin = m[0]; }
-
- var event = {pin: eventPin, 'state': m[1]*1};
+ var event = {pin: that.normalizePin(m[0]), 'state': m[1]*1};
+
+ if (callback) {
+ return callback(event); }
+
if (event.pin == AnalogInput.pin) {
- AnalogInput.set(event.state);
- }
+ AnalogInput.set(event.state); }
});
}
@@ -91,20 +98,13 @@ define(function(require, exports, module) {
return ("00" + pin).substr(-2);
};
-
- SerialNoduino.prototype.log = function (level, message) {
- console.log(message);
- }
-
-
SerialNoduino.prototype.digitalRead = function(pin) {
- console.log(pin);
pin = this.normalizePin(pin);
this.log('info', 'digitalRead from pin ' + pin);
this.write('02' + pin + this.normalizeVal(0));
};
- SerialNoduino.prototype.watchDigitalIn = function(DigitalIn) {
+ SerialNoduino.prototype.watchDigitalIn = function(DigitalIn, callback) {
var that = this;
setInterval(function () {
@@ -113,8 +113,11 @@ define(function(require, exports, module) {
this.current().on('data', function(m) {
m = m.split('::');
- var event = {pin: m[0]*1, 'state': m[1]*1};
-
+ var event = {pin: that.normalizePin(m[0]), 'state': m[1]*1};
+
+ if (callback) {
+ return callback(event); }
+
if (event.pin == DigitalIn.pin) {
if (event.state == 0 && DigitalIn.isOn()) {
DigitalIn.setOff();
@@ -124,32 +127,7 @@ define(function(require, exports, module) {
}
}
});
- }
-
-
-
- /* SerialNoduino.prototype.watchDigitalIn = function(Button) {
- var that = this;
-
- setInterval(function () {
- that.digitalRead(Button.pin);
- }, 50);
-
- this.current().on('data', function(m) {
- m = m.split('::');
- var event = {pin: m[0]*1, 'state': m[1]*1};
-
- if (event.pin == Button.pin) {
- if (event.state == 0 && Button.pushed) {
- Button.release();
- }
- if (event.state == 1 && !Button.pushed) {
- Button.push();
- }
- }
- });
- } */
+ };
return SerialNoduino;
-});
-
+});
\ No newline at end of file
diff --git a/public/scripts/libs/Noduino.Socket.js b/public/scripts/libs/Noduino.Socket.js
index 712d15f..37ecf13 100644
--- a/public/scripts/libs/Noduino.Socket.js
+++ b/public/scripts/libs/Noduino.Socket.js
@@ -15,13 +15,21 @@ define(function(require, exports, module) {
this.options = options;
this.boards = [];
this.board = null;
-
+ this.logger = null;
this.io = null;
this.sockets = [];
this.callbacks= {};
this.checkSocket();
};
+ SocketNoduino.prototype.setLogger = function(Logger) {
+ this.logger = Logger;
+ };
+
+ SocketNoduino.prototype.log = function(level, msg) {
+ return this.logger.msg(level, msg);
+ };
+
SocketNoduino.prototype.connection = 'serial';
SocketNoduino.prototype.HIGH = '255';
SocketNoduino.prototype.LOW = '000';
@@ -42,7 +50,6 @@ define(function(require, exports, module) {
SocketNoduino.prototype.checkSocket = function() {
/** This is Client code: This works in your web browser */
if (!this.io) {
- console.log('connect to: ' + this.options.host);
this.io = io.connect(this.options.host);
this.boards[0] = Board;
}
@@ -82,19 +89,20 @@ define(function(require, exports, module) {
this.callbacks['board.connect'] = []; }
this.callbacks['board.connect'].push(next);
-
- this.io.emit('board.connect');
+ this.log('sending command through socket');
+ this.pushSocket('board.connect');
return;
}
+ SocketNoduino.prototype.pushSocket = function(type, data) {
+ this.log('socket-write', type + ': ' + JSON.stringify(data));
+ this.io.emit(type, data);
+ }
+
SocketNoduino.prototype.write = function(cmd, callback) {
this.log('info', 'writing: ' + cmd);
- this.io.emit('serial', {'type': 'write', 'write': cmd, 'id': this.io.socket.sessionid});
- };
-
- SocketNoduino.prototype.sendCommand = function(cmd, callback) {
- // this.io.emit('serial', {'send': cmd});
+ this.pushSocket('serial', {'type': 'write', 'write': cmd, 'id': this.io.socket.sessionid});
};
SocketNoduino.prototype.pinMode = function(pin, val) {
@@ -113,17 +121,12 @@ define(function(require, exports, module) {
return ("00" + pin).substr(-2);
};
- SocketNoduino.prototype.log = function (level, message) {
- console.log(message);
- }
-
SocketNoduino.prototype.withLED = function(pin, next) {
this.pinMode(pin, this.MODE_OUT);
next(null, pin);
};
SocketNoduino.prototype.withButton = function(pin, next) {
- console.log('in NoduinoSocket.withButton');
this.pinMode(pin, this.MODE_IN);
next(null, pin);
};
@@ -144,39 +147,36 @@ define(function(require, exports, module) {
};
SocketNoduino.prototype.watchAnalogIn = function(AnalogInput) {
- return;
-
-
var that = this;
- setInterval(function () {
- that.current().analogRead(AnalogInput.pin);
- }, 50);
-
- this.current().on('data', function(m) {
- m = m.split('::');
- var eventPin = m[0]*1;
- if (m[0].indexOf('A') > -1) {
- eventPin = m[0]; }
- var event = {pin: eventPin, 'state': m[1]*1};
- if (event.pin == AnalogInput.pin) {
- AnalogInput.set(event.state);
+ this.analogRead(AnalogInput.pin);
+ this.io.on('response', function(data) {
+ if (data.type == 'analogRead' && data.pin == AnalogInput.pin) {
+ that.log('socket-read', JSON.stringify(data));
+ var event = {pin: data.pin, value: data.value*1};
+ if (event.pin == AnalogInput.pin) {
+ AnalogInput.set(event.value);
+ }
}
});
}
- SocketNoduino.prototype.digitalRead = function (DigitalIn) {
- pin = this.normalizePin(DigitalIn.pin);
- this.io.emit('serial', {'type': 'digitalRead', 'pin': pin});
+ SocketNoduino.prototype.analogRead = function (pin) {
+ this.pushSocket('serial', {'type': 'analogRead', 'pin': this.normalizePin(pin)});
}
+ SocketNoduino.prototype.digitalRead = function (pin) {
+ this.pushSocket('serial', {'type': 'digitalRead', 'pin': this.normalizePin(pin)});
+ }
SocketNoduino.prototype.watchDigitalIn = function(DigitalIn) {
var that = this;
+ this.digitalRead(DigitalIn.pin);
this.io.on('response', function(data) {
- if (data.type == 'digitalRead') {
- console.log(data);
+ if (data.type == 'digitalRead' && data.pin == DigitalIn.pin) {
+ that.log('socket-read', JSON.stringify(data));
+
if (data.value == 1) {
DigitalIn.setOn(); }
else {
diff --git a/public/scripts/libs/Noduino.js b/public/scripts/libs/Noduino.js
index 4a573f4..ee0b24c 100644
--- a/public/scripts/libs/Noduino.js
+++ b/public/scripts/libs/Noduino.js
@@ -1,18 +1,37 @@
-define(['./Board'], function (objBoard, ConnectorSerial, ConnectorSocket) {
-
+define(['./Board.js'], function (objBoard) {
/**
* Create Noduini object for handling general access
* @param object options
*/
- function Noduino(options, Connector) {
+ function Noduino(options, Connector, Logger) {
if (false === (this instanceof Noduino)) {
return new Noduino(options); }
- this.c = new Connector(options);
+ this.c = new Connector(options)
+ this.logger = new Logger(options);
this.options = options;
this.options.type = this.c.connection;
+ this.connected = false;
+
+ this.setLoggerOptions();
+ this.setLogger();
+ };
+
+ Noduino.prototype.setLoggerOptions = function() {
+ if (!this.options.logger) {
+ return; }
+ for (var n in this.options.logger) {
+ this.logger.setOption(n, this.options.logger[n]); }
+ };
+
+ Noduino.prototype.setLogger = function() {
+ this.c.setLogger(this.logger);
};
+ Noduino.prototype.log = function(level, msg) {
+ this.c.log(level, msg);
+ }
+
Noduino.prototype.write = function(data) {
this.c.write(data);
}
@@ -20,17 +39,24 @@ define(['./Board'], function (objBoard, ConnectorSerial, ConnectorSocket) {
Noduino.prototype.digitalRead = function(pin) {
this.c.digitalRead(pin);
}
+
+ Noduino.prototype.watchAnalogIn = function(pin, callback) {
+ this.c.watchAnalogIn(pin, callback);
+ }
Noduino.prototype.watchDigitalIn = function(pin, callback) {
this.c.watchDigitalIn(pin, callback);
}
Noduino.prototype.connect = function(options, callback) {
+ this.log('connecting to noduino');
+
if (!callback) {
callback = options; options = {}; }
var that = this;
this.c.connect(options, function(err, board) {
if (err) { return callback(err); }
+ that.connected = true;
callback(null, new objBoard(options, that.c));
});
}
diff --git a/public/scripts/libs/Speaker.js b/public/scripts/libs/Speaker.js
index 781410f..7532d8b 100644
--- a/public/scripts/libs/Speaker.js
+++ b/public/scripts/libs/Speaker.js
@@ -1,4 +1,4 @@
-define(['./DigitalOutput'], function (Speaker) {
+define(['./DigitalOutput.js'], function (Speaker) {
Speaker.prototype.isMuted = function() {
return !this.active;
diff --git a/public/scripts/main.js b/public/scripts/main.js
deleted file mode 100755
index 03d22e9..0000000
--- a/public/scripts/main.js
+++ /dev/null
@@ -1,6 +0,0 @@
-require(["jquery", "prettify", "events"], function($, p, events) {
- $(document).ready(function(e) {
- prettyPrint();
- events.bind();
- });
-});
\ No newline at end of file
diff --git a/public/scripts/domready.js b/public/scripts/vendor/domready.js
similarity index 100%
rename from public/scripts/domready.js
rename to public/scripts/vendor/domready.js
diff --git a/public/scripts/vendor/dropdown.js b/public/scripts/vendor/dropdown.js
new file mode 100644
index 0000000..f1f6c33
--- /dev/null
+++ b/public/scripts/vendor/dropdown.js
@@ -0,0 +1,92 @@
+/* ============================================================
+ * bootstrap-dropdown.js v2.0.1
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function( $ ){
+
+ "use strict"
+
+ /* DROPDOWN CLASS DEFINITION
+ * ========================= */
+
+ var toggle = '[data-toggle="dropdown"]'
+ , Dropdown = function ( element ) {
+ var $el = $(element).on('click.dropdown.data-api', this.toggle)
+ $('html').on('click.dropdown.data-api', function () {
+ $el.parent().removeClass('open')
+ })
+ }
+
+ Dropdown.prototype = {
+
+ constructor: Dropdown
+
+ , toggle: function ( e ) {
+ var $this = $(this)
+ , selector = $this.attr('data-target')
+ , $parent
+ , isActive
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+ }
+
+ $parent = $(selector)
+ $parent.length || ($parent = $this.parent())
+
+ isActive = $parent.hasClass('open')
+
+ clearMenus()
+ !isActive && $parent.toggleClass('open')
+
+ return false
+ }
+
+ }
+
+ function clearMenus() {
+ $(toggle).parent().removeClass('open')
+ }
+
+
+ /* DROPDOWN PLUGIN DEFINITION
+ * ========================== */
+
+ $.fn.dropdown = function ( option ) {
+ return this.each(function () {
+ var $this = $(this)
+ , data = $this.data('dropdown')
+ if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+ if (typeof option == 'string') data[option].call($this)
+ })
+ }
+
+ $.fn.dropdown.Constructor = Dropdown
+
+
+ /* APPLY TO STANDARD DROPDOWN ELEMENTS
+ * =================================== */
+
+ $(function () {
+ $('html').on('click.dropdown.data-api', clearMenus)
+ $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+ })
+
+}( window.jQuery );
\ No newline at end of file
diff --git a/public/scripts/prettify.js b/public/scripts/vendor/prettify.js
similarity index 100%
rename from public/scripts/prettify.js
rename to public/scripts/vendor/prettify.js
diff --git a/public/scripts/require-jquery.js b/public/scripts/vendor/require-jquery.js
similarity index 100%
rename from public/scripts/require-jquery.js
rename to public/scripts/vendor/require-jquery.js
diff --git a/public/styles/init.css b/public/styles/init.css
index cd7416d..f353c00 100644
--- a/public/styles/init.css
+++ b/public/styles/init.css
@@ -93,3 +93,8 @@ form.well{padding:14px;}
.response.error{color:red;}
label.label{display:inline;}
#e2-secondStep select{margin-right:4px;}
+.exampleLinks{margin-top:8px;}
+.range{margin-bottom:0px;position:relative;top:-9px;margin-left:12px;width:373px;}
+.interval{margin-bottom:0px;position:relative;top:-9px;margin-left:12px;width:60px;}
+.collectedTags{margin-top:14px;}
+#connection-log{height:358px;overflow:hidden;padding-top:4px;overflow-x:hidden;margin-bottom:16px;}
diff --git a/public/styles/init.less b/public/styles/init.less
index 64f07cf..3892d53 100755
--- a/public/styles/init.less
+++ b/public/styles/init.less
@@ -814,4 +814,32 @@ label.label { display: inline; }
#e2-secondStep select {
margin-right: 4px;
-}
\ No newline at end of file
+}
+.exampleLinks {
+ margin-top: 8px;
+}
+.range {
+ margin-bottom: 0px;
+ position: relative;
+ top: -9px;
+ margin-left: 12px;
+ width: 373px;
+}
+.interval {
+ margin-bottom: 0px;
+ position: relative;
+ top: -9px;
+ margin-left: 12px;
+ width: 60px;
+}
+.collectedTags {
+ margin-top: 14px;
+}
+
+#connection-log {
+ height: 358px;
+ overflow: hidden;
+ padding-top: 4px;
+ overflow-x: hidden;
+ margin-bottom: 16px;
+}
diff --git a/public/wiring/walkLED.fzz b/public/wiring/walkLED.fzz
new file mode 100644
index 0000000..c3a75ce
Binary files /dev/null and b/public/wiring/walkLED.fzz differ
diff --git a/public/wiring/walkLED.png b/public/wiring/walkLED.png
new file mode 100644
index 0000000..e5dedd8
Binary files /dev/null and b/public/wiring/walkLED.png differ
diff --git a/srv.app.js b/srv.app.js
index fa09519..038160d 100644
--- a/srv.app.js
+++ b/srv.app.js
@@ -1,3 +1,12 @@
+/**
+ * srv.app.js – Handling HTTP:80 Requests
+ * This file is part of noduino (c) 2012 Sebastian Müller
+ *
+ * @package noduino
+ * @author Sebastian Müller
+ * @license MIT License – http://www.opensource.org/licenses/mit-license.php
+ * @url https://github.com/semu/noduino
+ */
define(['kickstart', 'module', 'path', 'fs'], function (kickstart, module, path, fs) {
var kickstart = kickstart.withConfig({'name': 'localhost', 'port': 8080, 'path': './'});
var srv = kickstart.srv();
@@ -13,8 +22,12 @@ define(['kickstart', 'module', 'path', 'fs'], function (kickstart, module, path,
}
srv.all('/', function(req, res) {
- res.render('home', {title: 'noduino', 'examples': examples});
+ res.render('home', {jsApp: 'main', active: 'home', title: 'noduino', 'examples': examples});
});
-
+
+ srv.all('/examples/walkLED.html', function(req, res) {
+ res.render('example-walkLED', {jsApp: 'walkLED', active: 'examples', title: 'noduino', 'examples': examples});
+ });
+
return {'kickstart': kickstart, 'srv': srv};
});
\ No newline at end of file
diff --git a/srv.socket.js b/srv.socket.js
index aaf1872..d745266 100644
--- a/srv.socket.js
+++ b/srv.socket.js
@@ -1,50 +1,86 @@
-define(['socket.io', 'public/scripts/libs/Noduino', 'public/scripts/libs/Noduino.Serial'], function(io, Noduino, Connector) {
+/**
+ * srv.web.js – Handling Socket.IO Requests
+ * This file is part of noduino (c) 2012 Sebastian Müller
+ *
+ * @package noduino
+ * @author Sebastian Müller
+ * @license MIT License – http://www.opensource.org/licenses/mit-license.php
+ * @url https://github.com/semu/noduino
+ */
+define(['socket.io', 'public/scripts/libs/Noduino', 'public/scripts/libs/Noduino.Serial', 'public/scripts/libs/Logger'], function(io, Noduino, Connector, Logger) {
+ /**
+ * Define SocketHandler
+ * @param object socket Socket.IO
+ */
var SocketHandler = function(socket) {
this.sockets = {};
this.arduinos = {};
this.handler = socket.listen(8090);
+ this.pinCache = {};
this.bindings();
};
+ /**
+ * Get selected Arduino
+ */
SocketHandler.prototype.current = function() {
return this.arduinos[0];
};
+ /**
+ * Connect Bindings
+ */
SocketHandler.prototype.bindings = function() {
var io = this.handler, that = this;
io.sockets.on('connection', function(socket) {
that.sockets[socket.id] = socket;
+ /**
+ * Incoming Serial Request
+ */
that.sockets[socket.id].on('serial', function(data) {
switch (data.type) {
case 'write':
that.current().write(data.write);
break;
+ case 'analogRead':
+ var curPin = data.pin;
+ that.current().watchAnalogIn({'pin': data.pin}, function(m) {
+ if (!m.pin || m.pin == null || m.pin == NaN) {
+ return; }
+
+ if (m.state != that.pinCache[m.pin] && curPin == m.pin) {
+ socket.emit('response', {'type': 'analogRead', 'pin': m.pin, 'value': m.state});
+ that.pinCache[m.pin] = m.state;
+ }
+ });
+ break;
case 'digitalRead':
- var currentValue = null;
- that.current().watchDigitalIn(data.pin*1, function(m) {
- if (currentValue == null || currentValue != m.state) {
- socket.emit('response', {'type': 'digitalRead', 'pin': m.ping, 'value': m.state});
- currentValue = m.state;
+ var curPin = data.pin;
+ that.current().watchDigitalIn({'pin': data.pin}, function(m) {
+ if (!m.pin || m.pin == null || m.pin == NaN) {
+ return; }
+
+ if (m.state != that.pinCache[m.pin] && curPin == m.pin) {
+ socket.emit('response', {'type': 'digitalRead', 'pin': m.pin, 'value': m.state});
+ that.pinCache[m.pin] = m.state;
}
});
break;
}
- console.log(data);
});
- that.sockets[socket.id].on('command.send', function(data) {
- console.log(data);
- });
-
+ /**
+ * Connect to Arduino
+ */
that.sockets[socket.id].on('board.connect', function(data) {
if (that.current() && that.current().connected == true) {
return socket.emit('response', {'msg': 'board.connect', 'response': 'ready'}); }
- that.arduinos[0] = new Noduino({'debug': true}, Connector);
+ that.arduinos[0] = new Noduino({'debug': true}, Connector, Logger);
that.current().connect(function(err, board) {
that.current().connected = false;
if (err) { return socket.emit('response', {'msg': 'board.connect', 'response': 'failed'}); }
@@ -56,5 +92,5 @@ define(['socket.io', 'public/scripts/libs/Noduino', 'public/scripts/libs/Noduino
});
};
- return new SocketHandler(io, Noduino, Connector);
+ return new SocketHandler(io, Noduino, Connector, Logger);
});
\ No newline at end of file
diff --git a/srv.web.js b/srv.web.js
index c827793..61d5d5e 100644
--- a/srv.web.js
+++ b/srv.web.js
@@ -1,6 +1,18 @@
+/**
+ * srv.web.js – Load HTTP Handler and Socket Bridge
+ * This file is part of noduino (c) 2012 Sebastian Müller
+ *
+ * @package noduino
+ * @author Sebastian Müller
+ * @license MIT License – http://www.opensource.org/licenses/mit-license.php
+ * @url https://github.com/semu/noduino
+ */
var requirejs = require('requirejs');
requirejs.config({nodeRequire: require});
+/**
+ * Load Socket.IO and HTTP Server
+ */
requirejs(['./srv.app', './srv.socket'],function(app, io) {
var kickstart = app.kickstart;
var router = kickstart.listen();
diff --git a/test.blinkLED.js b/test.blinkLED.js
deleted file mode 100644
index 1fe51cf..0000000
--- a/test.blinkLED.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var requirejs = require('requirejs');
-requirejs.config({nodeRequire: require});
-
-requirejs(['public/scripts/libs/Noduino', 'public/scripts/libs/Noduino.Serial'], function (NoduinoObj, NoduinoConnector) {
-
- var Noduino = new NoduinoObj({'debug': true}, NoduinoConnector);
- Noduino.connect(function(err, board) {
- if (err) { return console.log(err); }
-
- board.withLED({pin: 13}, function(err, LED) {
- if (err) { return console.log(err); }
-
- LED.blink(250);
- });
- });
-
-});
\ No newline at end of file
diff --git a/test.check.js b/test.check.js
deleted file mode 100644
index 87b5ff7..0000000
--- a/test.check.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var requirejs = require('requirejs');
-requirejs.config({nodeRequire: require});
-
-requirejs(['libs/Noduino', 'libs/Noduino.Serial'], function (NoduinoObj, NoduinoConnector) {
- var maxLEDs = 6;
- var current = 1;
- var direction = -1;
- var curInterval = 100;
- var currentStepper = null;
- var LEDlist = [];
- var sorting = [13, 12, 11, 10, 9, 8];
-
- function readyLED(led) {
- LEDlist[sorting.indexOf(led.pin)] = led;
- if (LEDlist.length == maxLEDs) {
- startSequence(-1, curInterval); }
- }
-
- function addButton(Button, dir) {
- Button.on('push', function(e) {
- var newDirection = direction;
-
- switch (Button.pin) {
- case 6: newDirection = -1; break;
- case 3: newDirection = 1; break;
- }
-
- if (newDirection != direction) {
- startSequence(newDirection, curInterval);
- }
- });
- }
-
- function stepper() {
- var next = current + direction;
- if (next == maxLEDs + 1) {
- next = 1; }
- if (next == 0) {
- next = maxLEDs; }
- current = next;
- for (var i = 1; i <= maxLEDs; i++) {
- LEDlist[i-1].setOff(); }
- LEDlist[(current-1)].setOn();
- }
-
- function startSequence(step, interval) {
- if (LEDlist.length != maxLEDs) {
- return; };
-
- clearInterval(currentStepper);
- direction = step || 1;
- currentStepper = setInterval(function() {
- return stepper();
- }, interval);
- }
-
- var Noduino = new NoduinoObj({'debug': true}, NoduinoConnector);
- Noduino.connect(function(err, board) {
- if (err) { return console.log(err); }
-
-
- board.withLED({pin: 13}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 12}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 11}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 10}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 9}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 8}, function(err, LED) { readyLED(LED); });
- board.withButton({pin: 3}, function(err, Button) { addButton(Button); });
- board.withButton({pin: 6}, function(err, Button) { addButton(Button); });
- board.withAnalogInput({pin: 'A0'}, function(err, AnalogInput) {
- AnalogInput.on('change', function(a) {
- curInterval = a.value; startSequence(direction, curInterval);
- });
- });
- });
-});
\ No newline at end of file
diff --git a/test.walkLED.js b/test.walkLED.js
deleted file mode 100644
index 6cfc588..0000000
--- a/test.walkLED.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var requirejs = require('requirejs');
-requirejs.config({nodeRequire: require});
-
-requirejs(['public/scripts/libs/Noduino', 'public/scripts/libs/Noduino.Serial'], function (NoduinoObj, NoduinoConnector) {
- var maxLEDs = 5;
- var current = 1;
- var direction = -1;
- var curInterval = 100;
- var currentStepper = null;
- var LEDlist = [];
- var sorting = [13, 11, 10, 9, 8];
-
- function readyLED(led) {
- LEDlist[sorting.indexOf(led.pin)] = led;
- if (LEDlist.length == maxLEDs) {
- startSequence(-1, curInterval); }
- }
-
- function addButton(Button, dir) {
- Button.on('push', function(e) {
- var newDirection = direction;
-
- switch (Button.pin) {
- case 6: newDirection = -1; break;
- case 3: newDirection = 1; break;
- }
-
- if (newDirection != direction) {
- startSequence(newDirection, curInterval);
- }
- });
- }
-
- function stepper() {
- var next = current + direction;
- if (next == maxLEDs + 1) {
- next = 1; }
- if (next == 0) {
- next = maxLEDs; }
- current = next;
- for (var i = 1; i <= maxLEDs; i++) {
- LEDlist[i-1].setOff(); }
- LEDlist[(current-1)].setOn();
- }
-
- function startSequence(step, interval) {
- if (LEDlist.length != maxLEDs) {
- return; };
-
- clearInterval(currentStepper);
- direction = step || 1;
- currentStepper = setInterval(function() {
- return stepper();
- }, interval);
- }
-
- var Noduino = new NoduinoObj({'debug': true}, NoduinoConnector);
- Noduino.connect(function(err, board) {
- if (err) { return console.log(err); }
-
- board.withLED({pin: 13}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 11}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 10}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 9}, function(err, LED) { readyLED(LED); });
- board.withLED({pin: 8}, function(err, LED) { readyLED(LED); });
- board.withButton({pin: 3}, function(err, Button) { addButton(Button); });
- board.withButton({pin: 6}, function(err, Button) { addButton(Button); });
- board.withAnalogInput({pin: 'A0'}, function(err, AnalogInput) {
- AnalogInput.on('change', function(a) {
- curInterval = a.value; startSequence(direction, curInterval);
- });
- });
- });
-});
\ No newline at end of file
diff --git a/views/example-walkLED.jade b/views/example-walkLED.jade
new file mode 100755
index 0000000..d3e0678
--- /dev/null
+++ b/views/example-walkLED.jade
@@ -0,0 +1,80 @@
+header#overview
+ .page-header
+ h1 Adjustable LED Walker
+ small Control walking direction and adjust speed
+ .row
+ .span12
+ .hero-unit
+ img(src="/wiring/walkLED.png")
+ p Use the example wiring from above and this interface for getting startet with noduino. Read values from an analog input device like a potentiometer and watch for pressed buttons, all basic functions are shown within this example. The needed
+ code .fzz
+ | file for making changes with the awesome
+ a(href="http://fritzing.org") Fritzing Application
+ | is included as well. If you want to share your own wirings or found a bug please create a
+ a(href="http://github.com/semu/noduino") Pull Request on GitHub
+ | !
+
+ .page-header
+ h1 HTML5 WebSocket Interface
+ small Using Socket.IO and Node.js
+ .row.interface#controls
+ .span12
+ .btn-toolbar(style="margin-bottom: 9px")
+ .btn-group
+ a.btn(href="#")#connect
+ i.icon-refresh
+ | Connect to Arduino
+ |
+ .btn-group
+ .btn.btn-dir#btn-04 ««
+ |
+ .btn-group#leds
+ a.btn.disabled#led-1 #1
+ a.btn.disabled#led-2 #2
+ a.btn.disabled#led-3 #3
+ a.btn.disabled#led-4 #4
+ a.btn.disabled#led-5 #5
+ a.btn.disabled#led-6 #6
+ |
+ .btn-group
+ .btn.btn-dir#btn-02 »»
+ .btn-group
+ input.range#interval-slide(type="range", min="0", max="1024", step="1", value="320")
+ input.interval#interval-value(type="input", value="320ms",disabled="disabled")
+ .row.info#connection-status
+ .span12
+ .alert.alert-info Please connect to your Arduino using the button.
+ .alert.hide.alert-error Unable to connect to Arduino!
+ .alert.hide.alert-success Connection to Arduino established!
+ .row.debug
+ .span12
+ pre#connection-log
+ .item $ > Not connected to noduino!
+ .row
+ .span12
+ p This interface is defined in
+ code views/example-walkLED.jade
+ | , all needed JavaScript is stored in
+ code public/scrupts/app.walkLED.js
+ | using
+ a(href="#") RequireJS
+ | for loading dependencies. Please see RequireJS's manual for loading your scripts. Logging is done with the customized
+ code Logger.HTML.js
+ | in
+ code scripts/libs/
+ | .
+
+ .page-header
+ h1 Just Node.js
+ small Acces Arduino components without HTML5 interface
+ .row
+ .span12
+ p The wiring above can be used to test the included HTML web interface and the Node.js access as well. Connect your Arduino to you computer and start catching events happening on your Arduino with JavaScript. For sure you can easily fire events on your Arduino too!
+ pre
+ | $ > git clone git://github.com/semu/noduino.git noduino
+ | $ > cd noduino/
+ | $ > npm install
+ | $ > cd examples/
+ | $ > node test.walkLED.js
+ p After starting test.walkLED.js you are able to push the buttons in your wiring and see the LEDs blinking as you commanded. Use the analog input for changing walking speed. Binding events work as you might know from using Mootools, use AnalogInput.on(), LED.on() and Button.on() to bind custom functions to events like on, off, change, push or release. Not all functions are documented or even demonstrated with an example application, for getting used to noduino make sure to have a look at test.blinkLED.js and test.readAnalogIn.js.
+
\ No newline at end of file
diff --git a/views/home.jade b/views/home.jade
index dac01e4..6820c5f 100755
--- a/views/home.jade
+++ b/views/home.jade
@@ -83,12 +83,20 @@ section#homeContent
p
select.span2#e2-pinValue
option(value=13) PIN: 13
+ option(value=12) PIN: 12
+ option(value=11) PIN: 11
+ option(value=10) PIN: 10
+ option(value=09) PIN: 09
input.span3#e2-interval(type="text",placeholder="Interval in Miliseconds")
|
a.btn(href="#", style="margin-top: 1px;")#e2-buttonStart
i.icon-retweet
| Start blinking LED
|
+ a.btn(href="#", style="margin-top: 1px;")#e2-buttonStop
+ i.icon-off
+ | Stop
+ |
label.label#e2-status(style="position: relative; top: -2px;") LED off
.alert.hide.alert-info Please connect to your Arduino using the button.
.alert.hide.alert-error Connect to Arduino first!
@@ -113,4 +121,42 @@ section#homeContent
| Connect to Arduino
.alert.alert-info Please connect to your Arduino using the button.
.alert.hide.alert-error Unable to connect to Arduino!
- .alert.hide.alert-success Connected! Button is
\ No newline at end of file
+ .alert.hide.alert-success Connected! Button is
+ .page-header
+ h1 Getting started with noduino
+ small AnalogInput, DigitalInputs and some nice LEDs
+ .row
+ .span12
+ .hero-unit
+ img(src="/wiring/walkLED.png")
+ p Use the example wiring from above and the provided example in
+ code examples/walkLED.js
+ | for getting started using noduino. Read values from an analog input device like a potentiometer and watch for pressed buttons, all basic functions are shown in the example files. The needed
+ code .fzz
+ | file for making changes with the awesome
+ a(href="http://fritzing.org") Fritzing Application
+ | is included as well! If you create other wirings or find bugs in the provided ones please greate a
+ a(href="http://github.com/semu/noduino") Pull Request on GitHub
+ | !
+ .row
+ .span12
+ p.exampleLinks
+ a.btn.btn-success(href="/examples/walkLED.html")
+ i.icon-gift.icon-white
+ | View Example
+ .page-header
+ h1 About noduino
+ small Thank You Open Source!
+ .row
+ .span12
+ p The
+ a(href="#") noduino
+ | project was founded by
+ a(href="#") Sebastian Müller
+ | for fun and as a proof of concept for Node.js controlling external components over a dynamic web interface using HTML5 WebSockets. Thanks to the awesome
+ a(href="#") Arduino
+ | project and the German
+ a(href="#") Fritzing Project
+ | it's easy to get started with basic prototyping. The already existing
+ a(href="#") duino
+ | project helped developing the first steps and is now an imported part of noduino's core components. Thanks to the Open Source community, you made this possible! Keep the good work up…
diff --git a/views/includes/snippet.jade b/views/includes/snippet.jade
deleted file mode 100755
index d6fbd24..0000000
--- a/views/includes/snippet.jade
+++ /dev/null
@@ -1,2 +0,0 @@
-p I'm a
- span Snippet
\ No newline at end of file
diff --git a/views/layout.jade b/views/layout.jade
index 4ce9172..600176e 100755
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -5,7 +5,7 @@ html(lang="en")
link(rel="stylesheet", href="/styles/bootstrap/init.css")
link(rel="stylesheet", href="/styles/prettify.css")
link(rel="stylesheet", href="/styles/init.css")
- script(data-main="scripts/main", type="text/javascript", src="/scripts/require-jquery.js")
+ script(data-main="/scripts/app." + jsApp, type="text/javascript", src="/scripts/vendor/require-jquery.js")
script(type="text/javascript", src="http://localhost:8090/socket.io/socket.io.js")
// script(type="text/javascript", src="/scripts/init.js")
// script(type="text/javascript", src="/scripts/prettify.js")
@@ -15,8 +15,14 @@ html(lang="en")
.container
div.nav-collapse
ul.nav
- li.active
- a(href="#") Home
+ li(class=(active == 'home' ? 'active' : ''))
+ a(href="/") Home
+ li.dropdown(class=(active == 'examples' ? 'active' : ''))
+ a.dropdown-toggle(href="#",data-toggle="dropdown") Example Wiring
+ b.caret
+ ul.dropdown-menu
+ li
+ a(href="/examples/walkLED.html") Adjustable LED Walker
li
a(href="https://github.com/semu/noduino") View on GitHub »
div.nav-collapse.pull-right
@@ -47,4 +53,4 @@ html(lang="en")
a(href="#") twitter bootstrap framework
| . Icons from
a(href="#") Glyphicons Free
- | . 2012 Baby!
\ No newline at end of file
+ | .
\ No newline at end of file