FIX: firmware version

openbci-archive · Feb 14, 2018 · 1f9986e · 1f9986e
1 parent c7b49f4
commit 1f9986e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/examples/python/handoff.py b/examples/python/handoff.py
@@ -98,7 +98,7 @@ def main(argv):
                                 print "sample is not a dict", message
                                 raise ValueError
                             # Get keys of sample
-                            data = np.zeros(9)
+                            data = np.zeros(nb_chan + 1)
 
                             data[:-1] = message.get('channelData')
                             data[-1] = message.get('timeStamp')

diff --git a/examples/python/index.js b/examples/python/index.js
@@ -39,7 +39,7 @@ ourBoard.autoFindOpenBCIBoard().then(portName => {
     // Call to connect
     ourBoard.connect(portName)
       .then(() => {
-        ourBoard.on('ready', () => {
+        ourBoard.once('ready', () => {
           // Find out if you can even time sync, you must be using v2 and this is only accurate after a `.softReset()` call which is called internally on `.connect()`. We parse the `.softReset()` response for the presence of firmware version 2 properties.
           timeSyncPossible = ourBoard.usingAtLeastVersionTwoFirmware();
           console.log(`timeSyncPossible: ${timeSyncPossible}`);

diff --git a/openBCICyton.js b/openBCICyton.js
@@ -392,7 +392,7 @@ Cyton.prototype.disconnect = function () {
  */
 Cyton.prototype.isConnected = function () {
   if (!this.serial) return false;
-  return this.serial.isOpen();
+  return this.serial.isOpen;
 };
 
 /**
@@ -636,7 +636,7 @@ Cyton.prototype.usingVersionTwoFirmware = function () {
   if (this.options.simulate) {
     return this.options.simulatorFirmwareVersion === k.OBCIFirmwareV2;
   } else {
-    return this.info.firmware === k.OBCIFirmwareV2;
+    return this.info.firmware.major === 2;
   }
 };
 
@@ -664,7 +664,7 @@ Cyton.prototype.usingVersionThreeFirmware = function () {
   if (this.options.simulate) {
     return this.options.simulatorFirmwareVersion === k.OBCIFirmwareV3;
   } else {
-    return this.info.firmware === k.OBCIFirmwareV3;
+    return this.info.firmware.major === 3;
   }
 };
 
@@ -1953,16 +1953,10 @@ Cyton.prototype._processParseBufferForReset = function (dataBuffer) {
     this.overrideInfoForBoardType(k.OBCIBoardCyton);
   }
 
-  const firmware = obciUtils.getFirmware(dataBuffer);
-  if (firmware) {
-    if (firmware.major === 2) {
-      this.info.firmware = k.OBCIFirmwareV2;
-    } else {
-      this.info.firmware = k.OBCIFirmwareV3;
-    }
+  this.info.firmware = obciUtils.getFirmware(dataBuffer);
+  if (this.info.firmware) {
     this.writeOutDelay = k.OBCIWriteIntervalDelayMSShort;
   } else {
-    this.info.firmware = k.OBCIFirmwareV1;
     this.writeOutDelay = k.OBCIWriteIntervalDelayMSLong;
   }
 };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openbci-cyton",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "The official Node.js SDK for the OpenBCI Cyton with Dongle.",
   "main": "openBCICyton.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "openbci-utilities": "^0.2.7",
     "performance-now": "^2.1.0",
     "safe-buffer": "^5.1.1",
-    "serialport": "4.0.7",
+    "serialport": "^6.0.5",
     "sntp": "^2.0.2"
   },
   "directories": {