Merge pull request #101 from OpenBCI/development

v2.1.0
openbci-archive · Sep 20, 2019 · 8725d48 · 8725d48
2 parents 85d94af + a1f23e0
commit 8725d48
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v2.1.0
+
+### Bug Fixes
+
+- Return cyton firmware version in wifi connect response
+
 # v2.0.9
 
 ### Bug Fixes

diff --git a/app/package.json b/app/package.json
@@ -2,7 +2,7 @@
   "name": "openbci-electron-hub",
   "productName": "OpenBCIHub",
   "description": "OpenBCIHub",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "author": "AJ Keller <[email protected]>",
   "copyright": "© 2019, OpenBCI inc.",
   "homepage": "http://openbci.com",

diff --git a/src/background.js b/src/background.js
@@ -1022,12 +1022,22 @@ const _connectWifi = (msg, client) => {
     .then(() => {
       //TODO: Finish this connect
       if (verbose) console.log("connect success");
+      if (wifi.getBoardType() == k.OBCIBoardGanglion) {
+        return Promise.resolve('');
+      } else {
+        // Query cyton firmware version to report in connect response.
+        return wifi.write('V');
+      }
+    })
+    .then((version) => {
       // client.write(`${kTcpCmdConnect},${kTcpCodeSuccess}${kTcpStop}`);
       writeCodeToClientOfType(
         client,
         kTcpTypeConnect,
         kTcpCodeSuccess,
-        {}
+        {
+          firmware: version.trim()
+        }
       );
       // wifi.on(k.OBCIEmitterRawDataPacket, console.log);
       wifi.on("sample", sampleFunction.bind(null, client));