Skip to content

Commit 0228b1c

Browse files
committed
first stab at converting board comms from wifi to UART
1 parent d3b4cba commit 0228b1c

File tree

2,028 files changed

+278308
-22
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,028 files changed

+278308
-22
lines changed

index.js

+27-22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var WebSocket = require('ws');
1+
//var WebSocket = require('ws');
22
var express = require('express');
33
var app = express();
44
var server = require('http').createServer(app);
@@ -13,27 +13,32 @@ server.listen(port, function () {
1313
// Routing
1414
app.use(express.static(__dirname + '/public'));
1515

16-
var ws = new WebSocket('ws://10.0.1.15');
17-
18-
io.sockets.on('connection', function (socket) {
19-
console.log('A new user connected!');
20-
ws.on("open",function() {
21-
console.log("websocket connected");
22-
});
23-
24-
ws.on("message",function(data,flag) {
25-
console.log("got data from websocket");
26-
// when we get stuff from websocket, sling it over io socket to client
27-
socket.emit('info', data);
28-
});
29-
30-
socket.on("start",function(data,flag) {
31-
console.log("clicked the get data button");
32-
ws.send("start");
33-
})
16+
var serialport = require("serialport");
17+
var SerialPort = serialport.SerialPort;
3418

19+
var serialPort = new SerialPort("/dev/cu.usbserial-cc3101B", {
20+
baudrate: 9600,
21+
parser: serialport.parsers.readline("\n")
3522
});
3623

37-
38-
39-
24+
io.sockets.on("connection",openSocket);
25+
26+
function openSocket(socket) {
27+
socket.on("start",function(data,flag) {
28+
console.log("web client requested data");
29+
serialPort.write("start\n", function(err,res) {
30+
if (err !== undefined) {
31+
console.log("error on writing to serial " + err);
32+
}
33+
if (res !== undefined) {
34+
console.log("successfully wrote " + res + " characters");
35+
}
36+
});
37+
});
38+
39+
serialPort.on("data", function(data) {
40+
console.log("data from board");
41+
console.log(data);
42+
socket.emit("info",data);
43+
})
44+
};

node_modules/.bin/serialportlist

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/.bin/serialportterm

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/serialport/.npmignore

+29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/serialport/LICENSE

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/serialport/Makefile

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)