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

---
 .../js/device/CC2650/cc2650_accelerometer.js  |   6 +-
 .../app/js/device/CC2650/cc2650_barometer.js  | 108 ++++++++++-------
 .../app/js/device/CC2650/cc2650_humidity.js   |  15 ++-
 .../app/js/device/CC2650/cc2650_luxometer.js  |   2 +-
 .../app/js/device/CC2650/cc2650_thermopile.js |  50 +-------
 .../sensortoy/app/js/standards/capability.js  |  27 +++--
 .../app/partials/cc2650_barometer_dial.ejs    |  68 +++++++++++
 .../app/partials/cc2650_humidity.ejs          |  41 +++++++
 .../app/partials/cc2650_thermopile_dial.ejs   |  37 +-----
 .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes
 .../2.2.1/taskArtifacts/fileHashes.bin        | Bin 155035 -> 155257 bytes
 .../2.2.1/taskArtifacts/fileSnapshots.bin     | Bin 11360782 -> 11360782 bytes
 .../2.2.1/taskArtifacts/taskArtifacts.bin     | Bin 61031 -> 61031 bytes
 .../js/device/CC2650/cc2650_accelerometer.js  |   6 +-
 .../www/js/device/CC2650/cc2650_barometer.js  | 110 +++++++++++-------
 .../www/js/device/CC2650/cc2650_humidity.js   |  15 ++-
 .../www/js/device/CC2650/cc2650_luxometer.js  |   2 +-
 .../www/js/device/CC2650/cc2650_thermopile.js |  50 +-------
 .../assets/www/js/standards/capability.js     |  27 +++--
 .../www/partials/cc2650_barometer_dial.ejs    |  68 +++++++++++
 .../assets/www/partials/cc2650_humidity.ejs   |  41 +++++++
 .../www/partials/cc2650_thermopile_dial.ejs   |  37 +-----
 22 files changed, 436 insertions(+), 274 deletions(-)
 create mode 100644 sensortoy/sensortoy/app/partials/cc2650_barometer_dial.ejs
 create mode 100644 sensortoy/sensortoy/app/partials/cc2650_humidity.ejs
 create mode 100644 sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_barometer_dial.ejs
 create mode 100644 sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_humidity.ejs

diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js
index 38b5d44..29783dc 100644
--- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js
+++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js
@@ -370,17 +370,17 @@ CC2650_ACCEL = function(p) {
     row = $('<div />', {class: 'mui-row'});
 
     $('<div />', {
-      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      class: 'mui-col-xs-4 mui--text-light mui--text-center',
       text: '--',
       id: this.frames[modeID] + '-x'
     }).appendTo(row);
     $('<div />', {
-      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      class: 'mui-col-xs-4 mui--text-light mui--text-center',
       text: '--',
       id: this.frames[modeID] + '-y'
     }).appendTo(row);
     $('<div />', {
-      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      class: 'mui-col-xs-4 mui--text-light mui--text-center',
       text: '--',
       id: this.frames[modeID] + '-z'
     }).appendTo(row);
diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_barometer.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_barometer.js
index 2afb6b5..524fcd6 100644
--- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_barometer.js
+++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_barometer.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom, capabilityManager, device */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -84,15 +84,22 @@ var CC2650_BAR = function(p) {
         };
 
   this.animateGraph = function() {
-      this.simpleGraph(this.data.temp, 'temp');
-      this.simpleGraph(this.data.pressure, 'pressure');
+      /*  This.simpleGraph(this.data.temp, 'temp');
+        this.simpleGraph(this.data.pressure, 'pressure');*/
+
+      var arcTemp = this.frameID + 'temp-arc';
+      var arcPressure = this.frameID + 'pressure-arc';
+      this.updateArc(this.data.temp, 'temp' , arcTemp, '°C', 50);
+      this.updateArc(this.data.pressure, 'pressure' , arcPressure, 'hPa');
+
+
+
     };
 
 
   this.insertFrame = function() {
 
     var self = this;
-    var blankChart;
 
     // Call the parent displayForm first...
     this.superClass_.insertFrame.call(self);
@@ -100,63 +107,76 @@ var CC2650_BAR = function(p) {
     var temp = this.frameID + '-t';
     var pressure = this.frameID + '-p';
 
+    var arcB = this.frameID + 'temp-arcB';
+    var arcTemp = this.frameID + 'temp-arc';
+
+    var pressureArcB = this.frameID + 'pressure-arcB';
+    var arcPressure = this.frameID + 'pressure-arc';
+
     var settings = {data: {baseID: this.frameID}};
-            var html = new EJS({url: './partials/cc2650_barometer.ejs'}).render(settings);
+    var html = new EJS({url: './partials/cc2650_barometer_dial.ejs'}).render(settings);
 
-            this.$id.append(html);
+    this.$id.append(html);
 
-   /* var row = $('<div />', {class: 'mui-row'});
+    document.getElementById(arcB).setAttribute('d', this.describeArc(150, 150, 100, 0, 240));
+    document.getElementById(arcTemp).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(0)));
 
-    $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Temp:'}).appendTo(row);
+    document.getElementById(pressureArcB).setAttribute('d', this.describeArc(150, 150, 100, 0, 240));
+    document.getElementById(arcPressure).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(0)));
 
-    $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: temp}).appendTo(row);
-    $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Pressure:'}).appendTo(row);
 
-    $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: pressure}).appendTo(row);
+    /* Var row = $('<div />', {class: 'mui-row'});
 
-    this.$id.append(row);
+     $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Temp:'}).appendTo(row);
 
-    if (/ipad/i.test(device.model)) {
+     $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: temp}).appendTo(row);
+     $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Pressure:'}).appendTo(row);
 
-      tabBody = $('<div>', {class: 'mui-row'});
+     $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: pressure}).appendTo(row);
 
-      tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('temp')))   ;
-      tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('pressure')))   ;
-      this.$id.append(tabBody);
+     this.$id.append(row);
 
-    } else {
+     if (/ipad/i.test(device.model)) {
 
-      var tabBody = $('<ul>',
-        {class: 'mui-tabs__bar mui-tabs__bar--justified'});
-      $('<li>', {class: 'mui--is-active tabOnWhite'}).append($('<a>',
-        {
-          text: 'Temperature',
-          'data-mui-toggle': 'tab',
-          'data-mui-controls': (temp + '-pane')
-        })).appendTo(tabBody);
-      $('<li>', {class: 'tabOnWhite'}).append($('<a>',
-        {
-          text: 'Pressure',
-          'data-mui-toggle': 'tab',
-          'data-mui-controls': (pressure + '-pane')
-        })).appendTo(tabBody);
+       tabBody = $('<div>', {class: 'mui-row'});
 
-      this.$id.append(tabBody);
+       tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('temp')))   ;
+       tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('pressure')))   ;
+       this.$id.append(tabBody);
 
-      blankChart = this.generateBlankGraph('temp');
+     } else {
 
-      this.$id.append($('<div>',
-        {class: 'mui-tabs__pane mui--is-active', id: (temp + '-pane')}).append(
-        blankChart));
+       var tabBody = $('<ul>',
+         {class: 'mui-tabs__bar mui-tabs__bar--justified'});
+       $('<li>', {class: 'mui--is-active tabOnWhite'}).append($('<a>',
+         {
+           text: 'Temperature',
+           'data-mui-toggle': 'tab',
+           'data-mui-controls': (temp + '-pane')
+         })).appendTo(tabBody);
+       $('<li>', {class: 'tabOnWhite'}).append($('<a>',
+         {
+           text: 'Pressure',
+           'data-mui-toggle': 'tab',
+           'data-mui-controls': (pressure + '-pane')
+         })).appendTo(tabBody);
 
-      blankChart = this.generateBlankGraph('pressure');
+       this.$id.append(tabBody);
 
-      this.$id.append($('<div>',
-        {
-          class: 'mui-tabs__pane',
-          id: (pressure + '-pane')
-        }).append(blankChart));
-    }*/
+       blankChart = this.generateBlankGraph('temp');
+
+       this.$id.append($('<div>',
+         {class: 'mui-tabs__pane mui--is-active', id: (temp + '-pane')}).append(
+         blankChart));
+
+       blankChart = this.generateBlankGraph('pressure');
+
+       this.$id.append($('<div>',
+         {
+           class: 'mui-tabs__pane',
+           id: (pressure + '-pane')
+         }).append(blankChart));
+     }*/
     this.$result.temp = $('#' + temp);
     this.$result.pressure = $('#' + pressure);
 
diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_humidity.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_humidity.js
index 8dc3179..8dd935c 100644
--- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_humidity.js
+++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_humidity.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom, capabilityManager, device */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -102,13 +102,20 @@ var CC2650_HUM = function(p) {
 
     var temp = this.frameID + '-t';
     var humidity = this.frameID + '-h';
+
+    var settings = {data: {baseID: this.frameID}};
+    var html = new EJS({url: './partials/cc2650_humidity.ejs'}).render(settings);
+
+    this.$id.append(html);
+
+    /*
     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-3 mui--text-dark', id: temp}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light', id: temp}).appendTo(row);
     $('<div />',
       {
         class: 'mui-col-xs-3 mui--text-accent  mui--text-right',
@@ -116,7 +123,7 @@ var CC2650_HUM = function(p) {
       }).appendTo(row);
 
     $('<div />',
-      {class: 'mui-col-xs-3 mui--text-dark', id: humidity}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light', id: humidity}).appendTo(row);
 
     this.$id.append(row);
 
@@ -157,7 +164,7 @@ var CC2650_HUM = function(p) {
           class: 'mui-tabs__pane',
           id: (humidity + '-pane')
         }).append(blankChart));
-    }
+    }*/
     this.$result.temp = $('#' + temp);
     this.$result.humidity = $('#' + humidity);
 
diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_luxometer.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_luxometer.js
index 6492708..deef12f 100644
--- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_luxometer.js
+++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_luxometer.js
@@ -95,7 +95,7 @@ var CC2650_LUX = function(p) {
       row);
 
     $('<div />',
-      {class: 'mui-col-xs-8 mui--text-dark', id: lux}).appendTo(row);
+      {class: 'mui-col-xs-8 mui--text-light', id: lux}).appendTo(row);
 
     this.$id.append(row);
 
diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_thermopile.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_thermopile.js
index 335ed4e..20b5f6a 100644
--- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_thermopile.js
+++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_thermopile.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -88,53 +88,16 @@ var CC2650_TMP = function(p) {
 
   this.animateGraph = function() {
     // This.simpleGraph(this.data.temp, 'temp');
-   // debugger;
+    // debugger;
     var arcTemp = this.frameID + 'temp-arc';
     var arcAmbient = this.frameID + 'ambient-arc';
-    this.updateArc(this.data.temp, 'temp' , arcTemp);
+    this.updateArc(this.data.temp, 'temp' , arcTemp, '°C', 50);
+    this.updateArc(this.data.ambient, 'ambient' , arcAmbient, '°C', 50);
 
-    this.updateArc(this.data.ambient, 'ambient' , arcAmbient);
-
-    //This.simpleGraph(this.data.ambient, 'ambient');
   };
 
-  this.updateArc = function(data, subID, elmID) {
-
-
-      var ceilingLimit;
-      var _subID;
-      var _data;
-    var label;
-
-      _data = data || this.data;
-
-      _subID = subID || '';
-
-      if (_data.length > 0) {
-
-        ceilingLimit = 50;
-
-        var latest = _data[_data.length - 1];
-        var scale = 100 / ceilingLimit;
-        var arcP = scale * latest;
-        // Var xstep = (280 - 46) / 100;
-
-        label = this.frameID + subID + '-label';
-        document.getElementById(elmID).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(arcP)));
-      //  document.getElementById(label).innerText(latest.toFixed(2) + 'ºc');
-      }
-
-
-
-    };
-
-
-
   this.insertFrame = function() {
 
-    var liSetting;
-    var tabBody;
-    var blankChart;
     var self = this;
     // Console.log('Overloading...');
     // Call the parent displayForm first...
@@ -156,7 +119,6 @@ var CC2650_TMP = function(p) {
 
     this.$id.append(html);
 
-debugger;
     document.getElementById(arcB).setAttribute('d', this.describeArc(150, 150, 100, 0, 240));
     document.getElementById(arcTemp).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(0)));
 
@@ -170,7 +132,7 @@ debugger;
       {class: 'mui-col-xs-3 mui--text-accent mui--text-right', text: 'Temp:'}).appendTo(row);
 
     $('<div />',
-      {class: 'mui-col-xs-3 mui--text-dark  mui--text-left', id: temp}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light  mui--text-left', id: temp}).appendTo(row);
     $('<div />',
       {
         class: 'mui-col-xs-3 mui--text-accent mui--text-right',
@@ -178,7 +140,7 @@ debugger;
       }).appendTo(row);
 
     $('<div />',
-      {class: 'mui-col-xs-3 mui--text-dark', id: amb}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light', id: amb}).appendTo(row);
 
     this.$id.append(row);
 
diff --git a/sensortoy/sensortoy/app/js/standards/capability.js b/sensortoy/sensortoy/app/js/standards/capability.js
index 5020b2c..7c108a8 100644
--- a/sensortoy/sensortoy/app/js/standards/capability.js
+++ b/sensortoy/sensortoy/app/js/standards/capability.js
@@ -271,35 +271,44 @@ CAPABILITY.prototype.setArc = function(percent) {
   return (240 / 100) * percent;
 };
 
-CAPABILITY.prototype.updateArc = function(data, subID, elmID) {
+CAPABILITY.prototype.updateArc = function(data, subID, elmID, suffix, limiter) {
 
 
     var ceilingLimit;
     var ceiling;
     var _subID;
     var _data;
+    var _limiter = limiter || null;
+    var _suffix = suffix || '';
+    var label;
 
     _data = data || this.data;
 
     _subID = subID || '';
+    label = '#' + this.frameID + _subID + '-label';
 
     if (_data.length > 0) {
 
-      ceiling = _data.reduce(function(p, v) {
-        return (Math.abs(p) > Math.abs(v) ? Math.abs(p) : Math.abs(v));
-      });
+      if (_limiter === null) {
+        ceiling = _data.reduce(function(p, v) {
+          return (Math.abs(p) > Math.abs(v) ? Math.abs(p) : Math.abs(v));
+        });
 
-      ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 10) * 10);
-      if (ceilingLimit > 1000) {
-        ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 50) * 50);
+        ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 10) * 10);
+        if (ceilingLimit > 1000) {
+          ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 50) * 50);
+        }
+
+      } else {
+        ceilingLimit = _limiter;
       }
 
-      var latest = _data[_data.length-1];
+      var latest = _data[_data.length - 1];
       var scale = 100 / ceilingLimit;
       var arcP = scale * latest;
-      // Var xstep = (280 - 46) / 100;
 
       document.getElementById(elmID).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(arcP)));
+      $(label).text(latest.toFixed(2) + _suffix);
     }
 
 
diff --git a/sensortoy/sensortoy/app/partials/cc2650_barometer_dial.ejs b/sensortoy/sensortoy/app/partials/cc2650_barometer_dial.ejs
new file mode 100644
index 0000000..df84add
--- /dev/null
+++ b/sensortoy/sensortoy/app/partials/cc2650_barometer_dial.ejs
@@ -0,0 +1,68 @@
+<%= data.baseID + 'pressure-line' %>
+
+<div class="mui-row">
+    <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Temp:</div>
+    <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-t' %>">--</div>
+    <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Pressure:</div>
+    <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-p' %>">--</div>
+  </div>
+  <ul class="mui-tabs__bar mui-tabs__bar--justified">
+    <li class="mui--is-active tabOnWhite"><a data-mui-toggle="tab"
+                                             data-mui-controls="<%= data.baseID + '-t-pane' %>">Temperature</a>
+    </li>
+    <li class="tabOnWhite"><a data-mui-toggle="tab"
+                              data-mui-controls="<%= data.baseID + '-p-pane' %>">Pressure</a>
+    </li>
+  </ul>
+  <div class="mui-tabs__pane mui--is-active" id="<%= data.baseID + '-t-pane' %>">
+    <svg width='300' height='200' viewbox='0 0 300 220' background="#212121" id="<%= data.baseID + 'temp-svg' %>">
+
+         <g  transform="translate(-90,40) rotate(-120 180 90)" >
+     <path id="<%= data.baseID + 'temp-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" />
+           <path id="<%= data.baseID + 'temp-arc' %>" fill="none" stroke="#00bfff" stroke-width="12"  />
+         </g>
+         <g transform="translate(150,100)">
+           <text id="<%= data.baseID + 'temp-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' >--ºc</text>
+         </g>
+       </svg>
+
+
+
+   <!-- <svg id="<%= data.baseID + 'temp-svg' %>" width="300" height="150" fill="blue">
+      <line x1="46" y1="12" x2="280" y2="12"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="<%= data.baseID + 'temp-txt1' %>" x="36" y="15" text-anchor="end">&#45;&#45;</text>
+      <line x1="46" y1="136" x2="280" y2="136"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="undefined" x="36" y="139" text-anchor="end">0</text>
+      <polyline id="<%= data.baseID + 'temp-line' %>" fill="none" stroke="#2196F3"
+                text-anchor="end" stroke-width="2"
+                points=""></polyline>
+    </svg>-->
+  </div>
+  <div class="mui-tabs__pane" id="<%= data.baseID + '-p-pane' %>">
+
+    <svg width='300' height='200' viewbox='0 0 300 220' background="#212121" id="<%= data.baseID + 'pressure-svg' %>">
+
+         <g  transform="translate(-90,40) rotate(-120 180 90)" >
+     <path id="<%= data.baseID + 'pressure-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" style=""/>
+           <path id="<%= data.baseID + 'pressure-arc' %>" fill="none" stroke="#00bfff" stroke-width="12"  />
+         </g>
+         <g transform="translate(150,100)">
+           <text id="<%= data.baseID + 'pressure-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50'>--</text>
+         </g>
+       </svg>
+
+
+    <!--<svg id="<%= data.baseID + 'pressure-svg' %>" width="300" height="150" fill="blue">
+      <line x1="46" y1="12" x2="280" y2="12"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="<%= data.baseID + 'pressure-txt1' %>" x="36" y="15" text-anchor="end">&#45;&#45;</text>
+      <line x1="46" y1="136" x2="280" y2="136"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="undefined" x="36" y="139" text-anchor="end">0</text>
+      <polyline id="<%= data.baseID + 'pressure-line' %>" fill="none" stroke="#2196F3"
+                text-anchor="end" stroke-width="2"
+                points=""></polyline>
+    </svg>-->
+  </div>
diff --git a/sensortoy/sensortoy/app/partials/cc2650_humidity.ejs b/sensortoy/sensortoy/app/partials/cc2650_humidity.ejs
new file mode 100644
index 0000000..ff286a6
--- /dev/null
+++ b/sensortoy/sensortoy/app/partials/cc2650_humidity.ejs
@@ -0,0 +1,41 @@
+<div class="mui-row">
+  <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Temp:</div>
+  <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-t' %>">--</div>
+  <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Humidity:</div>
+  <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-h' %>">--</div>
+</div>
+<ul class="mui-tabs__bar mui-tabs__bar--justified">
+  <li class="tabOnWhite"><a data-mui-toggle="tab"
+                            data-mui-controls="<%= data.baseID + '-t-pane' %>">Temperature</a>
+  </li>
+  <li class="tabOnWhite mui--is-active"><a data-mui-toggle="tab"
+                                           data-mui-controls="<%= data.baseID + '-h-pane' %>">Humidity</a>
+  </li>
+</ul>
+<div class="mui-tabs__pane" id="<%= data.baseID + '-t-pane' %>">
+  <svg id="<%= data.baseID + 'temp-svg' %>" width="300" height="150" fill="blue">
+    <line x1="46" y1="12" x2="280" y2="12"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="<%= data.baseID + 'temp-txt1' %>" x="36" y="15" text-anchor="end">--</text>
+    <line x1="46" y1="136" x2="280" y2="136"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="undefined" x="36" y="139" text-anchor="end">0</text>
+    <polyline id="<%= data.baseID + 'temp-line' %>" fill="none" stroke="#2196F3"
+              text-anchor="end" stroke-width="2"
+              points=""></polyline>
+  </svg>
+</div>
+<div class="mui-tabs__pane mui--is-active" id="<%= data.baseID + '-h-pane' %>">
+  <svg id="<%= data.baseID + 'humidity-svg' %>" width="300" height="150" fill="blue">
+    <line x1="46" y1="12" x2="280" y2="12"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="<%= data.baseID + 'humidity-txt1' %>" x="36" y="15" text-anchor="end">--</text>
+    <line x1="46" y1="136" x2="280" y2="136"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="undefined" x="36" y="139" text-anchor="end">0
+    </text>
+    <polyline id="<%= data.baseID + 'humidity-line' %>" fill="none" stroke="#2196F3"
+              text-anchor="end" stroke-width="2"
+              points=""></polyline>
+  </svg>
+</div>
diff --git a/sensortoy/sensortoy/app/partials/cc2650_thermopile_dial.ejs b/sensortoy/sensortoy/app/partials/cc2650_thermopile_dial.ejs
index 0111acb..f926cf0 100644
--- a/sensortoy/sensortoy/app/partials/cc2650_thermopile_dial.ejs
+++ b/sensortoy/sensortoy/app/partials/cc2650_thermopile_dial.ejs
@@ -28,45 +28,16 @@
   </filter>
 
       <g  transform="translate(-90,40) rotate(-120 180 90)" >
-  <path id="<%= data.baseID + 'temp-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" style="filter:url(#dropshadow)"/>
+  <path id="<%= data.baseID + 'temp-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" />
         <path id="<%= data.baseID + 'temp-arc' %>" fill="none" stroke="#00bfff" stroke-width="12"  />
       </g>
       <g transform="translate(150,100)">
-        <text id="<%= data.baseID + 'temp-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' style="filter:url(#dropshadow)">--ºc</text>
+        <text id="<%= data.baseID + 'temp-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' >--ºc</text>
       </g>
     </svg>
 
-
-  <!--<svg id="<%= data.baseID + 'temp-svg' %>" width="300" height="150"
-       fill="blue">
-    <line x1="46" y1="12" x2="280" y2="12"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="<%= data.baseID + 'temp-txt1' %>" x="36" y="15"
-          text-anchor="end">&#45;&#45;
-    </text>
-    <line x1="46" y1="136" x2="280" y2="136"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="undefined" x="36" y="139" text-anchor="end">0</text>
-    <polyline id="<%= data.baseID + 'temp-line' %>" fill="none" stroke="#2196F3"
-              text-anchor="end" stroke-width="2" points=""></polyline>
-  </svg>-->
 </div>
 <div class="mui-tabs__pane" id="<%= data.baseID + '-a-pane' %>">
-  <!--<svg id="<%= data.baseID + 'ambient-svg' %>" width="300" height="150"
-       fill="blue">
-    <line x1="46" y1="12" x2="280" y2="12"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="<%= data.baseID + 'ambient-txt1' %>" x="36" y="15"
-          text-anchor="end">&#45;&#45;
-    </text>
-    <line x1="46" y1="136" x2="280" y2="136"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="undefined" x="36" y="139" text-anchor="end">0</text>
-    <polyline id="<%= data.baseID + 'ambient-line' %>" fill="none"
-              stroke="#2196F3" text-anchor="end" stroke-width="2"
-              points=""></polyline>
-  </svg>-->
-
 
   <svg width='300' height='200' viewbox='0 0 300 220' background="#212121" id="<%= data.baseID + 'ambient-svg' %>">
         <filter id="dropshadow" height="130%">
@@ -80,11 +51,11 @@
 
     <!--  stroke-linecap="round" -->
         <g  transform="translate(-90,40) rotate(-120 180 90)" >
-    <path id="<%= data.baseID + 'ambient-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12"  style="filter:url(#dropshadow)"/>
+    <path id="<%= data.baseID + 'ambient-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12"  />
           <path id="<%= data.baseID + 'ambient-arc' %>" fill="none" stroke="#00bfff" stroke-width="12" />
         </g>
         <g transform="translate(150,100)">
-          <text id="<%= data.baseID + 'ambient-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' style="filter:url(#dropshadow)">--ºc</text>
+          <text id="<%= data.baseID + 'ambient-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' >--ºc</text>
         </g>
       </svg>
 
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 2e830696d242547484512e3a7ce9f3920a0bbed3..0dab8dd7ce83d701d259d0a9726a2c36989c8ad8 100644
GIT binary patch
literal 17
WcmZQx&{6#8*tO}73?RVraW4QtR0gL2

literal 17
WcmZQx&{6#8*tO}73?RUAZ9V`&00wRV

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 84a400298ba50873c82bb16bfd6ef4847f2ba545..a96ee2b597ec96daef6d7b8b1fe52092bfd0a417 100644
GIT binary patch
delta 16525
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
V$p4BL{q5fubWN@u&3iN9-vGuw&YA!K

delta 16246
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
NOW7K4%H~cZ{sYB_HiG~F

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 fb0510df4a253a8e66c32469aaf149dde2b3e5c4..4422b31b3171641c2718024f4aca1da7b74e5ef9 100644
GIT binary patch
delta 7650
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
BxY+;z

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

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 caf6976fb02ed20e8ae63679c2377d13176d3633..0978acaaa0846f407d5aa412c166bd66c8232c9e 100644
GIT binary patch
delta 402
zcmaEUhxz#(<_%Np1iZ_1a^pHbW@Pf-J$-kJ=ao(6s*D1xPd630%DG#(?^$}V=S!d>
zSTO9Lz4r#m(z1I0yNP*?uNG`7*JNbz(`j6|S#H5e#?7oPtpWl)EFX<M6qjE2ST%db
z-`i$=lN%@W3S?(8-jB1|{807$`_Rt2D=WZ)PyZcd6%P6zcsi0_M$1d(98ho~OU@f5
zyUB_T&Xd>85}SOs!D#cBX`h7zikB@=u32+-p;~X|xd+9~mp7l^vX60cYqZ7W`P)P%
zKMZo)tgxM%nSaNwu&@tY>i=g(S#6$t;ne1HTlQnB5^y>AsaaU{eAP0^;zf$9POije
z7(cVhJD=TdXN(ybxK9D`ArNN%Hu2Ox)wy%#{%7qAsf?XsvS;$daD~lr`*tx4&fWch
zD<#9n^LfMS-aA33ZIPrBT{UeoThdlfX;{I?w#GvSAvO8JN*0#efp$EbxsSzY001^l
Bxs?C_

delta 412
zcmaEUhxz#(<_%Np1d5M+@r--i_|3$~^{EBxug*>7s*D1UY#S=NIx=>4uGqd){pkE4
zu;2#$7p=!DS~D1!#GB(kzrMVwT$7Q-ZgxxNX1N6?88@@Gv<e8Q2SzA&97?%zM(D%h
zlw<SuPi~yhD{yo-&!t;+$CwRkj+m@bay<<ee7QQyX+!9PQ_TLR$)0gSSwO*wEN#D+
zES;>_;5>QVEV0RF8;mx8nf6&oV0+%a#Ij{|^DWf3tqNKA&3g0sE&CWJyKhvVthiBa
za%++Nq+s>U3fsAv1+2}kil6w={rv51oy2Qa=a1r6`Q-Ii#XIX+6MlV?y12QsN*{+x
zer6Tb2ALaYj2RfXPXX~E5N2NA@b1y`<eSd!GvD1PPUhs<GkIdT!sfVryO;&fF#f-A
z=+=HF?q*5XQ;%z#k)(=sjs={(a^l$P`_j@nZ9DZ4Qj;&NWMK(9WZSiw`&f(y0IcJ|
AP5=M^

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 38b5d44..29783dc 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
@@ -370,17 +370,17 @@ CC2650_ACCEL = function(p) {
     row = $('<div />', {class: 'mui-row'});
 
     $('<div />', {
-      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      class: 'mui-col-xs-4 mui--text-light mui--text-center',
       text: '--',
       id: this.frames[modeID] + '-x'
     }).appendTo(row);
     $('<div />', {
-      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      class: 'mui-col-xs-4 mui--text-light mui--text-center',
       text: '--',
       id: this.frames[modeID] + '-y'
     }).appendTo(row);
     $('<div />', {
-      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      class: 'mui-col-xs-4 mui--text-light mui--text-center',
       text: '--',
       id: this.frames[modeID] + '-z'
     }).appendTo(row);
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_barometer.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_barometer.js
index fd37cb6..524fcd6 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_barometer.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_barometer.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom, capabilityManager, device */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -84,73 +84,99 @@ var CC2650_BAR = function(p) {
         };
 
   this.animateGraph = function() {
-      this.simpleGraph(this.data.temp, 'temp');
-      this.simpleGraph(this.data.pressure, 'pressure');
+      /*  This.simpleGraph(this.data.temp, 'temp');
+        this.simpleGraph(this.data.pressure, 'pressure');*/
+
+      var arcTemp = this.frameID + 'temp-arc';
+      var arcPressure = this.frameID + 'pressure-arc';
+      this.updateArc(this.data.temp, 'temp' , arcTemp, '°C', 50);
+      this.updateArc(this.data.pressure, 'pressure' , arcPressure, 'hPa');
+
+
+
     };
 
 
   this.insertFrame = function() {
 
     var self = this;
-    var blankChart;
 
     // Call the parent displayForm first...
     this.superClass_.insertFrame.call(self);
 
     var temp = this.frameID + '-t';
     var pressure = this.frameID + '-p';
-    var row = $('<div />', {class: 'mui-row'});
 
-    $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Temp:'}).appendTo(row);
+    var arcB = this.frameID + 'temp-arcB';
+    var arcTemp = this.frameID + 'temp-arc';
 
-    $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: temp}).appendTo(row);
-    $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Pressure:'}).appendTo(row);
+    var pressureArcB = this.frameID + 'pressure-arcB';
+    var arcPressure = this.frameID + 'pressure-arc';
 
-    $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: pressure}).appendTo(row);
+    var settings = {data: {baseID: this.frameID}};
+    var html = new EJS({url: './partials/cc2650_barometer_dial.ejs'}).render(settings);
 
-    this.$id.append(row);
+    this.$id.append(html);
 
-    if (/ipad/i.test(device.model)) {
+    document.getElementById(arcB).setAttribute('d', this.describeArc(150, 150, 100, 0, 240));
+    document.getElementById(arcTemp).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(0)));
 
-      tabBody = $('<div>', {class: 'mui-row'});
+    document.getElementById(pressureArcB).setAttribute('d', this.describeArc(150, 150, 100, 0, 240));
+    document.getElementById(arcPressure).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(0)));
 
-      tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('temp')))   ;
-      tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('pressure')))   ;
-      this.$id.append(tabBody);
 
-    } else {
+    /* Var row = $('<div />', {class: 'mui-row'});
 
-      var tabBody = $('<ul>',
-        {class: 'mui-tabs__bar mui-tabs__bar--justified'});
-      $('<li>', {class: 'mui--is-active tabOnWhite'}).append($('<a>',
-        {
-          text: 'Temperature',
-          'data-mui-toggle': 'tab',
-          'data-mui-controls': (temp + '-pane')
-        })).appendTo(tabBody);
-      $('<li>', {class: 'tabOnWhite'}).append($('<a>',
-        {
-          text: 'Pressure',
-          'data-mui-toggle': 'tab',
-          'data-mui-controls': (pressure + '-pane')
-        })).appendTo(tabBody);
+     $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Temp:'}).appendTo(row);
 
-      this.$id.append(tabBody);
+     $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: temp}).appendTo(row);
+     $('<div />', { class: 'mui-col-xs-3 mui--text-accent  mui--text-right', text: 'Pressure:'}).appendTo(row);
 
-      blankChart = this.generateBlankGraph('temp');
+     $('<div />', { class: 'mui-col-xs-3 mui--text-dark', id: pressure}).appendTo(row);
 
-      this.$id.append($('<div>',
-        {class: 'mui-tabs__pane mui--is-active', id: (temp + '-pane')}).append(
-        blankChart));
+     this.$id.append(row);
 
-      blankChart = this.generateBlankGraph('pressure');
+     if (/ipad/i.test(device.model)) {
 
-      this.$id.append($('<div>',
-        {
-          class: 'mui-tabs__pane',
-          id: (pressure + '-pane')
-        }).append(blankChart));
-    }
+       tabBody = $('<div>', {class: 'mui-row'});
+
+       tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('temp')))   ;
+       tabBody.append($('<div>',{class: 'mui-col-md-6'}).append(this.generateBlankGraph('pressure')))   ;
+       this.$id.append(tabBody);
+
+     } else {
+
+       var tabBody = $('<ul>',
+         {class: 'mui-tabs__bar mui-tabs__bar--justified'});
+       $('<li>', {class: 'mui--is-active tabOnWhite'}).append($('<a>',
+         {
+           text: 'Temperature',
+           'data-mui-toggle': 'tab',
+           'data-mui-controls': (temp + '-pane')
+         })).appendTo(tabBody);
+       $('<li>', {class: 'tabOnWhite'}).append($('<a>',
+         {
+           text: 'Pressure',
+           'data-mui-toggle': 'tab',
+           'data-mui-controls': (pressure + '-pane')
+         })).appendTo(tabBody);
+
+       this.$id.append(tabBody);
+
+       blankChart = this.generateBlankGraph('temp');
+
+       this.$id.append($('<div>',
+         {class: 'mui-tabs__pane mui--is-active', id: (temp + '-pane')}).append(
+         blankChart));
+
+       blankChart = this.generateBlankGraph('pressure');
+
+       this.$id.append($('<div>',
+         {
+           class: 'mui-tabs__pane',
+           id: (pressure + '-pane')
+         }).append(blankChart));
+     }*/
     this.$result.temp = $('#' + temp);
     this.$result.pressure = $('#' + pressure);
 
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_humidity.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_humidity.js
index 8dc3179..8dd935c 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_humidity.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_humidity.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom, capabilityManager, device */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -102,13 +102,20 @@ var CC2650_HUM = function(p) {
 
     var temp = this.frameID + '-t';
     var humidity = this.frameID + '-h';
+
+    var settings = {data: {baseID: this.frameID}};
+    var html = new EJS({url: './partials/cc2650_humidity.ejs'}).render(settings);
+
+    this.$id.append(html);
+
+    /*
     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-3 mui--text-dark', id: temp}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light', id: temp}).appendTo(row);
     $('<div />',
       {
         class: 'mui-col-xs-3 mui--text-accent  mui--text-right',
@@ -116,7 +123,7 @@ var CC2650_HUM = function(p) {
       }).appendTo(row);
 
     $('<div />',
-      {class: 'mui-col-xs-3 mui--text-dark', id: humidity}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light', id: humidity}).appendTo(row);
 
     this.$id.append(row);
 
@@ -157,7 +164,7 @@ var CC2650_HUM = function(p) {
           class: 'mui-tabs__pane',
           id: (humidity + '-pane')
         }).append(blankChart));
-    }
+    }*/
     this.$result.temp = $('#' + temp);
     this.$result.humidity = $('#' + humidity);
 
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_luxometer.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_luxometer.js
index 6492708..deef12f 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_luxometer.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_luxometer.js
@@ -95,7 +95,7 @@ var CC2650_LUX = function(p) {
       row);
 
     $('<div />',
-      {class: 'mui-col-xs-8 mui--text-dark', id: lux}).appendTo(row);
+      {class: 'mui-col-xs-8 mui--text-light', id: lux}).appendTo(row);
 
     this.$id.append(row);
 
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_thermopile.js b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_thermopile.js
index 335ed4e..20b5f6a 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_thermopile.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/device/CC2650/cc2650_thermopile.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom, capabilityManager */
+/* global CAPABILITY, inheritsFrom, capabilityManager, EJS */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -88,53 +88,16 @@ var CC2650_TMP = function(p) {
 
   this.animateGraph = function() {
     // This.simpleGraph(this.data.temp, 'temp');
-   // debugger;
+    // debugger;
     var arcTemp = this.frameID + 'temp-arc';
     var arcAmbient = this.frameID + 'ambient-arc';
-    this.updateArc(this.data.temp, 'temp' , arcTemp);
+    this.updateArc(this.data.temp, 'temp' , arcTemp, '°C', 50);
+    this.updateArc(this.data.ambient, 'ambient' , arcAmbient, '°C', 50);
 
-    this.updateArc(this.data.ambient, 'ambient' , arcAmbient);
-
-    //This.simpleGraph(this.data.ambient, 'ambient');
   };
 
-  this.updateArc = function(data, subID, elmID) {
-
-
-      var ceilingLimit;
-      var _subID;
-      var _data;
-    var label;
-
-      _data = data || this.data;
-
-      _subID = subID || '';
-
-      if (_data.length > 0) {
-
-        ceilingLimit = 50;
-
-        var latest = _data[_data.length - 1];
-        var scale = 100 / ceilingLimit;
-        var arcP = scale * latest;
-        // Var xstep = (280 - 46) / 100;
-
-        label = this.frameID + subID + '-label';
-        document.getElementById(elmID).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(arcP)));
-      //  document.getElementById(label).innerText(latest.toFixed(2) + 'ºc');
-      }
-
-
-
-    };
-
-
-
   this.insertFrame = function() {
 
-    var liSetting;
-    var tabBody;
-    var blankChart;
     var self = this;
     // Console.log('Overloading...');
     // Call the parent displayForm first...
@@ -156,7 +119,6 @@ var CC2650_TMP = function(p) {
 
     this.$id.append(html);
 
-debugger;
     document.getElementById(arcB).setAttribute('d', this.describeArc(150, 150, 100, 0, 240));
     document.getElementById(arcTemp).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(0)));
 
@@ -170,7 +132,7 @@ debugger;
       {class: 'mui-col-xs-3 mui--text-accent mui--text-right', text: 'Temp:'}).appendTo(row);
 
     $('<div />',
-      {class: 'mui-col-xs-3 mui--text-dark  mui--text-left', id: temp}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light  mui--text-left', id: temp}).appendTo(row);
     $('<div />',
       {
         class: 'mui-col-xs-3 mui--text-accent mui--text-right',
@@ -178,7 +140,7 @@ debugger;
       }).appendTo(row);
 
     $('<div />',
-      {class: 'mui-col-xs-3 mui--text-dark', id: amb}).appendTo(row);
+      {class: 'mui-col-xs-3 mui--text-light', id: amb}).appendTo(row);
 
     this.$id.append(row);
 
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js
index 5020b2c..7c108a8 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js
@@ -271,35 +271,44 @@ CAPABILITY.prototype.setArc = function(percent) {
   return (240 / 100) * percent;
 };
 
-CAPABILITY.prototype.updateArc = function(data, subID, elmID) {
+CAPABILITY.prototype.updateArc = function(data, subID, elmID, suffix, limiter) {
 
 
     var ceilingLimit;
     var ceiling;
     var _subID;
     var _data;
+    var _limiter = limiter || null;
+    var _suffix = suffix || '';
+    var label;
 
     _data = data || this.data;
 
     _subID = subID || '';
+    label = '#' + this.frameID + _subID + '-label';
 
     if (_data.length > 0) {
 
-      ceiling = _data.reduce(function(p, v) {
-        return (Math.abs(p) > Math.abs(v) ? Math.abs(p) : Math.abs(v));
-      });
+      if (_limiter === null) {
+        ceiling = _data.reduce(function(p, v) {
+          return (Math.abs(p) > Math.abs(v) ? Math.abs(p) : Math.abs(v));
+        });
 
-      ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 10) * 10);
-      if (ceilingLimit > 1000) {
-        ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 50) * 50);
+        ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 10) * 10);
+        if (ceilingLimit > 1000) {
+          ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 50) * 50);
+        }
+
+      } else {
+        ceilingLimit = _limiter;
       }
 
-      var latest = _data[_data.length-1];
+      var latest = _data[_data.length - 1];
       var scale = 100 / ceilingLimit;
       var arcP = scale * latest;
-      // Var xstep = (280 - 46) / 100;
 
       document.getElementById(elmID).setAttribute('d', this.describeArc(150, 150, 100, 0, this.setArc(arcP)));
+      $(label).text(latest.toFixed(2) + _suffix);
     }
 
 
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_barometer_dial.ejs b/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_barometer_dial.ejs
new file mode 100644
index 0000000..df84add
--- /dev/null
+++ b/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_barometer_dial.ejs
@@ -0,0 +1,68 @@
+<%= data.baseID + 'pressure-line' %>
+
+<div class="mui-row">
+    <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Temp:</div>
+    <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-t' %>">--</div>
+    <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Pressure:</div>
+    <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-p' %>">--</div>
+  </div>
+  <ul class="mui-tabs__bar mui-tabs__bar--justified">
+    <li class="mui--is-active tabOnWhite"><a data-mui-toggle="tab"
+                                             data-mui-controls="<%= data.baseID + '-t-pane' %>">Temperature</a>
+    </li>
+    <li class="tabOnWhite"><a data-mui-toggle="tab"
+                              data-mui-controls="<%= data.baseID + '-p-pane' %>">Pressure</a>
+    </li>
+  </ul>
+  <div class="mui-tabs__pane mui--is-active" id="<%= data.baseID + '-t-pane' %>">
+    <svg width='300' height='200' viewbox='0 0 300 220' background="#212121" id="<%= data.baseID + 'temp-svg' %>">
+
+         <g  transform="translate(-90,40) rotate(-120 180 90)" >
+     <path id="<%= data.baseID + 'temp-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" />
+           <path id="<%= data.baseID + 'temp-arc' %>" fill="none" stroke="#00bfff" stroke-width="12"  />
+         </g>
+         <g transform="translate(150,100)">
+           <text id="<%= data.baseID + 'temp-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' >--ºc</text>
+         </g>
+       </svg>
+
+
+
+   <!-- <svg id="<%= data.baseID + 'temp-svg' %>" width="300" height="150" fill="blue">
+      <line x1="46" y1="12" x2="280" y2="12"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="<%= data.baseID + 'temp-txt1' %>" x="36" y="15" text-anchor="end">&#45;&#45;</text>
+      <line x1="46" y1="136" x2="280" y2="136"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="undefined" x="36" y="139" text-anchor="end">0</text>
+      <polyline id="<%= data.baseID + 'temp-line' %>" fill="none" stroke="#2196F3"
+                text-anchor="end" stroke-width="2"
+                points=""></polyline>
+    </svg>-->
+  </div>
+  <div class="mui-tabs__pane" id="<%= data.baseID + '-p-pane' %>">
+
+    <svg width='300' height='200' viewbox='0 0 300 220' background="#212121" id="<%= data.baseID + 'pressure-svg' %>">
+
+         <g  transform="translate(-90,40) rotate(-120 180 90)" >
+     <path id="<%= data.baseID + 'pressure-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" style=""/>
+           <path id="<%= data.baseID + 'pressure-arc' %>" fill="none" stroke="#00bfff" stroke-width="12"  />
+         </g>
+         <g transform="translate(150,100)">
+           <text id="<%= data.baseID + 'pressure-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50'>--</text>
+         </g>
+       </svg>
+
+
+    <!--<svg id="<%= data.baseID + 'pressure-svg' %>" width="300" height="150" fill="blue">
+      <line x1="46" y1="12" x2="280" y2="12"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="<%= data.baseID + 'pressure-txt1' %>" x="36" y="15" text-anchor="end">&#45;&#45;</text>
+      <line x1="46" y1="136" x2="280" y2="136"
+            style="stroke:#004c6d;stroke-width:2;"></line>
+      <text id="undefined" x="36" y="139" text-anchor="end">0</text>
+      <polyline id="<%= data.baseID + 'pressure-line' %>" fill="none" stroke="#2196F3"
+                text-anchor="end" stroke-width="2"
+                points=""></polyline>
+    </svg>-->
+  </div>
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_humidity.ejs b/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_humidity.ejs
new file mode 100644
index 0000000..ff286a6
--- /dev/null
+++ b/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_humidity.ejs
@@ -0,0 +1,41 @@
+<div class="mui-row">
+  <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Temp:</div>
+  <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-t' %>">--</div>
+  <div class="mui-col-xs-3 mui--text-accent  mui--text-right">Humidity:</div>
+  <div class="mui-col-xs-3 mui--text-light" id="<%= data.baseID + '-h' %>">--</div>
+</div>
+<ul class="mui-tabs__bar mui-tabs__bar--justified">
+  <li class="tabOnWhite"><a data-mui-toggle="tab"
+                            data-mui-controls="<%= data.baseID + '-t-pane' %>">Temperature</a>
+  </li>
+  <li class="tabOnWhite mui--is-active"><a data-mui-toggle="tab"
+                                           data-mui-controls="<%= data.baseID + '-h-pane' %>">Humidity</a>
+  </li>
+</ul>
+<div class="mui-tabs__pane" id="<%= data.baseID + '-t-pane' %>">
+  <svg id="<%= data.baseID + 'temp-svg' %>" width="300" height="150" fill="blue">
+    <line x1="46" y1="12" x2="280" y2="12"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="<%= data.baseID + 'temp-txt1' %>" x="36" y="15" text-anchor="end">--</text>
+    <line x1="46" y1="136" x2="280" y2="136"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="undefined" x="36" y="139" text-anchor="end">0</text>
+    <polyline id="<%= data.baseID + 'temp-line' %>" fill="none" stroke="#2196F3"
+              text-anchor="end" stroke-width="2"
+              points=""></polyline>
+  </svg>
+</div>
+<div class="mui-tabs__pane mui--is-active" id="<%= data.baseID + '-h-pane' %>">
+  <svg id="<%= data.baseID + 'humidity-svg' %>" width="300" height="150" fill="blue">
+    <line x1="46" y1="12" x2="280" y2="12"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="<%= data.baseID + 'humidity-txt1' %>" x="36" y="15" text-anchor="end">--</text>
+    <line x1="46" y1="136" x2="280" y2="136"
+          style="stroke:#004c6d;stroke-width:2;"></line>
+    <text id="undefined" x="36" y="139" text-anchor="end">0
+    </text>
+    <polyline id="<%= data.baseID + 'humidity-line' %>" fill="none" stroke="#2196F3"
+              text-anchor="end" stroke-width="2"
+              points=""></polyline>
+  </svg>
+</div>
diff --git a/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_thermopile_dial.ejs b/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_thermopile_dial.ejs
index 0111acb..f926cf0 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_thermopile_dial.ejs
+++ b/sensortoy/sensortoy/platforms/android/assets/www/partials/cc2650_thermopile_dial.ejs
@@ -28,45 +28,16 @@
   </filter>
 
       <g  transform="translate(-90,40) rotate(-120 180 90)" >
-  <path id="<%= data.baseID + 'temp-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" style="filter:url(#dropshadow)"/>
+  <path id="<%= data.baseID + 'temp-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12" />
         <path id="<%= data.baseID + 'temp-arc' %>" fill="none" stroke="#00bfff" stroke-width="12"  />
       </g>
       <g transform="translate(150,100)">
-        <text id="<%= data.baseID + 'temp-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' style="filter:url(#dropshadow)">--ºc</text>
+        <text id="<%= data.baseID + 'temp-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' >--ºc</text>
       </g>
     </svg>
 
-
-  <!--<svg id="<%= data.baseID + 'temp-svg' %>" width="300" height="150"
-       fill="blue">
-    <line x1="46" y1="12" x2="280" y2="12"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="<%= data.baseID + 'temp-txt1' %>" x="36" y="15"
-          text-anchor="end">&#45;&#45;
-    </text>
-    <line x1="46" y1="136" x2="280" y2="136"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="undefined" x="36" y="139" text-anchor="end">0</text>
-    <polyline id="<%= data.baseID + 'temp-line' %>" fill="none" stroke="#2196F3"
-              text-anchor="end" stroke-width="2" points=""></polyline>
-  </svg>-->
 </div>
 <div class="mui-tabs__pane" id="<%= data.baseID + '-a-pane' %>">
-  <!--<svg id="<%= data.baseID + 'ambient-svg' %>" width="300" height="150"
-       fill="blue">
-    <line x1="46" y1="12" x2="280" y2="12"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="<%= data.baseID + 'ambient-txt1' %>" x="36" y="15"
-          text-anchor="end">&#45;&#45;
-    </text>
-    <line x1="46" y1="136" x2="280" y2="136"
-          style="stroke:#004c6d;stroke-width:2;"></line>
-    <text id="undefined" x="36" y="139" text-anchor="end">0</text>
-    <polyline id="<%= data.baseID + 'ambient-line' %>" fill="none"
-              stroke="#2196F3" text-anchor="end" stroke-width="2"
-              points=""></polyline>
-  </svg>-->
-
 
   <svg width='300' height='200' viewbox='0 0 300 220' background="#212121" id="<%= data.baseID + 'ambient-svg' %>">
         <filter id="dropshadow" height="130%">
@@ -80,11 +51,11 @@
 
     <!--  stroke-linecap="round" -->
         <g  transform="translate(-90,40) rotate(-120 180 90)" >
-    <path id="<%= data.baseID + 'ambient-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12"  style="filter:url(#dropshadow)"/>
+    <path id="<%= data.baseID + 'ambient-arcB' %>" fill="none" stroke="rgb(61, 61, 61)" stroke-width="12"  />
           <path id="<%= data.baseID + 'ambient-arc' %>" fill="none" stroke="#00bfff" stroke-width="12" />
         </g>
         <g transform="translate(150,100)">
-          <text id="<%= data.baseID + 'ambient-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' style="filter:url(#dropshadow)">--ºc</text>
+          <text id="<%= data.baseID + 'ambient-label' %>" class='textLabel' x='0' y='100' fill='#bad649' font-size='50' >--ºc</text>
         </g>
       </svg>