Skip to content

Commit 8725d48

Browse files
authored
Merge pull request #101 from OpenBCI/development
v2.1.0
2 parents 85d94af + a1f23e0 commit 8725d48

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v2.1.0
2+
3+
### Bug Fixes
4+
5+
- Return cyton firmware version in wifi connect response
6+
17
# v2.0.9
28

39
### Bug Fixes

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "openbci-electron-hub",
33
"productName": "OpenBCIHub",
44
"description": "OpenBCIHub",
5-
"version": "2.0.9",
5+
"version": "2.1.0",
66
"author": "AJ Keller <hello@pushtheworld.us>",
77
"copyright": "© 2019, OpenBCI inc.",
88
"homepage": "http://openbci.com",

src/background.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,12 +1022,22 @@ const _connectWifi = (msg, client) => {
10221022
.then(() => {
10231023
//TODO: Finish this connect
10241024
if (verbose) console.log("connect success");
1025+
if (wifi.getBoardType() == k.OBCIBoardGanglion) {
1026+
return Promise.resolve('');
1027+
} else {
1028+
// Query cyton firmware version to report in connect response.
1029+
return wifi.write('V');
1030+
}
1031+
})
1032+
.then((version) => {
10251033
// client.write(`${kTcpCmdConnect},${kTcpCodeSuccess}${kTcpStop}`);
10261034
writeCodeToClientOfType(
10271035
client,
10281036
kTcpTypeConnect,
10291037
kTcpCodeSuccess,
1030-
{}
1038+
{
1039+
firmware: version.trim()
1040+
}
10311041
);
10321042
// wifi.on(k.OBCIEmitterRawDataPacket, console.log);
10331043
wifi.on("sample", sampleFunction.bind(null, client));

0 commit comments

Comments
 (0)