Merge branch 'master' into beaglebone-black-hardware

This commit is contained in:
Maxwell Hadley
2014-02-23 15:41:29 +00:00
22 changed files with 849 additions and 110 deletions

View File

@@ -51,7 +51,7 @@ function sensorTagNode(n) {
sensorTag.enableIrTemperature(function(){});
sensorTag.on('irTemperatureChange',
function(objectTemperature, ambientTemperature){
var msg = {'topic': node.topic + '/tempature'};
var msg = {'topic': node.topic + '/temperature'};
msg.payload = {'object': objectTemperature.toFixed(1),
'ambient':ambientTemperature.toFixed(1)
};