Skip to content

Commit

Permalink
Update MetaWear SDK Cpp to 0.12.1-hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen Schiffli committed Jan 30, 2018
1 parent 8da3ab1 commit 5b92ca9
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 25 deletions.
2 changes: 1 addition & 1 deletion MetaWear-SDK-Cpp
Submodule MetaWear-SDK-Cpp updated 110 files
13 changes: 7 additions & 6 deletions examples/anonymous_datasignals.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
* Created by sschiffli on 11/2/17.
*/
var MetaWear = require('../index')//require('metawear');
var ref = require('ref')

// MetaWear.discoverByAddress('f6:3d:13:48:ce:ab', function (device) {
MetaWear.discover(function (device) {
console.log('connecting...' + device.address);
device.connectAndSetUp(function (error) {
console.log('connected!');
MetaWear.mbl_mw_metawearboard_create_anonymous_datasignals(device.board,
MetaWear.FnVoid_MetaWearBoardP_AnonymousDataSignalP_UInt.toPointer(function (board, anonymousSignals, size) {
MetaWear.mbl_mw_metawearboard_create_anonymous_datasignals(device.board, ref.NULL,
MetaWear.FnVoid_VoidP_MetaWearBoardP_AnonymousDataSignalP_UInt.toPointer(function (context, board, anonymousSignals, size) {

This comment has been minimized.

Sign in to view

Copy link
@robikovacs

robikovacs Jun 9, 2018

@sschiffli Hi, this line of code is causing problems for me. Any ideas? Thank you!

 MetaWear.FnVoid_VoidP_MetaWearBoardP_AnonymousDataSignalP_UInt.toPointer(function (context, board, anonymousSignals, size) {
                                                                     ^

TypeError: Cannot read property 'toPointer' of undefined

This comment has been minimized.

Sign in to view

Copy link
@mbientlab

mbientlab Jun 11, 2018

Collaborator

Make sure you have the latest 0.1.2 version of npm 'metawear' package installed
if (!anonymousSignals) {
console.log('nothing being logged');
process.exit(1);
Expand All @@ -20,7 +21,7 @@ MetaWear.discover(function (device) {
var i;
for (i = 0; i < size; i++) {
var identifier = MetaWear.mbl_mw_anonymous_datasignal_get_identifier(anonymousSignals[i]);
MetaWear.mbl_mw_anonymous_datasignal_subscribe(anonymousSignals[i], MetaWear.FnVoid_DataP.toPointer(function onSignal(dataPtr) {
MetaWear.mbl_mw_anonymous_datasignal_subscribe(anonymousSignals[i], ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer(function onSignal(context, dataPtr) {
var data = dataPtr.deref();
var pt = data.parseValue();
console.log(identifier + ':' + data.epoch + ' ' + JSON.stringify(pt));
Expand All @@ -41,16 +42,16 @@ MetaWear.discover(function (device) {
function download(device, callback) {
// Setup the handlers for events during the download
var downloadHandler = new MetaWear.LogDownloadHandler();
downloadHandler.received_progress_update = MetaWear.FnVoid_UInt_UInt.toPointer(function onSignal(entriesLeft, totalEntries) {
downloadHandler.received_progress_update = MetaWear.FnVoid_VoidP_UInt_UInt.toPointer(function onSignal(context, entriesLeft, totalEntries) {
console.log('received_progress_update entriesLeft:' + entriesLeft + ' totalEntries:' + totalEntries);
if (entriesLeft === 0) {
callback(null);
}
});
downloadHandler.received_unknown_entry = MetaWear.FnVoid_UByte_Long_UByteP_UByte.toPointer(function onSignal(id, epoch, data, length) {
downloadHandler.received_unknown_entry = MetaWear.FnVoid_VoidP_UByte_Long_UByteP_UByte.toPointer(function onSignal(context, id, epoch, data, length) {
console.log('received_unknown_entry');
});
downloadHandler.received_unhandled_entry = MetaWear.FnVoid_DataP.toPointer(function onSignal(dataPtr) {
downloadHandler.received_unhandled_entry = MetaWear.FnVoid_VoidP_DataP.toPointer(function onSignal(context, dataPtr) {
var data = dataPtr.deref();
var dataPoint = data.parseValue();
console.log('received_unhandled_entry: ' + dataPoint);
Expand Down
17 changes: 10 additions & 7 deletions examples/logging.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var MetaWear = require('../index')//require('metawear');
var ref = require('ref');
// 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
Expand Down Expand Up @@ -42,25 +43,25 @@ function downloadLog(device, callback) {
// Shutdown log
MetaWear.mbl_mw_logging_stop(device.board);
// Setup handerl for accel data points
MetaWear.mbl_mw_logger_subscribe(accelLogger, MetaWear.FnVoid_DataP.toPointer(function onSignal(dataPtr) {
MetaWear.mbl_mw_logger_subscribe(accelLogger, ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer(function onSignal(context, dataPtr) {
var data = dataPtr.deref();
var pt = data.parseValue();
console.log(data.epoch + ' ' + pt.x + ',' + pt.y + ',' + pt.z);
}));
// Setup the handlers for events during the download
var downloadHandler = new MetaWear.LogDownloadHandler();
downloadHandler.received_progress_update = MetaWear.FnVoid_UInt_UInt.toPointer(function onSignal(entriesLeft, totalEntries) {
downloadHandler.received_progress_update = MetaWear.FnVoid_VoidP_UInt_UInt.toPointer(function onSignal(context, entriesLeft, totalEntries) {
console.log('received_progress_update entriesLeft:' + entriesLeft + ' totalEntries:' + totalEntries);
if (entriesLeft === 0) {
// Remove all log entries if told to stop logging
MetaWear.mbl_mw_metawearboard_tear_down(device.board);
callback(null);
}
});
downloadHandler.received_unknown_entry = MetaWear.FnVoid_UByte_Long_UByteP_UByte.toPointer(function onSignal(id, epoch, data, length) {
downloadHandler.received_unknown_entry = MetaWear.FnVoid_VoidP_UByte_Long_UByteP_UByte.toPointer(function onSignal(context, id, epoch, data, length) {
console.log('received_unknown_entry');
});
downloadHandler.received_unhandled_entry = MetaWear.FnVoid_DataP.toPointer(function onSignal(dataPtr) {
downloadHandler.received_unhandled_entry = MetaWear.FnVoid_VoidP_DataP.toPointer(function onSignal(context, dataPtr) {
var data = dataPtr.deref();
var dataPoint = data.parseValue();
console.log('received_unhandled_entry: ' + dataPoint);
Expand All @@ -74,12 +75,14 @@ function startLogging(device, callback) {
MetaWear.mbl_mw_acc_set_range(device.board, 16.0);
MetaWear.mbl_mw_acc_write_acceleration_config(device.board);

MetaWear.mbl_mw_acc_enable_acceleration_sampling(device.board);
MetaWear.mbl_mw_acc_start(device.board);
// See if we already created a logger
var accSignal = MetaWear.mbl_mw_acc_get_acceleration_data_signal(device.board);
MetaWear.mbl_mw_datasignal_log(accSignal, MetaWear.FnVoid_DataLoggerP.toPointer(function (logger) {
MetaWear.mbl_mw_datasignal_log(accSignal, ref.NULL, MetaWear.FnVoid_VoidP_DataLoggerP.toPointer(function (context, logger) {
accelLogger = logger;
callback(logger.address() ? null : new Error('failed to start logging accel'));
}));

MetaWear.mbl_mw_logging_start(device.board, 0);
MetaWear.mbl_mw_acc_enable_acceleration_sampling(device.board);
MetaWear.mbl_mw_acc_start(device.board);
}
3 changes: 2 additions & 1 deletion examples/multi_device.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var MetaWear = require('../index')//require('metawear');
var fs = require('fs');
var ref = require('ref');

var addresses = [
'f3:97:6b:cc:71:97',
Expand Down Expand Up @@ -39,7 +40,7 @@ function startAccelStream(device) {
MetaWear.mbl_mw_acc_set_range(device.board, 8.0);
MetaWear.mbl_mw_acc_write_acceleration_config(device.board);
var accSignal = MetaWear.mbl_mw_acc_get_acceleration_data_signal(device.board);
MetaWear.mbl_mw_datasignal_subscribe(accSignal, MetaWear.FnVoid_DataP.toPointer(function gotTimer(dataPtr) {
MetaWear.mbl_mw_datasignal_subscribe(accSignal, ref.NULL, MetaWear.FnVoid_VoidP_DataP.toPointer(function gotTimer(context, dataPtr) {
var data = dataPtr.deref();
var pt = data.parseValue();
console.log(pt.x, pt.y, pt.z);
Expand Down
21 changes: 11 additions & 10 deletions lib/metawear.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ var MetaWear = function (peripheral) {

// Now create the metawear board object (this is used for accessing the SDK)
var connection = new MetaWear.BtleConnection();
connection.write_gatt_char = MetaWear.FnVoid_VoidP_GattCharWriteType_GattCharP_UByteP_UByte.toPointer(writeGattChar.bind(this));
connection.read_gatt_char = MetaWear.FnVoid_VoidP_GattCharP_FnIntVoidPtrArray.toPointer(readGattChar.bind(this));
connection.enable_notifications = MetaWear.FnVoid_VoidP_GattCharP_FnIntVoidPtrArray_FnVoidVoidPtrInt.toPointer(enableNotifications.bind(this));
connection.on_disconnect = MetaWear.FnVoid_VoidP_FnVoidVoidPtrInt.toPointer(onDisconnect.bind(this));
connection.context = ref.NULL;
connection.write_gatt_char = MetaWear.FnVoid_VoidP_VoidP_GattCharWriteType_GattCharP_UByteP_UByte.toPointer(writeGattChar.bind(this));
connection.read_gatt_char = MetaWear.FnVoid_VoidP_VoidP_GattCharP_FnIntVoidPtrArray.toPointer(readGattChar.bind(this));
connection.enable_notifications = MetaWear.FnVoid_VoidP_VoidP_GattCharP_FnIntVoidPtrArray_FnVoidVoidPtrInt.toPointer(enableNotifications.bind(this));
connection.on_disconnect = MetaWear.FnVoid_VoidP_VoidP_FnVoidVoidPtrInt.toPointer(onDisconnect.bind(this));
this.board = MetaWear.mbl_mw_metawearboard_create(connection.ref());
// No timeout during debug and enabling
MetaWear.mbl_mw_metawearboard_set_time_for_response(this.board, 0);
Expand Down Expand Up @@ -101,8 +102,8 @@ MetaWear.prototype.connectAndSetUp = function (callback, initBuf) {
MetaWear.mbl_mw_metawearboard_deserialize(this.board, initBuf, initBuf.length);
}
// Setup the CPP SDK
MetaWear.mbl_mw_metawearboard_initialize(this.board, MetaWear.FnVoid_MetaWearBoardP_Int.toPointer(function onInitialize(board, code) {
// Adjust link speed for macOS only since we can't adujust it elsewhere
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);
}
Expand Down Expand Up @@ -183,7 +184,7 @@ function NativeGattChar(array) {
this.shortCharacteristicUUID = bytesToString(array, 21, 20);
}

function writeGattChar(caller, writeType, characteristicPtr, valuePtr, length) {
function writeGattChar(context, caller, writeType, characteristicPtr, valuePtr, length) {
var data = ref.reinterpret(valuePtr, length, 0);
var characteristic = new NativeGattChar(characteristicPtr);
if (!this.hasCharacteristic(characteristic.serviceUUID, characteristic.characteristicUUID)) {
Expand All @@ -210,7 +211,7 @@ function writeGattChar(caller, writeType, characteristicPtr, valuePtr, length) {
});
}

function readGattChar(caller, characteristicPtr, callback) {
function readGattChar(context, caller, characteristicPtr, callback) {
var characteristic = new NativeGattChar(characteristicPtr);
var charToRead = this._characteristics[characteristic.shortServiceUUID][characteristic.shortCharacteristicUUID];
if (!charToRead) {
Expand All @@ -226,7 +227,7 @@ function readGattChar(caller, characteristicPtr, callback) {
});
}

function enableNotifications(caller, characteristicPtr, onData, subscribeComplete) {
function enableNotifications(context, caller, characteristicPtr, onData, subscribeComplete) {
var characteristic = new NativeGattChar(characteristicPtr);
var charToNotify = this._characteristics[characteristic.serviceUUID][characteristic.characteristicUUID];
if (!charToNotify) {
Expand All @@ -249,7 +250,7 @@ function enableNotifications(caller, characteristicPtr, onData, subscribeComplet
});
}

function onDisconnect(caller, handler) {
function onDisconnect(context, caller, handler) {
this.once('disconnect', function () {
handler(caller, 0);
});
Expand Down

0 comments on commit 5b92ca9

Please sign in to comment.