update sdk and ex

mbientlab · Jun 23, 2021 · 991dfac · 991dfac
1 parent 7878b1b
commit 991dfac
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 3 deletions.
diff --git a/MetaWear-SDK-Cpp b/MetaWear-SDK-Cpp
diff --git a/examples/stream_acc_gyro_packed.js b/examples/stream_acc_gyro_packed.js
@@ -0,0 +1,60 @@
+// LOCAL
+var MetaWear = require('../index')
+// METAWEAR
+//require('metawear');
+
+var ref = require('ref')
+
+async function mainAsync(mac) {
+  var device = await new Promise((resolve, reject) => MetaWear.discoverByAddress(mac.toLowerCase(), d => resolve(d)))
+  await new Promise((resolve, reject) => {
+    console.log('Connecting...')
+    device.connectAndSetUp(error => {
+    console.log('Connected.')
+      if(error == null) resolve(null)
+      else reject(error)
+    })
+  })
+
+  let acc = MetaWear.mbl_mw_acc_get_packed_acceleration_data_signal(device.board)
+  console.log('Set up stream acc .')
+  MetaWear.mbl_mw_datasignal_subscribe(acc, ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer((ctx, pointer) => {
+    var data = pointer.deref();
+    let value = data.parseValue()
+    let entry = [value.x, value.y, value.z]
+    console.log('epoch: ' + data.epoch + ' acc: ' + 'x: ' + entry[0].toFixed(3) + ' y: ' + entry[1].toFixed(3) + ' z: ' + entry[2].toFixed(3))
+  }))
+
+  let gyro = MetaWear.mbl_mw_gyro_bmi270_get_packed_rotation_data_signal(device.board)
+
+  console.log('Set up stream gyro.')
+  MetaWear.mbl_mw_datasignal_subscribe(gyro, ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer((ctx, pointer) => {
+    var data = pointer.deref();
+    let value = data.parseValue()
+    let entry = [value.x, value.y, value.z]
+    console.log('epoch: ' + data.epoch + ' gyro: ' + 'x: ' + entry[0].toFixed(3) + ' y: ' + entry[1].toFixed(3) + ' z: ' + entry[2].toFixed(3))
+  }))
+
+  console.log('Start accelerometer.')
+  MetaWear.mbl_mw_acc_enable_acceleration_sampling(device.board)
+  MetaWear.mbl_mw_acc_start(device.board)
+
+  console.log('Start gyroscope.')
+  MetaWear.mbl_mw_gyro_bmi270_enable_rotation_sampling(device.board)
+  MetaWear.mbl_mw_gyro_bmi270_start(device.board)
+
+  // Terminal on terminal input
+  process.openStdin().addListener("data", data => {
+    console.log('Reset.')
+    MetaWear.mbl_mw_debug_reset(device.board)
+    setTimeout(function () {
+      // Exit terminal
+      process.exit(1);
+    }, 2000);
+  })
+}
+
+// Run this example by putting the MAC address on the command line
+// sudo node stream_acc_gyro_packed.js ea:78:c3:d3:f0:8a
+mainAsync(process.argv[2])
+
diff --git a/examples/stream_gyro_packed.js b/examples/stream_gyro_packed.js
@@ -17,12 +17,12 @@ async function mainAsync(mac) {
   })
 
   // For MMS
-  let acc = MetaWear.mbl_mw_gyro_bmi270_get_packed_rotation_data_signal(device.board)
+  let gyro = MetaWear.mbl_mw_gyro_bmi270_get_packed_rotation_data_signal(device.board)
   // Uncomment for MMRL, MMR, MMC
   //let acc = MetaWear.mbl_mw_gyro_bmi160_get_packed_rotation_data_signal(device.board)
 
   console.log('Set up stream.')
-  MetaWear.mbl_mw_datasignal_subscribe(acc, ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer((ctx, pointer) => {
+  MetaWear.mbl_mw_datasignal_subscribe(gyro, ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer((ctx, pointer) => {
     var data = pointer.deref();
     let value = data.parseValue()
     let entry = [value.x, value.y, value.z]
+4 −4		src/metawear/core/cpp/datainterpreter.h
+4 −4		src/metawear/core/cpp/datasignal.cpp
+7 −7		src/metawear/impl/cpp/datainterpreter.cpp
+2 −2		src/metawear/processor/cpp/dataprocessor.cpp
+1 −1		src/metawear/sensor/accelerometer_bosch.h
+93 −92		src/metawear/sensor/cpp/accelerometer_bosch.cpp
+4 −4		src/metawear/sensor/cpp/accelerometer_bosch_register.h
+44 −44		src/metawear/sensor/cpp/gyro_bosch.cpp
+2 −2		src/metawear/sensor/cpp/gyro_bosch_register.h