forked from lbsadmin/nodeMessageBoard
cleanup after bad merge
This commit is contained in:
parent
4ceed221f5
commit
c3aad5823b
@ -7,14 +7,8 @@
|
||||
"async": "^2.0.0-rc.6",
|
||||
"emojize": "^0.2.0",
|
||||
"lowdb": "^0.12.5",
|
||||
<<<<<<< HEAD
|
||||
"serialport": "^4.0.5",
|
||||
"socket.io": "^1.4.5"
|
||||
=======
|
||||
"nan": "^2.3.5",
|
||||
"serialport": "^2.0.6",
|
||||
"socket.io": "^1.4.8"
|
||||
>>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
|
||||
},
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
|
@ -147,12 +147,9 @@ function serialListener(debug)
|
||||
|
||||
serialPort = new SerialPort(portName, {
|
||||
baudrate: 19200,
|
||||
<<<<<<< HEAD
|
||||
parser: SerialPort.parsers.readline("\n")
|
||||
parser: SerialPort.parsers.readline("\n"),
|
||||
autoOpen: false //don't open imediatly
|
||||
});
|
||||
=======
|
||||
parser: serialport.parsers.readline("\n")
|
||||
},false); //don't open imedeatly
|
||||
|
||||
serialPort.open(function (err) {
|
||||
if (err) {
|
||||
@ -163,7 +160,6 @@ function serialListener(debug)
|
||||
module.exports.demoMode = 1;
|
||||
return console.log('Error opening port: ', err.message,'### ENABELED DEMOMODE under /demo ! ##############');
|
||||
}
|
||||
>>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
|
||||
|
||||
console.log('opened serial communication');
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user