Merge pull request #3 from aj-ptw/master

Fix up sample objects when not scaling

Author: AJ Keller

.travis.yml

@@ -1,22 +1,9 @@
 language: node_js
 node_js:
-  - "4.0"
-  - "4.1"
-  - "4.2"
-  - "4.3"
-  - "4.4"
-  - "4.5"
-  - "4.6"
-  - "5.11.0"
-  - "6.0"
-  - "6.1"
-  - "6.2"
-  - "6.3"
-  - "6.4"
-  - "6.5"
-  - "6.6"
-  - "6.7"
-  - "6.8"
+  - "4.8.4"
+  - "6.11.1"
+  - "7.10.1"
+  - "8.1.4"
 install:
   - npm install --all
 script:

changelog.md

@@ -1,3 +1,9 @@
+# 0.0.5
+
+### Bug Fixes
+
+* When not scaling outputs `channelDataCounts` instead of `channelData`
+
 # 0.0.4
 
 ### Bug Fixes

openBCIConstants.js

@@ -414,6 +414,7 @@ const obciEmitterRawDataPacket = 'rawDataPacket';
 const obciEmitterReady = 'ready';
 const obciEmitterSample = 'sample';
 const obciEmitterSynced = 'synced';
+const obciEmitterWifiShield = 'wifiShield';
 
 /** Accel packets */
 const obciGanglionAccelAxisX = 1;
@@ -1109,6 +1110,7 @@ module.exports = {
   OBCIEmitterReady: obciEmitterReady,
   OBCIEmitterSample: obciEmitterSample,
   OBCIEmitterSynced: obciEmitterSynced,
+  OBCIEmitterWifiShield: obciEmitterWifiShield,
   /** Emitters */
   /** Accel packets */
   OBCIGanglionAccelAxisX: obciGanglionAccelAxisX,

openBCIUtilities.js

@@ -966,7 +966,7 @@ function parsePacketStandardAccel (o) {
 
   if (k.isUndefined(o.scale) || k.isNull(o.scale)) o.scale = true;
   if (o.scale) sampleObject.channelData = getChannelDataArray(o.rawDataPacket, o.gains);
-  else sampleObject.channelData = getChannelDataArrayNoScale(o.rawDataPacket);
+  else sampleObject.channelDataCounts = getChannelDataArrayNoScale(o.rawDataPacket);
 
   if (k.getVersionNumber(process.version) >= 6) {
     // From introduced in node version 6.x.x
@@ -1007,7 +1007,7 @@ function parsePacketStandardRawAux (o) {
   // Store the channel data
   if (k.isUndefined(o.scale) || k.isNull(o.scale)) o.scale = true;
   if (o.scale) sampleObject.channelData = getChannelDataArray(o.rawDataPacket, o.gains);
-  else sampleObject.channelData = getChannelDataArrayNoScale(o.rawDataPacket);
+  else sampleObject.channelDataCounts = getChannelDataArrayNoScale(o.rawDataPacket);
 
   // Slice the buffer for the aux data
   if (k.getVersionNumber(process.version) >= 6) {
@@ -1075,7 +1075,7 @@ function parsePacketTimeSyncedAccel (o) {
 
   if (k.isUndefined(o.scale) || k.isNull(o.scale)) o.scale = true;
   if (o.scale) sampleObject.channelData = getChannelDataArray(o.rawDataPacket, o.gains);
-  else sampleObject.channelData = getChannelDataArrayNoScale(o.rawDataPacket);
+  else sampleObject.channelDataCounts = getChannelDataArrayNoScale(o.rawDataPacket);
 
   return sampleObject;
 }
@@ -1124,7 +1124,7 @@ function parsePacketTimeSyncedRawAux (o) {
   // Grab the channel data.
   if (k.isUndefined(o.scale) || k.isNull(o.scale)) o.scale = true;
   if (o.scale) sampleObject.channelData = getChannelDataArray(o.rawDataPacket, o.gains);
-  else sampleObject.channelData = getChannelDataArrayNoScale(o.rawDataPacket);
+  else sampleObject.channelDataCounts = getChannelDataArrayNoScale(o.rawDataPacket);
 
   return sampleObject;
 }
@@ -1182,7 +1182,7 @@ function getFromTimePacketAccel (dataBuf, accelArray) {
 /**
 * @description Grabs a raw aux value from a raw but time synced packet.
 * @param dataBuf {Buffer} - The 33byte raw time synced raw aux packet
-* @returns {Promise} - Fulfills a 2 byte buffer
+* @returns {Buffer|SafeBuffer|Buffer2} - Fulfills a 2 byte buffer
 */
 function getFromTimePacketRawAux (dataBuf) {
   if (dataBuf.byteLength !== k.OBCIPacketSize) {

package.json

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