From 3a07d0e11fe687a62f7d0ed9c83e5f6d3d6f8683 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 8 Sep 2015 17:11:34 -0400
Subject: [PATCH] fixed node comm
---
node/nodeServer.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/node/nodeServer.js b/node/nodeServer.js
index a78ef449..13c2cfc3 100644
--- a/node/nodeServer.js
+++ b/node/nodeServer.js
@@ -18,7 +18,7 @@ var io = require('socket.io').listen(8080);
//defaults
var portName = null;
var currentPort = null;
-var baudRate = 9600;
+var baudRate = 115200;
//io.sockets.on('connection', function (socket) {
// socket.emit('baudRate', baudRate);
@@ -50,8 +50,12 @@ io.on('connection', function(socket){
});
socket.on('dataOut', function(data){
+ data += '\n';
console.log("Sending data: " + data);
- currentPort.write(new Buffer([parseInt(data)]));
+ currentPort.write(new Buffer(data), function(err, res) {
+ if (err) onPortError(err);
+ });
+// currentPort.write(new Buffer([parseInt(data)]));//write byte
});
socket.on('flush', function(){
@@ -145,7 +149,7 @@ io.on('connection', function(socket){
}
function onPortData(data){
-// console.log(data);
+ console.log(data);
socket.emit("dataIn", data);
}
--
GitLab