From 3b08c6bfe7448972122d1b41153a02271c0e9683 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@gmail.com>
Date: Thu, 9 Jun 2016 16:45:03 +0100
Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-06-09=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sensortoy/sensortoy/app/index.html            |   4 +
 sensortoy/sensortoy/app/js/device/fmc/TSL.js  | 205 ++++++++++++++++++
 .../app/js/standards/deviceInformation.js     |  61 ++++++
 .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes
 .../2.2.1/taskArtifacts/fileHashes.bin        | Bin 148764 -> 148988 bytes
 .../2.2.1/taskArtifacts/fileSnapshots.bin     | Bin 10918810 -> 10918810 bytes
 .../2.2.1/taskArtifacts/taskArtifacts.bin     | Bin 61031 -> 61031 bytes
 .../platforms/android/assets/www/index.html   |   4 +
 .../js/device/CC2650/cc2650_accelerometer.js  |   2 +-
 .../android/assets/www/js/device/fmc/TSL.js   | 205 ++++++++++++++++++
 .../www/js/standards/deviceInformation.js     |  61 ++++++
 .../SODashServer/SODashServer/app/js/appv2.js |   3 +-
 12 files changed, 542 insertions(+), 3 deletions(-)
 create mode 100644 sensortoy/sensortoy/app/js/device/fmc/TSL.js
 create mode 100644 sensortoy/sensortoy/app/js/standards/deviceInformation.js
 create mode 100644 sensortoy/sensortoy/platforms/android/assets/www/js/device/fmc/TSL.js
 create mode 100644 sensortoy/sensortoy/platforms/android/assets/www/js/standards/deviceInformation.js

diff --git a/sensortoy/sensortoy/app/index.html b/sensortoy/sensortoy/app/index.html
index 10cc4ad..2126190 100644
--- a/sensortoy/sensortoy/app/index.html
+++ b/sensortoy/sensortoy/app/index.html
@@ -118,6 +118,10 @@
         src="js/device/CC2650/cc2650_humidity.js"></script>
 <!-- endbuild -->
 
+<script type="text/javascript"
+        src="js/device/fmc/TSL.js"></script>
+
+
 <!-- build:js -->
 <script type="text/javascript" src="js/index.js"></script>
 <!-- endbuild -->
diff --git a/sensortoy/sensortoy/app/js/device/fmc/TSL.js b/sensortoy/sensortoy/app/js/device/fmc/TSL.js
new file mode 100644
index 0000000..91b525d
--- /dev/null
+++ b/sensortoy/sensortoy/app/js/device/fmc/TSL.js
@@ -0,0 +1,205 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-20
+ * Time: 10:13
+ *
+ */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global ble  */
+/* jshint browser: true , devel: true*/
+
+var TSL = function(p) {
+  'use strict';
+  this.name = 'TSL';
+  this.deviceID = p.deviceID || null;
+  this.target = p.target || null;
+
+  // F000BB00-0451-4000-B000-A01D48F70D07
+
+  this.capabilityID = 'F000BB00-0451-4000-B000-A01D48F70D07';
+  this.serviceDef = {
+    service: 'F000BB00-0451-4000-B000-A01D48F70D07',
+    enable: 'F000BB01-0451-4000-B000-A01D48F70D07',
+    control: 'F000BB02-0451-4000-B000-A01D48F70D07',
+    period: 'F000BB03-0451-4000-B000-A01D48F70D07',
+    location: 'F000BB04-0451-4000-B000-A01D48F70D07',
+    historySize: 'F000BB05-0451-4000-B000-A01D48F70D07',
+    history: 'F000BB06-0451-4000-B000-A01D48F70D07',
+    historyAck: 'F000BB07-0451-4000-B000-A01D48F70D07',
+    temp: 'F000BB08-0451-4000-B000-A01D48F70D07',
+    tempMaximum: 'F000BB09-0451-4000-B000-A01D48F70D07',
+    tempMinimum: 'F000BB0A-0451-4000-B000-A01D48F70D07',
+    preValue: 'F000BB0B-0451-4000-B000-A01D48F70D07',
+    presMaximum: 'F000BB0C-0451-4000-B000-A01D48F70D07',
+    presMinimum: 'F000BB0D-0451-4000-B000-A01D48F70D07',
+    humidityValue: 'F000BB0E-0451-4000-B000-A01D48F70D07',
+    humidityMax: 'F000BB0F-0451-4000-B000-A01D48F70D07',
+    humidityMin: 'F000BB10-0451-4000-B000-A01D48F70D07',
+    accelerationMax: 'F000BB11-0451-4000-B000-A01D48F70D07',
+    velocityMax: 'F000BB12-0451-4000-B000-A01D48F70D07',
+    loggerId: 'F000BB13-0451-4000-B000-A01D48F70D07',
+    shockBandwidth: 'F000BB14-0451-4000-B000-A01D48F70D07',
+    shockThreshold: 'F000BB15-0451-4000-B000-A01D48F70D07',
+    config: 'F0002902-0451-4000-B000-A01D48F70D07'
+
+  };
+
+  this.$result = {temp: null, tempMax: null, tempMin: null};
+  this.data = [];
+  this.setFrame();
+
+  this.arrayToHex = function(a) {
+    return a.map(function(i) {
+              return ('00' + i.toString(16)).slice(-2) + ',';
+            });
+  };
+
+  this.convertToTemp = function(raw) {
+    return ((raw[1] << 8) + (raw[0])) / 100;
+  };
+
+/*
+  this.$result.temp = $('#' + tslTemp);
+     this.$result.tempMax = $('#' + tslTempMax);
+     this.$result.tempMin = $('#' + tslTempMin);
+*/
+
+
+  this.onReadTempState = function(d) {
+    var raw = new Uint8Array(d);
+    var temp = this.convertToTemp(raw);
+    console.log('Temp State:', temp);
+    this.$result.temp.text(temp.toFixed(2) + '°C');
+
+  };
+
+  this.onReadTempMax = function(d) {
+    var raw = new Uint8Array(d);
+    var temp = this.convertToTemp(raw);
+    console.log('Temp Max:', temp);
+    this.$result.tempMax.text(temp.toFixed(2) + '°C');
+  };
+
+  this.onReadTempMin = function(d) {
+      var raw = new Uint8Array(d);
+      var temp = this.convertToTemp(raw);
+      console.log('Temp Min:', temp);
+      this.$result.tempMin.text(temp.toFixed(2) + '°C');
+    };
+
+  this.readHistory = function() {
+        console.log('readTempState');
+        ble.read(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.history,
+          this.onReadTempState.bind(this),
+          this.onError);
+      };
+
+  this.readTempState = function() {
+      console.log('readTempState');
+      ble.read(this.deviceID,
+        this.serviceDef.service,
+        this.serviceDef.temp,
+        this.onReadTempState.bind(this),
+        this.onError);
+    };
+
+  this.readTempMax = function() {
+        console.log('readTempMax');
+        ble.read(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.tempMaximum,
+          this.onReadTempMax.bind(this),
+          this.onError);
+      };
+
+  this.readTempMin = function() {
+          console.log('readTempMax');
+          ble.read(this.deviceID,
+            this.serviceDef.service,
+            this.serviceDef.tempMinimum,
+            this.onReadTempMin.bind(this),
+            this.onError);
+        };
+
+  this.startService = function() {
+
+    if (this.deviceID !== null) {
+
+      console.log('Starting TSL Service on ', this.deviceID);
+      console.log(this.serviceDef);
+      this.insertFrame();
+
+
+      this.readTempState();
+      this.readTempMax();
+      this.readTempMin();
+
+    }
+
+  };
+
+  this.onTslData = function(data) {
+
+    var raw = new Uint16Array(data);
+
+    console.log(raw);
+
+  };
+
+  this.animateGraph = function() {
+    return -1;
+  };
+
+  this.insertFrame = function() {
+
+    var self = this;
+
+    // Call the parent displayForm first...
+    this.superClass_.insertFrame.call(self);
+
+    var tslTemp = this.frameID + '-t';
+    var tslTempMax = this.frameID + '-tmax';
+    var tslTempMin = this.frameID + '-tmin';
+
+    var row = $('<div />', {class: 'mui-row'});
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Temp:'}).appendTo(
+      row);
+
+    $('<div />',
+      {class: 'mui-col-xs-9 mui--text-dark', id: tslTemp}).appendTo(row);
+
+    this.$id.append(row);
+
+    row = $('<div />', {class: 'mui-row'});
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'TMax:'}).appendTo(
+      row);
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-dark', id: tslTempMax}).appendTo(row);
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'TMin:'}).appendTo(
+      row);
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-dark', id: tslTempMin}).appendTo(row);
+
+    this.$id.append(row);
+
+    this.$result.temp = $('#' + tslTemp);
+    this.$result.tempMax = $('#' + tslTempMax);
+    this.$result.tempMin = $('#' + tslTempMin);
+
+  };
+
+};
+
+inheritsFrom(TSL, CAPABILITY);
+capabilityManager.register({id: 'F000BB00-0451-4000-B000-A01D48F70D07', module: TSL});
diff --git a/sensortoy/sensortoy/app/js/standards/deviceInformation.js b/sensortoy/sensortoy/app/js/standards/deviceInformation.js
new file mode 100644
index 0000000..6e3a823
--- /dev/null
+++ b/sensortoy/sensortoy/app/js/standards/deviceInformation.js
@@ -0,0 +1,61 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-20
+ * Time: 10:13
+ *
+ */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global ble  */
+/* jshint browser: true , devel: true*/
+
+var DEVICEINFO = function() {
+  this.name = 'Device Information';
+  this.capabilityID = '180A';
+  this.serviceDef = {
+    service: '180A', manufacturer_name_string: '2A29', model_number_string: '2A24'
+  };
+
+  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.onReadBatteryLevel = function(data) {
+    console.log(data);
+    var a = new Uint8Array(data);
+    this.state = a[0];
+    console.log('onReadBatteryLevel', this.state);
+  };
+
+  this.startService = function() {
+    'use strict';
+    if (this.deviceID !== null) {
+      console.log('Starting Battery Service on ', this.deviceID);
+      console.log(this.serviceDef);
+
+      this.insertFrame();
+
+      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});
diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
index 992f1acbed736b65c7a93c1ae5601b850a6f91d7..0aa598d2402cd2fe81477996c0e74171bef9e80e 100644
GIT binary patch
literal 17
WcmZQx&{6#8*tO}73?RT_cpU&g?gjw>

literal 17
WcmZQx&{6#8*tO}73?RV58x8<JCIwvp

diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index 10716a11b54db6bf95467d72ed42a493d7e3d172..974c21f9124712b8d4e21cf1fdcb5dab9b89cd91 100644
GIT binary patch
delta 15992
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
K=QRAL!+!u{CLbFB

delta 15440
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

diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index eeaf64019f5b6414e62f0a0c372ab0dae1d7b04f..0954f100aa13bee52db049cf655d23ded1d64864 100644
GIT binary patch
delta 5645
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

delta 4921
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
Y>-^6biz$)3Be7rF{i-T&XI~%w1-US|r2qf`

diff --git a/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/sensortoy/sensortoy/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index 350fbd97d4aae72c980cd4bbecd867cda0ee176e..d06e3cbe33e57520523409e5a27b3e6970bc52f2 100644
GIT binary patch
delta 352
zcmaEUhxz#(<_%Np1orwg=x%&`bj8t=#!6rQbfj)7S7j8)4sI?My|Z9``C*;1jNFi^
zV8KN)Os5_-6)|s>URkW2<-)b8T$7O{tYMPzX1N6?88@@Gv<e7BIUR5Po4{lAN~=Cu
zc}7Fd<i-iT0uQ-a_g3V+YtG-lw{b=FtA4QH7UcrtGMi9~`lCxUyd7>y0|h6t{QsX_
zJ6W;8dGfkhVw2A{7;XMC?X!?TRPD|6A0B#Ka$Q(_dd+^n*PG98iD4C(uKuqzEL`LF
z`7JA-Z(7xt01;ikiDSjK4j-?rH~vrGv#-b>D4M{k!fU!{(ivk02JTZpd<cY@wbR>7
z=3dqm_@tg)$?{;Q?w-jL!xc8i?c2pHSasZAfwwVTZk5qCBMz;L$Wk+2udA;5;$8jW
cDgTBo&U4)mx+Y&($-=^{;rwtj_pula062Q0<NyEw

delta 352
zcmaEUhxz#(<_%Np1g48<xkb&j39-5(u`t9czGhRoDx-if!{XbAyv{dCt$dKlTm4cG
zEU0_CPI_kg1d)TfTPH0_-ea|?T$7RI_KJ<4H_I(J$+(%drBy)S{iVyiMoSYvS$x?(
zO?kuYlam`K^a^}iZnnC^B|*Z&VqxR2<<4Khf)TS!SmWL`3YKuJtPK~ld<7Jo$l|)+
z)qApHgY)Edv&1H!Z7|yWW!h&Uf!@eTLFZC}OL`w|F`GRzd*|l!TVhxRChV%RUsxOe
zjyYH~LnZ&-G>9nEo0><LbPm<~&v0k>V(;As6ir}N`T4la;EXW?1NSK)J_N$dyYtTd
zIHLArYGt)@9Pi?~);*IahAV82+qa8ZuyB`QSzsKS3G1SuiH5Uy9wAAc^t*Y^yi;sL
dfpN{P!-}fe2&u^zR<f}4{MR?$%zZ3I0{|{vpEv*j

diff --git a/sensortoy/sensortoy/platforms/android/assets/www/index.html b/sensortoy/sensortoy/platforms/android/assets/www/index.html
index 10cc4ad..2126190 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/index.html
+++ b/sensortoy/sensortoy/platforms/android/assets/www/index.html
@@ -118,6 +118,10 @@
         src="js/device/CC2650/cc2650_humidity.js"></script>
 <!-- endbuild -->
 
+<script type="text/javascript"
+        src="js/device/fmc/TSL.js"></script>
+
+
 <!-- build:js -->
 <script type="text/javascript" src="js/index.js"></script>
 <!-- endbuild -->
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js
index 9d338f4..8b1cfe8 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_accelerometer.js
@@ -338,7 +338,7 @@ CC2650_ACCEL = function(p) {
 
       elm.append($('<div />', { class: 'mui-col-xs-8 mui--text-title mui-ellipsis-2', text: title}));
 
-      elm.append($('<div />', {class: 'mui-col-xs-4 mui--text-right'}).append(button));
+     // elm.append($('<div />', {class: 'mui-col-xs-4 mui--text-right'}).append(button));
 
       frame.append(elm);
 
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/fmc/TSL.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/fmc/TSL.js
new file mode 100644
index 0000000..91b525d
--- /dev/null
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/fmc/TSL.js
@@ -0,0 +1,205 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-20
+ * Time: 10:13
+ *
+ */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global ble  */
+/* jshint browser: true , devel: true*/
+
+var TSL = function(p) {
+  'use strict';
+  this.name = 'TSL';
+  this.deviceID = p.deviceID || null;
+  this.target = p.target || null;
+
+  // F000BB00-0451-4000-B000-A01D48F70D07
+
+  this.capabilityID = 'F000BB00-0451-4000-B000-A01D48F70D07';
+  this.serviceDef = {
+    service: 'F000BB00-0451-4000-B000-A01D48F70D07',
+    enable: 'F000BB01-0451-4000-B000-A01D48F70D07',
+    control: 'F000BB02-0451-4000-B000-A01D48F70D07',
+    period: 'F000BB03-0451-4000-B000-A01D48F70D07',
+    location: 'F000BB04-0451-4000-B000-A01D48F70D07',
+    historySize: 'F000BB05-0451-4000-B000-A01D48F70D07',
+    history: 'F000BB06-0451-4000-B000-A01D48F70D07',
+    historyAck: 'F000BB07-0451-4000-B000-A01D48F70D07',
+    temp: 'F000BB08-0451-4000-B000-A01D48F70D07',
+    tempMaximum: 'F000BB09-0451-4000-B000-A01D48F70D07',
+    tempMinimum: 'F000BB0A-0451-4000-B000-A01D48F70D07',
+    preValue: 'F000BB0B-0451-4000-B000-A01D48F70D07',
+    presMaximum: 'F000BB0C-0451-4000-B000-A01D48F70D07',
+    presMinimum: 'F000BB0D-0451-4000-B000-A01D48F70D07',
+    humidityValue: 'F000BB0E-0451-4000-B000-A01D48F70D07',
+    humidityMax: 'F000BB0F-0451-4000-B000-A01D48F70D07',
+    humidityMin: 'F000BB10-0451-4000-B000-A01D48F70D07',
+    accelerationMax: 'F000BB11-0451-4000-B000-A01D48F70D07',
+    velocityMax: 'F000BB12-0451-4000-B000-A01D48F70D07',
+    loggerId: 'F000BB13-0451-4000-B000-A01D48F70D07',
+    shockBandwidth: 'F000BB14-0451-4000-B000-A01D48F70D07',
+    shockThreshold: 'F000BB15-0451-4000-B000-A01D48F70D07',
+    config: 'F0002902-0451-4000-B000-A01D48F70D07'
+
+  };
+
+  this.$result = {temp: null, tempMax: null, tempMin: null};
+  this.data = [];
+  this.setFrame();
+
+  this.arrayToHex = function(a) {
+    return a.map(function(i) {
+              return ('00' + i.toString(16)).slice(-2) + ',';
+            });
+  };
+
+  this.convertToTemp = function(raw) {
+    return ((raw[1] << 8) + (raw[0])) / 100;
+  };
+
+/*
+  this.$result.temp = $('#' + tslTemp);
+     this.$result.tempMax = $('#' + tslTempMax);
+     this.$result.tempMin = $('#' + tslTempMin);
+*/
+
+
+  this.onReadTempState = function(d) {
+    var raw = new Uint8Array(d);
+    var temp = this.convertToTemp(raw);
+    console.log('Temp State:', temp);
+    this.$result.temp.text(temp.toFixed(2) + '°C');
+
+  };
+
+  this.onReadTempMax = function(d) {
+    var raw = new Uint8Array(d);
+    var temp = this.convertToTemp(raw);
+    console.log('Temp Max:', temp);
+    this.$result.tempMax.text(temp.toFixed(2) + '°C');
+  };
+
+  this.onReadTempMin = function(d) {
+      var raw = new Uint8Array(d);
+      var temp = this.convertToTemp(raw);
+      console.log('Temp Min:', temp);
+      this.$result.tempMin.text(temp.toFixed(2) + '°C');
+    };
+
+  this.readHistory = function() {
+        console.log('readTempState');
+        ble.read(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.history,
+          this.onReadTempState.bind(this),
+          this.onError);
+      };
+
+  this.readTempState = function() {
+      console.log('readTempState');
+      ble.read(this.deviceID,
+        this.serviceDef.service,
+        this.serviceDef.temp,
+        this.onReadTempState.bind(this),
+        this.onError);
+    };
+
+  this.readTempMax = function() {
+        console.log('readTempMax');
+        ble.read(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.tempMaximum,
+          this.onReadTempMax.bind(this),
+          this.onError);
+      };
+
+  this.readTempMin = function() {
+          console.log('readTempMax');
+          ble.read(this.deviceID,
+            this.serviceDef.service,
+            this.serviceDef.tempMinimum,
+            this.onReadTempMin.bind(this),
+            this.onError);
+        };
+
+  this.startService = function() {
+
+    if (this.deviceID !== null) {
+
+      console.log('Starting TSL Service on ', this.deviceID);
+      console.log(this.serviceDef);
+      this.insertFrame();
+
+
+      this.readTempState();
+      this.readTempMax();
+      this.readTempMin();
+
+    }
+
+  };
+
+  this.onTslData = function(data) {
+
+    var raw = new Uint16Array(data);
+
+    console.log(raw);
+
+  };
+
+  this.animateGraph = function() {
+    return -1;
+  };
+
+  this.insertFrame = function() {
+
+    var self = this;
+
+    // Call the parent displayForm first...
+    this.superClass_.insertFrame.call(self);
+
+    var tslTemp = this.frameID + '-t';
+    var tslTempMax = this.frameID + '-tmax';
+    var tslTempMin = this.frameID + '-tmin';
+
+    var row = $('<div />', {class: 'mui-row'});
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Temp:'}).appendTo(
+      row);
+
+    $('<div />',
+      {class: 'mui-col-xs-9 mui--text-dark', id: tslTemp}).appendTo(row);
+
+    this.$id.append(row);
+
+    row = $('<div />', {class: 'mui-row'});
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'TMax:'}).appendTo(
+      row);
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-dark', id: tslTempMax}).appendTo(row);
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'TMin:'}).appendTo(
+      row);
+
+    $('<div />',
+      {class: 'mui-col-xs-3 mui--text-dark', id: tslTempMin}).appendTo(row);
+
+    this.$id.append(row);
+
+    this.$result.temp = $('#' + tslTemp);
+    this.$result.tempMax = $('#' + tslTempMax);
+    this.$result.tempMin = $('#' + tslTempMin);
+
+  };
+
+};
+
+inheritsFrom(TSL, CAPABILITY);
+capabilityManager.register({id: 'F000BB00-0451-4000-B000-A01D48F70D07', module: TSL});
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/standards/deviceInformation.js b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/deviceInformation.js
new file mode 100644
index 0000000..6e3a823
--- /dev/null
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/deviceInformation.js
@@ -0,0 +1,61 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-20
+ * Time: 10:13
+ *
+ */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global ble  */
+/* jshint browser: true , devel: true*/
+
+var DEVICEINFO = function() {
+  this.name = 'Device Information';
+  this.capabilityID = '180A';
+  this.serviceDef = {
+    service: '180A', manufacturer_name_string: '2A29', model_number_string: '2A24'
+  };
+
+  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.onReadBatteryLevel = function(data) {
+    console.log(data);
+    var a = new Uint8Array(data);
+    this.state = a[0];
+    console.log('onReadBatteryLevel', this.state);
+  };
+
+  this.startService = function() {
+    'use strict';
+    if (this.deviceID !== null) {
+      console.log('Starting Battery Service on ', this.deviceID);
+      console.log(this.serviceDef);
+
+      this.insertFrame();
+
+      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});
diff --git a/smartoffice/SODashServer/SODashServer/app/js/appv2.js b/smartoffice/SODashServer/SODashServer/app/js/appv2.js
index 8999fd1..102ddc6 100644
--- a/smartoffice/SODashServer/SODashServer/app/js/appv2.js
+++ b/smartoffice/SODashServer/SODashServer/app/js/appv2.js
@@ -20,8 +20,7 @@ var SOController = (function() {
   var iosConfig = {
       badge: true, sound: true, alert: true
     };
-
-
+  
   var calendarData;
   var extendTimer;