Skip to content

Commit 0665699

Browse files
authored
Merge pull request #87 from OpenBCI/development
master <-- development v2.0.7
2 parents 3456b6f + 4c14054 commit 0665699

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "openbci-electron-hub",
33
"productName": "OpenBCIHub",
44
"description": "OpenBCIHub",
5-
"version": "2.0.6",
5+
"version": "2.0.7",
66
"author": "AJ Keller <hello@pushtheworld.us>",
7-
"copyright": "© 2018, OpenBCI inc.",
7+
"copyright": "© 2019, OpenBCI inc.",
88
"homepage": "http://openbci.com",
99
"license": "MIT",
1010
"main": "background.js",

changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v2.0.7
2+
3+
### Bug Fixes
4+
5+
- Display Cyton firmware in GUI OpenBCI/OpenBCI_GUI#449
6+
- Cyton serial SD card mode causes GUI init to fail OpenBCI/OpenBCI_GUI#386
7+
18
# v2.0.6
29

310
### New Features

src/background.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ const _processConnectSerial = (msg, client) => {
975975
kTcpTypeConnect,
976976
kTcpCodeSuccess,
977977
{
978-
firmare: cyton.getInfo().firmware.raw
978+
firmware: cyton.getInfo().firmware.raw
979979
}
980980
);
981981
// cyton.on(k.OBCIEmitterRawDataPacket, console.log);
@@ -2542,7 +2542,7 @@ const _processSdSerial = (msg, client) => {
25422542
.sdStart(msg.command)
25432543
.then(() => {
25442544
writeCodeToClientOfType(client, kTcpTypeSd, kTcpCodeSuccess, {
2545-
action: kTcpActionStop,
2545+
action: kTcpActionStart,
25462546
protocol: kTcpProtocolSerial
25472547
});
25482548
// client.write(`${kTcpCmdSd},${kTcpCodeSuccess},${kTcpActionStart}${kTcpStop}`);
@@ -2553,7 +2553,7 @@ const _processSdSerial = (msg, client) => {
25532553
kTcpTypeSd,
25542554
kTcpCodeErrorUnknown,
25552555
{
2556-
action: kTcpActionStart,
2556+
action: kTcpActionStop,
25572557
message: err.message,
25582558
protocol: kTcpProtocolSerial
25592559
}

0 commit comments

Comments
 (0)