Merge branch 'master' of https://github.com/OpenBCI/OpenBCI_NodeJS_Utilities

Author: AJ Keller

Diff for: changelog.md

@@ -1,3 +1,13 @@
+# 0.1.0
+
+### New Functions
+
+* Add function `getFirmware(dataBuffer)` to utilities 
+
+### Breaking Changes
+
+* Removed function called `findV2Firmware()` because it's useless with v3.0.0 firmware
+
 # 0.0.10
 
 ### New Function

Diff for: openBCIUtilities.js

@@ -555,7 +555,7 @@ var utilitiesModule = {
   isOdd,
   countADSPresent,
   doesBufferHaveEOT,
-  findV2Firmware,
+  getFirmware,
   isFailureInBuffer,
   isSuccessInBuffer,
   isTimeSyncSetConfirmationInBuffer,
@@ -1609,21 +1609,21 @@ function doesBufferHaveEOT (dataBuffer) {
 }
 
 /**
-* @description Used to parse a soft reset response to determine if the board is running the v2 firmware
-* @param dataBuffer {Buffer} - The data to parse
-* @returns {boolean} - True if `v2`is indeed found in the `dataBuffer`
-*/
-function findV2Firmware (dataBuffer) {
-  const s = new StreamSearch(new Buffer(k.OBCIParseFirmware));
-
-  // Clear the buffer
-  s.reset();
-
-  // Push the new data buffer. This runs the search.
-  s.push(dataBuffer);
-
-  // Check and see if there is a match
-  return s.matches >= 1;
+ * Used to extract the major version from
+ * @param dataBuffer
+ * @return {*}
+ */
+function getFirmware (dataBuffer) {
+  const regexPattern = /v\d.\d.\d/;
+  const ret = dataBuffer.toString().match(regexPattern);
+  if (ret) {
+    const elems = ret[0].split('.');
+    return {
+      major: Number(elems[0][1]),
+      minor: Number(elems[1]),
+      patch: Number(elems[2])
+    };
+  } else return ret;
 }
 
 /**

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "openbci-utilities",
-  "version": "0.0.10",
+  "version": "0.1.0",
   "description": "The official utility package of Node.js SDK for the OpenBCI Biosensor Boards.",
   "main": "index.js",
   "scripts": {

Diff for: test/openBCIUtilities-test.js

@@ -1345,33 +1345,51 @@ $$$`);
       expect(openBCIUtilities.doesBufferHaveEOT(buf)).to.equal(true);
     });
   });
-  describe('#findV2Firmware', function () {
+  describe('#getMajorFirmwareVersion', function () {
     it('should not crash on small buff', function () {
       let buf = new Buffer('AJ!');
 
-      expect(openBCIUtilities.findV2Firmware(buf)).to.be.false();
+      expect(openBCIUtilities.getFirmware(buf)).to.equal(null);
     });
     it('should not find any v2', function () {
       let buf = new Buffer('AJ Keller is an awesome programmer!\n I know right!');
 
-      expect(openBCIUtilities.findV2Firmware(buf)).to.be.false();
+      expect(openBCIUtilities.getFirmware(buf)).to.equal(null);
     });
     it('should not find a v2', function () {
       let buf = new Buffer(`OpenBCI V3 Simulator
 On Board ADS1299 Device ID: 0x12345
 LIS3DH Device ID: 0x38422$$$`);
 
-      expect(openBCIUtilities.findV2Firmware(buf)).to.be.false();
+      expect(openBCIUtilities.getFirmware(buf)).to.equal(null);
     });
     it('should find a v2', function () {
       let buf = new Buffer(`OpenBCI V3 Simulator
 On Board ADS1299 Device ID: 0x12345
 On Daisy ADS1299 Device ID: 0xFFFFF
 LIS3DH Device ID: 0x38422
-Firmware: v2
+Firmware: v2.0.1
+$$$`);
+
+      expect(openBCIUtilities.getFirmware(buf)).to.deep.equal({
+        major: 2,
+        minor: 0,
+        patch: 1
+      });
+    });
+    it('should find a v3', function () {
+      let buf = new Buffer(`OpenBCI V3 Simulator
+On Board ADS1299 Device ID: 0x12345
+On Daisy ADS1299 Device ID: 0xFFFFF
+LIS3DH Device ID: 0x38422
+Firmware: v3.0.1
 $$$`);
 
-      expect(openBCIUtilities.findV2Firmware(buf)).to.equal(true);
+      expect(openBCIUtilities.getFirmware(buf)).to.deep.equal({
+        major: 3,
+        minor: 0,
+        patch: 1
+      });
     });
   });
   describe('#isFailureInBuffer', function () {