eorg_oz/nodeMessageBoard
1
0
Fork 0
forked from lbsadmin/nodeMessageBoard
Code

cleanup after bad merge

Browse Source
This commit is contained in:
Lukas Bachschwell 2016-11-16 15:20:45 +01:00
parent 4ceed221f5
commit c3aad5823b
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -7,14 +7,8 @@
"async": "^2.0.0-rc.6", "async": "^2.0.0-rc.6",
"emojize": "^0.2.0", "emojize": "^0.2.0",
"lowdb": "^0.12.5", "lowdb": "^0.12.5",
<<<<<<< HEAD
"serialport": "^4.0.5", "serialport": "^4.0.5",
"socket.io": "^1.4.5"
=======
"nan": "^2.3.5",
"serialport": "^2.0.6",
"socket.io": "^1.4.8" "socket.io": "^1.4.8"
>>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

8
server.js
View File

@ -147,12 +147,9 @@ function serialListener(debug)
serialPort = new SerialPort(portName, { serialPort = new SerialPort(portName, {
baudrate: 19200, 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) { serialPort.open(function (err) {
if (err) { if (err) {
@ -163,7 +160,6 @@ function serialListener(debug)
module.exports.demoMode = 1; module.exports.demoMode = 1;
return console.log('Error opening port: ', err.message,'### ENABELED DEMOMODE under /demo ! ##############'); return console.log('Error opening port: ', err.message,'### ENABELED DEMOMODE under /demo ! ##############');
} }
>>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
console.log('opened serial communication'); console.log('opened serial communication');