', {class: 'mui-col-sm-12'}).append(_graph));
diff --git a/app/js/device/fmc/TSL.js b/app/js/device/fmc/TSL.js
index 11c0ba5..8884db6 100644
--- a/app/js/device/fmc/TSL.js
+++ b/app/js/device/fmc/TSL.js
@@ -81,27 +81,13 @@ var TSL = function(p) {
*/
this.onReadVelState = function(d) {
var raw = new Uint8Array(d);
- var output = [], signedOutput = new Int16Array(9);
+ var output = [];
+ var signedOutput = new Int16Array(9);
// Var humidity = this.convertToPercent(raw);
console.log('Vel State:', raw);
// This.$result.h.text(humidity.toFixed(2) + '%');
- /* output.push(((raw[1] << 8) + (raw[0])));
- output.push(((raw[3] << 8) + (raw[2])));
- output.push(((raw[5] << 8) + (raw[4])));
- output.push(((raw[7] << 8) + (raw[6])));
- output.push(((raw[9] << 8) + (raw[8])));
- output.push(((raw[11] << 8) + (raw[10])));
- output.push(((raw[13] << 8) + (raw[12])));
- output.push(((raw[15] << 8) + (raw[14])));
- output.push(((raw[17] << 8) + (raw[16])));
-
- for (var t = 0;t < output.length;t++) {
- signedOutput[t] = (output[t] * 1.0) / (32768/ 2);
- }
- console.log(output);
- console.log(signedOutput);*/
};
@@ -124,7 +110,7 @@ var TSL = function(p) {
for (var t = 0;t < output.length;t++) {
- signedOutput[t] = (output[t] * 1.0) / (32768/ 2);
+ signedOutput[t] = (output[t] * 1.0) / (32768 / 2);
}
console.log(output);
console.log(signedOutput);
@@ -199,19 +185,16 @@ var TSL = function(p) {
this.onHistoryAck = function(d) {
var raw = new Uint8Array(d);
- var raw16 = new Uint16Array(d);
+ var raw16 = new Uint16Array(d);
console.log('History Ack:', raw, raw16);
- //this.$result.temp.text(temp.toFixed(2) + '°C');
-
};
this.onReadHistory = function(d) {
var raw = new Uint8Array(d);
console.log('History:', raw);
- //this.$result.temp.text(temp.toFixed(2) + '°C');
- this.historyloops++;
- this.historyAck();
+ this.historyloops++;
+ this.historyAck();
};
@@ -220,30 +203,28 @@ var TSL = function(p) {
var raw16 = new Uint16Array(d);
console.log('History Size:', raw, raw16);
- //this.$result.temp.text(temp.toFixed(2) + '°C');
-
this.history = new Uint8Array(raw16[0]);
this.readHistory();
};
this.historySize = function() {
console.log('historySize');
- ble.read(this.deviceID,
- this.serviceDef.service,
- this.serviceDef.historySize,
- this.onHistorySize.bind(this),
- this.onError);
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.historySize,
+ this.onHistorySize.bind(this),
+ this.onError);
};
-this.historyAck = function() {
- console.log('historyAck');
- ble.read(this.deviceID,
- this.serviceDef.service,
- this.serviceDef.historyAck,
- this.onHistoryAck.bind(this),
- this.onError);
-};
+ this.historyAck = function() {
+ console.log('historyAck');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.historyAck,
+ this.onHistoryAck.bind(this),
+ this.onError);
+ };
this.readHistory = function() {
console.log('readHistory');
@@ -371,12 +352,12 @@ this.historyAck = function() {
this.readHumidityMinState();
this.readAccelState();
-this.readVelState();
+ this.readVelState();
this.historySize();
- // this.readHistory();
+ // This.readHistory();
- // setTimeout(this.readServices.bind(this),20000);
+ // setTimeout(this.readServices.bind(this),20000);
};
this.startService = function() {
diff --git a/app/js/device/sensorworks/bluvib.js b/app/js/device/sensorworks/bluvib.js
new file mode 100644
index 0000000..f2c45d8
--- /dev/null
+++ b/app/js/device/sensorworks/bluvib.js
@@ -0,0 +1,111 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-20
+ * Time: 10:13
+ *
+ */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS, ejs */
+/* global ble */
+/* jshint browser: true , devel: true*/
+
+var BLUVIB = function(p) {
+ 'use strict';
+ this.name = 'BLUVIB';
+ this.deviceID = p.deviceID || null;
+ this.target = p.target || null;
+
+ // 9FB70001-EF7D-40C8-9C1E-5052BC101EFA
+
+ this.capabilityID = '9FB70001-EF7D-40C8-9C1E-5052BC101EFA';
+ this.serviceDef = {
+ service: '9FB70001-EF7D-40C8-9C1E-5052BC101EFA',
+ enable: '9FB70002-EF7D-40C8-9C1E-5052BC101EFA',
+ notify: '9FB70003-EF7D-40C8-9C1E-5052BC101EFA',
+ period: '9FB70004-EF7D-40C8-9C1E-5052BC101EFA'
+
+
+ };
+
+ this.$result = {temp: null, tempMax: null, tempMin: null};
+ this.data = [];
+ this.setFrame();
+ this.read = {};
+
+ this.html = {};
+
+ this.history = null;
+
+ this.historyloops = 0;
+
+
+
+ this.onNotification = function(d) {
+
+ this.readRaw('BluVib', d);
+ };
+
+
+ this.readValue = function() {
+ console.log('readHistory');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.history,
+ this.onReadValue.bind(this),
+ this.onError);
+
+ };
+
+
+ this.readServices = function() {
+
+ this.readValue();
+ };
+
+ this.startService = function() {
+
+ if (this.deviceID !== null) {
+
+ console.log('Starting BLUVIB Service on ', this.deviceID);
+ console.log(this.serviceDef);
+ this.insertFrame();
+
+ ble.startNotification(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.notify,
+ this.onNotification.bind(this),
+ this.onError);
+
+
+ var configData = new Uint16Array(1);
+ // Turn on gyro, accel, and mag, 2G range, Disable wake on motion
+ configData[0] = 0x0001;
+ ble.write(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.enable,
+ configData.buffer,
+ function(m) { console.log('Started BluVib.',m); },
+ this.onError);
+
+ }
+
+ };
+
+
+ this.animateGraph = function() {
+ return -1;
+ };
+
+ this.insertFrame = function() {
+
+ var self = this;
+
+ // Call the parent displayForm first...
+ this.superClass_.insertFrame.call(self);
+
+ };
+
+};
+
+inheritsFrom(BLUVIB, CAPABILITY);
+capabilityManager.register({id: '9FB70001-EF7D-40C8-9C1E-5052BC101EFA', module: BLUVIB});
diff --git a/app/js/standards/capability.js b/app/js/standards/capability.js
index ac9eab6..73b2de6 100644
--- a/app/js/standards/capability.js
+++ b/app/js/standards/capability.js
@@ -52,6 +52,40 @@ var CAPABILITY = function(p) {
capabilityManager.register({id: this.capabilityID, module: this});
};
+CAPABILITY.prototype.arrayToAscii = function(a) {
+
+ var _a = [].slice.call(a);
+ _a = _a.map(function(num) {
+ return String.fromCharCode(num);
+ });
+
+ return _a.join('');
+};
+
+CAPABILITY.prototype.arrayToHex = function(a) {
+
+ var _a = [].slice.call(a);
+ _a = _a.map(function(num) {
+ return ('00' + num.toString(16)).slice(-2);
+ });
+
+ return _a.join(', ');
+};
+
+
+
+CAPABILITY.prototype.readRaw = function(id, data) {
+
+
+ var a = new Uint8Array(data);
+
+ console.log(id, a);
+ console.log(id, this.arrayToAscii(a));
+ console.log(id, this.arrayToHex(a));
+ console.log(data);
+
+};
+
CAPABILITY.prototype.setFrame = function() {
this.$frame = (this.target !== null) ? $('#' + this.target) : null;
};
diff --git a/app/js/standards/deviceInformation.js b/app/js/standards/deviceInformation.js
index 6e3a823..a7f469d 100644
--- a/app/js/standards/deviceInformation.js
+++ b/app/js/standards/deviceInformation.js
@@ -9,53 +9,67 @@
/* global ble */
/* jshint browser: true , devel: true*/
-var DEVICEINFO = function() {
+var DEVICEINFO = function(p) {
this.name = 'Device Information';
+ this.deviceID = p.deviceID || null;
+ this.target = p.target || null;
+
this.capabilityID = '180A';
this.serviceDef = {
- service: '180A', manufacturer_name_string: '2A29', model_number_string: '2A24'
+ service: '180A', manufacturer_name_string: '2A29', model_number_string: '2A24', system_id: '2A23',
};
- this.onBatteryLevelChange = function(data) {
- console.log(data);
- var a = new Uint8Array(data);
- this.state = a[0];
- console.log('onBatteryLevelChange', this.state);
- };
- this.readBatteryState = function() {
- console.log('readBatteryState');
- ble.read(this.deviceID,
- this.serviceDef.service,
- this.serviceDef.level,
- this.onReadBatteryLevel.bind(this),
- this.onError);
+ this.data = {
+ manufacturerName: '',
+ modelNumber: ''
+ };
+
+ this.onSystemID = function(data) {
+ 'use strict';
+ this.readRaw('SystemID', data);
};
- this.onReadBatteryLevel = function(data) {
- console.log(data);
+ this.onModelNumberString = function(data) {
+ 'use strict';
var a = new Uint8Array(data);
- this.state = a[0];
- console.log('onReadBatteryLevel', this.state);
+ this.data.modelNumber = this.arrayToAscii(a);
+ console.log('Model Number', this.data.modelNumber);
};
+
+ this.readSystemID = function() {
+ console.log('readSystemID');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.system_id,
+ this.onSystemID.bind(this),
+ this.onError);
+ };
+
+
+ this.readModelNumberString = function() {
+ console.log('readModelNumberString');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.model_number_string,
+ this.onModelNumberString.bind(this),
+ this.onError);
+ };
+
this.startService = function() {
'use strict';
if (this.deviceID !== null) {
- console.log('Starting Battery Service on ', this.deviceID);
+ console.log('Starting DEVICEINFO Service on ', this.deviceID);
console.log(this.serviceDef);
- this.insertFrame();
+ this.readSystemID();
+ this.readModelNumberString();
- ble.startNotification(this.deviceID,
- this.serviceDef.service,
- this.serviceDef.level,
- this.onBatteryLevelChange.bind(this),
- this.onError);
}
};
};
-inheritsFrom(BATTERY, CAPABILITY);
-capabilityManager.register({id: '180F', module: BATTERY});
+inheritsFrom(DEVICEINFO, CAPABILITY);
+capabilityManager.register({id: '180A', module: DEVICEINFO});
diff --git a/app/js/standards/generic_access.js b/app/js/standards/generic_access.js
new file mode 100644
index 0000000..86db4ba
--- /dev/null
+++ b/app/js/standards/generic_access.js
@@ -0,0 +1,160 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-20
+ * Time: 10:13
+ *
+ */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global ble */
+/* jshint browser: true , devel: true*/
+
+var GENERICACCESS = function(p) {
+ this.name = 'GenericAccess';
+ this.deviceID = p.deviceID || null;
+ this.target = p.target || null;
+ this.capabilityID = '1800';
+ this.serviceDef = {
+ service: '1800', deviceName: '2A00', appearance: '2A01', PPCP: '2A04'
+ };
+
+ this.data = {
+ deviceName: '',
+ appearance: '',
+ ppcp: {
+ min_conn_int: 0,
+ max_conn_int: 0,
+ slave_latency: 0,
+ conn_super_timeout_multi: 0
+ }
+ };
+
+ this.appearance_category = {
+ 0: 'Unknown None',
+ 64: 'Generic Phone',
+ 128: 'Generic Computer ',
+ 192: 'Generic Watch ',
+ 193: 'Watch: Sports Watch ',
+ 256: 'Generic Clock ',
+ 320: 'Generic Display ',
+ 384: 'Generic Remote Control ',
+ 448: 'Generic Eye-glasses ',
+ 512: 'Generic Tag ',
+ 576: 'Generic Keyring ',
+ 640: 'Generic Media Player ',
+ 704: 'Generic Barcode Scanner ',
+ 768: 'Generic Thermometer ',
+ 769: 'Thermometer: Ear ',
+ 832: 'Generic Heart rate Sensor ',
+ 833: 'Heart Rate Sensor: Heart Rate Belt ',
+ 896: 'Generic Blood Pressure ',
+ 897: 'Blood Pressure: Arm Blood ',
+ 898: 'Blood Pressure: Wrist Blood ',
+ 960: 'Human Interface Device (HID) ',
+ 961: 'Keyboard ',
+ 962: 'Mouse ',
+ 963: 'Joystick ',
+ 964: 'Gamepad ',
+ 965: 'Digitizer Tablet ',
+ 966: 'Card Reader ',
+ 967: 'Digital Pen ',
+ 968: 'Barcode Scanner ',
+ 1024: 'Generic Glucose Meter ',
+ 1088: 'Generic: Running Walking Sensor ',
+ 1089: 'Running Walking Sensor: In-Shoe Running ',
+ 1090: 'Running Walking Sensor: On-Shoe Running ',
+ 1091: 'Running Walking Sensor: On-Hip Running ',
+ 1152: 'Generic: Cycling ',
+ 1153: 'Cycling: Cycling Computer ',
+ 1154: 'Cycling: Speed Sensor ',
+ 1155: 'Cycling: Cadence Sensor ',
+ 1156: 'Cycling: Power Sensor ',
+ 1157: 'Cycling: Speed and Cadence Sensor ',
+ 3136: 'Generic: Pulse Oximeter ',
+ 3137: 'Fingertip ',
+ 3138: 'Wrist Worn ',
+ 3200: 'Generic: Weight Scale ',
+ 5184: 'Generic: Outdoor Sports Activity ',
+ 5185: 'Location Display Device ',
+ 5186: 'Location and Navigation Display Device ',
+ 5187: 'Location Pod ',
+ 5188: 'Location and Navigation Pod '
+ };
+
+ this.onDeviceName = function(data) {
+ var a = new Uint8Array(data);
+ this.data.deviceName = this.arrayToAscii(a);
+ console.log('Device Name', this.data.deviceName);
+ };
+
+ this.onAppearance = function(data) {
+ var a = new Uint16Array(data);
+ var id = a[0];
+ this.data.appearance = this.appearance_category[id];
+ console.log('Appearance', this.data.appearance);
+ };
+
+ this.onPPCP = function(data) {
+ var a = new Uint16Array(data);
+
+ this.data = {
+ ppcp: {
+ min_conn_int: (a[0] * 1.25),
+ max_conn_int: (a[1] * 1.25),
+ slave_latency: a[2],
+ conn_super_timeout_multi: a[3]
+ }
+ };
+
+ console.log('PPCP', this.data.ppcp);
+ };
+
+
+ this.readDeviceName = function() {
+ console.log('readDeviceName');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.deviceName,
+ this.onDeviceName.bind(this),
+ this.onError);
+ };
+
+ this.readAppearance = function() {
+ console.log('readAppearance');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.appearance,
+ this.onAppearance.bind(this),
+ this.onError);
+ };
+
+ /**
+ * Peripheral Preferred Connection Parameters
+ */
+ this.readPPCP = function() {
+ console.log('readPPCP');
+ ble.read(this.deviceID,
+ this.serviceDef.service,
+ this.serviceDef.PPCP,
+ this.onPPCP.bind(this),
+ this.onError);
+ };
+
+ this.startService = function() {
+ 'use strict';
+ if (this.deviceID !== null) {
+ console.log('Starting Generic Access on ', this.deviceID);
+ console.log(this.serviceDef);
+
+ this.readDeviceName();
+ this.readAppearance();
+ this.readPPCP();
+
+ }
+
+ };
+
+};
+
+inheritsFrom(GENERICACCESS, CAPABILITY);
+capabilityManager.register({id: '1800', module: GENERICACCESS});
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
index ae1689b..90d32de 100644
Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index 85791ef..b138c5d 100644
Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index 44b6a02..018306f 100644
Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index 2250784..7f40464 100644
Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html
index 54414c6..5a38a26 100644
--- a/platforms/android/assets/www/index.html
+++ b/platforms/android/assets/www/index.html
@@ -1,134 +1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Sensor Toy
-
-
-
-
-
-
-
-
-
-
- Devices
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Sensor Toy
\ No newline at end of file