Merge pull request #24 from mbientlab/node12

lkasso · web-flow · commit 50438fe810e2 · 2022-03-06T19:07:35.000-08:00
Node12
diff --git a/MetaWear-SDK-Cpp b/MetaWear-SDK-Cpp
@@ -1 +1 @@
-Subproject commit 1c9bfed9d1603fabd26f6d82fa2164423e425845
+Subproject commit 82c5eb3b27a7d48c7ce602a16c830f2bdd7037dc
diff --git a/examples/acc_thresh_detect.js b/examples/acc_thresh_detect.js
@@ -5,7 +5,7 @@ var MetaWear = require('../index')
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
 
-var ref = require('ref');
+var ref = require('ref-napi');
 // Store the log event for later download.  If your program needs to terminate
 // before performing the log download, you will need to use mbl_mw_metawearboard_serialize
 // to store the device state and that pass that state as the second argument to
diff --git a/examples/anonymous_datasignals.js b/examples/anonymous_datasignals.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref')
+var ref = require('ref-napi')
 
 // MetaWear.discoverByAddress('f6:3d:13:48:ce:ab', function (device) {
 MetaWear.discover(function (device) {
diff --git a/examples/data_fuser.js b/examples/data_fuser.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref')
+var ref = require('ref-napi')
 
 // Main function
 async function mainAsync(mac) {
diff --git a/examples/led.js b/examples/led.js
@@ -2,12 +2,11 @@
 var MetaWear = require('../index')
 // METAWEAR
 //require('metawear');
-
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // If you know the MAC address:
-MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
+MetaWear.discoverByAddress('d1:e7:65:2a:ad:6f', function(device) {
 //MetaWear.discover(function (device) {
   device.connectAndSetUp(function (error) {
     // Create a LED patter type
diff --git a/examples/led_macro.js b/examples/led_macro.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // If you know the MAC address:
 MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
diff --git a/examples/log_acc_bmi160.js b/examples/log_acc_bmi160.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // THIS IS FOR THE MMR, MMC, or MMRL ONLY
 
diff --git a/examples/log_acc_bmi270.js b/examples/log_acc_bmi270.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // THIS IS FOR THE MMS ONLY
 
diff --git a/examples/log_temp.js b/examples/log_temp.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 var tempLogger = null;
 var tempTimer = null;
 
diff --git a/examples/multi_device.js b/examples/multi_device.js
@@ -5,7 +5,7 @@ var MetaWear = require('../index')
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
 var fs = require('fs');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 var addresses = [
   'ea:78:c3:d3:f0:8a',
diff --git a/examples/scan_connect.js b/examples/scan_connect.js
@@ -6,7 +6,7 @@ var MetaWear = require('../index')
 // If you don't know the MAC address, you can uncomment this line
 // and it will connect to nearest automatically
 //MetaWear.discover(function (device) {
-MetaWear.discoverByAddress('c8:4b:aa:97:50:05', function(device) {
+MetaWear.discoverByAddress('d1:e7:65:2a:ad:6f', function(device) {
   console.log('got em');
   // you can be notified of disconnects
   device.on('disconnect', function () {
diff --git a/examples/setup_connect.js b/examples/setup_connect.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
 //MetaWear.discover(function (device) {
diff --git a/examples/stream_acc.js b/examples/stream_acc.js
@@ -2,8 +2,7 @@
 var MetaWear = require('../index')
 // METAWEAR
 //require('metawear');
-
-var ref = require('ref')
+var ref = require('ref-napi')
 
 // Main function
 async function mainAsync(mac) {
@@ -38,11 +37,13 @@ async function mainAsync(mac) {
   // Terminal on terminal input
   process.openStdin().addListener("data", data => {
     console.log('Reset.')
-    MetaWear.mbl_mw_debug_reset(device.board)
+    MetaWear.mbl_mw_debug_reset(device.board);
+    MetaWear.mbl_mw_debug_disconnect(device.board);
+    console.log('Disconnect');
     setTimeout(function () {
       // Exit terminal
       process.exit(1);
-    }, 2000);
+    }, 4000);
   })
 }
 
diff --git a/examples/stream_acc_accounter.js b/examples/stream_acc_accounter.js
@@ -3,7 +3,7 @@ var MetaWear = require('../index')
 // METAWEAR
 //require('metawear');
 
-var ref = require('ref');
+var ref = require('ref-napi');
 
 async function mainAsync(mac) {
   // Find device with MAC address
diff --git a/examples/stream_acc_accumulator.js b/examples/stream_acc_accumulator.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Main function
 async function mainAsync(mac) {
diff --git a/examples/stream_acc_averager.js b/examples/stream_acc_averager.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Main function
 async function mainAsync(mac) {
diff --git a/examples/stream_acc_buffer.js b/examples/stream_acc_buffer.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Setup function
 async function setupStream(device) {
diff --git a/examples/stream_acc_gyro.js b/examples/stream_acc_gyro.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref')
+var ref = require('ref-napi')
 
 // Main function
 async function mainAsync(mac) {
diff --git a/examples/stream_acc_gyro_packed.js b/examples/stream_acc_gyro_packed.js
@@ -3,7 +3,7 @@ var MetaWear = require('../index')
 // METAWEAR
 //require('metawear');
 
-var ref = require('ref')
+var ref = require('ref-napi')
 
 async function mainAsync(mac) {
   var device = await new Promise((resolve, reject) => MetaWear.discoverByAddress(mac.toLowerCase(), d => resolve(d)))
diff --git a/examples/stream_acc_x.js b/examples/stream_acc_x.js
@@ -3,7 +3,7 @@ var MetaWear = require('../index')
 // METAWEAR
 //require('metawear');
 
-var ref = require('ref')
+var ref = require('ref-napi')
 
 // Main
 async function mainAsync(mac) {
diff --git a/examples/stream_baro_comp.js b/examples/stream_baro_comp.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Discover by MAC
 MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
diff --git a/examples/stream_gyro_packed.js b/examples/stream_gyro_packed.js
@@ -3,7 +3,7 @@ var MetaWear = require('../index')
 // METAWEAR
 //require('metawear');
 
-var ref = require('ref')
+var ref = require('ref-napi')
 
 async function mainAsync(mac) {
   var device = await new Promise((resolve, reject) => MetaWear.discoverByAddress(mac.toLowerCase(), d => resolve(d)))
diff --git a/examples/stream_quat.js b/examples/stream_quat.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref')
+var ref = require('ref-napi')
 
 // Main
 async function mainAsync(mac) {
diff --git a/examples/stream_switch_count.js b/examples/stream_switch_count.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Discover MAC
 MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
diff --git a/examples/stream_temp.js b/examples/stream_temp.js
@@ -4,7 +4,7 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Discover by MAC
 MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
diff --git a/examples/stream_temp_timer.js b/examples/stream_temp_timer.js
@@ -4,10 +4,10 @@ var MetaWear = require('../index')
 //require('metawear');
 
 var cbindings = require('../MetaWear-SDK-Cpp/bindings/javascript/cbindings.js');
-var ref = require('ref');
+var ref = require('ref-napi');
 
 // Discover by mac
-MetaWear.discoverByAddress('ea:78:c3:d3:f0:8a', function(device) {
+MetaWear.discoverByAddress('d1:e7:65:2a:ad:6f', function(device) {
   console.log('Discovered');
   // Connect and setup
   device.connectAndSetUp(async function (error) {
diff --git a/lib/metawear.js b/lib/metawear.js
@@ -6,7 +6,7 @@ var debugRaw = require('debug')('metaboot');
 
 var NobleDevice = require('noble-device');
 var noble = require('@abandonware/noble');
-var ref = require('ref');
+var ref = require('ref-napi');
 var events = require('events');
 var util = require('util');
 var os = require('os');
@@ -121,11 +121,13 @@ MetaWear.prototype.connectAndSetUp = function (callback, initBuf) {
         MetaWear.mbl_mw_metawearboard_deserialize(this.board, initBuf, initBuf.length);
       }
       // Setup the CPP SDK 
+      console.log(this.board)
       MetaWear.mbl_mw_metawearboard_initialize(this.board, ref.NULL, MetaWear.FnVoid_VoidP_MetaWearBoardP_Int.toPointer(function onInitialize(context, board, code) {
         // Adjust link speed for macOS only since we can't adjust it elsewhere
         if (os.platform() === 'darwin') {
           MetaWear.mbl_mw_settings_set_connection_parameters(this.board, 15.0, 15.0, 0, 4000);
         }
+        console.log("init");
         this.readManufacturerName(function (error, manufacturerName) {
           this.manufacturerName = manufacturerName;
         }.bind(this));
@@ -140,8 +142,10 @@ MetaWear.prototype.connectAndSetUp = function (callback, initBuf) {
         }.bind(this));
         this.readModelNumber(function (error, modelNumber) {
           this.modelNumber = modelNumber;
+          console.log("read model number");
           this.modelDescription = MetaWear.mbl_mw_metawearboard_get_model_name(this.board);
           debug("Finished MetaWear Init");
+          console.log("done");
           initializeCallback(code == 0 ? null : code);
         }.bind(this));
       }.bind(this)));
@@ -220,34 +224,42 @@ function bytesToString(array, start, stop) {
 function NativeGattChar(array) {
   // always initialize all instance properties
   this.serviceUUID = bytesToString(array, 7, 0) + bytesToString(array, 15, 8);
+  console.log(this.serviceUUID);
   this.shortServiceUUID = bytesToString(array, 5, 4);
+  console.log(this.shortServiceUUID);
   this.characteristicUUID = bytesToString(array, 23, 16) + bytesToString(array, 31, 24);
+  console.log(this.characteristicUUID);
   this.shortCharacteristicUUID = bytesToString(array, 21, 20);
+  console.log(this.shortCharacteristicUUID);
 }
 
 function writeGattChar(context, caller, writeType, characteristicPtr, valuePtr, length) {
-  var data = ref.reinterpret(valuePtr, length, 0);
+  var bufs = [];
+  var data = Buffer.alloc(length);
+  for (let i=0; i<length; i++) {
+    bufs[i] = ref.reinterpret(valuePtr, 1, i);
+  }
+  data = Buffer.concat(bufs);
   var characteristic = new NativeGattChar(characteristicPtr);
   if (!this.hasCharacteristic(characteristic.serviceUUID, characteristic.characteristicUUID)) {
-    console.error('cant find ' + characteristic.characteristicUUID);
     return;
   }
   var printer = this.isMetaBoot ? debugRaw : debug;
-  printer('Writing: ' + characteristic.characteristicUUID + " " + data.toString('hex'));
+  //console.log('Writing: ' + characteristic.characteristicUUID + " " + data.toString('hex'));
 
   var withoutResponse = true;
-  if (!this.isMetaBoot) {
+  //if (!this.isMetaBoot) {
     // TODO: For now we need to do everything with-reponse, further 
     // testing and enabling is needed before we can turn this off
-    withoutResponse = false;
-  } else if (characteristic.characteristicUUID === METABOOT_DFU_CONTROL_POINT_UUID) {
-    withoutResponse = false;
-  }
+  //  withoutResponse = false;
+  //} else if (characteristic.characteristicUUID === METABOOT_DFU_CONTROL_POINT_UUID) {
+  //  withoutResponse = false;
+  //}
   this._characteristics[characteristic.serviceUUID][characteristic.characteristicUUID].write(data, withoutResponse, function (error) {
     if (error) {
-      printer(error);
+      console.log(error);
     } else {
-      printer('Writing Success');
+      //console.log('Writing Success');
     }
   });
 }
@@ -262,7 +274,7 @@ function readGattChar(context, caller, characteristicPtr, callback) {
     if (error) {
       console.error(error);
     } else {
-      debug("DidRead: " + data);
+      //console.log("DidRead: " + data);
       callback(caller, data, data.length);
     }
   });
@@ -275,17 +287,16 @@ function enableNotifications(context, caller, characteristicPtr, onData, subscri
     charToNotify = this._characteristics[characteristic.shortServiceUUID][characteristic.shortCharacteristicUUID];
   }
   charToNotify.on('data', function (buffer) {
-    debug('Did Update: ', buffer);
+    //console.log('Did Update: ', buffer);
     if (!buffer) {
-      console.error('bad buffer');
     } else {
       onData(caller, buffer, buffer.length);
     }
   });
   // Turn on the notification stream
   charToNotify.subscribe(function (error) {
     if (error) {
-      console.error(error);
+      console.log(error);
     }
     subscribeComplete(caller, error == null ? 0 : 1);
   });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
