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

---
 .../js/device/CC2650/cc2650_accelerometer.js  |  68 ++-
 .../sensortoy/app/js/standards/capability.js  |   5 +-
 .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes
 .../2.2.1/taskArtifacts/fileHashes.bin        | Bin 148764 -> 148764 bytes
 .../2.2.1/taskArtifacts/fileSnapshots.bin     | Bin 10918810 -> 10918810 bytes
 .../2.2.1/taskArtifacts/taskArtifacts.bin     | Bin 61031 -> 61031 bytes
 .../js/device/CC2650/cc2650_accelerometer.js  |  68 ++-
 .../assets/www/js/standards/capability.js     |   5 +-
 .../js/device/CC2650/cc2650_accelerometer.js  | 435 ++++++++++++------
 .../ios/www/js/standards/capability.js        | 102 ++--
 10 files changed, 459 insertions(+), 224 deletions(-)

diff --git a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js
index a488a2f..8b1cfe8 100644
--- a/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js
+++ b/sensortoy/sensortoy/app/js/device/CC2650/cc2650_accelerometer.js
@@ -198,22 +198,16 @@ CC2650_ACCEL = function(p) {
         }
       }
 
-
-      console.log('accel max:', max);
       ceiling = max;
 
-     /* if (ceiling < this.previousCeil) {
-        ceiling = ceiling + ((this.previousCeil - ceiling) / 2);
-        ceiling = (Math.ceil((Math.round(ceiling) + 1) / 10));
-      }*/
-
       floor = ceiling * -1;
       ceilingLimit = ceiling;
 
       var scalePos = (124 / 2) / ceiling;
       var scaleNeg = (124 / 2) / floor;
-      // Var xstep = (280 - 46) / 100;
-      var xstep = 2.34;
+      var xstep = (680 - 46) / 100;
+
+      //Var xstep = 2.34;
 
       for (lineMode = 0; lineMode < parts.length; lineMode++) {
 
@@ -259,7 +253,7 @@ CC2650_ACCEL = function(p) {
 
   };
 
-  this.generateBlankGraphBase = function(subID) {
+  this.generateBlankGraphBase = function(subID, settings) {
 
     var _subID = subID || '';
     var xmlns = 'http://www.w3.org/2000/svg';
@@ -268,16 +262,28 @@ CC2650_ACCEL = function(p) {
     var text1ID = this.frameID + _subID + '-txt1';
     var text2ID = this.frameID + _subID + '-txt2';
 
+    var _width = settings.width || 300;
+    var _height = settings.height || 150;
+    var _fill = settings.fill || 'blue';
+
     var svg = document.createElementNS(xmlns, 'svg');
 
-    svg.setAttributeNS(xmlns, 'id', svgID);
-    svg.setAttributeNS(xmlns, 'width', '300');
-    svg.setAttributeNS(xmlns, 'height', '150');
-    svg.setAttributeNS(xmlns, 'fill', 'blue');
+    svg.setAttribute('id', svgID);
+    // Svg.setAttribute(xmlns, 'version', '1.1');
+    svg.setAttribute('width', _width.toString());
+    svg.setAttribute('height', _height.toString());
+    svg.setAttribute('fill', _fill);
 
-    svg = this.graphAddXAxis(svg, {y: 12, colour: '#004c6d', id: text1ID});
-    svg = this.graphAddXAxis(svg, {y: 136, colour: '#004c6d', id: text2ID});
-    svg = this.graphAddXAxis(svg, {y: 71, colour: '#004c6d', text: '0'});
+
+    svg.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xlink', 'http://www.w3.org/1999/xlink');
+
+    svg.setAttributeNS(xmlns, 'viewBox', '0 0 700 150');
+    //  Svg.setAttributeNS(xmlns, 'style', 'width:700px;height:150px;');
+
+
+    svg = this.graphAddXAxis(svg, {y: 12, x2: 680, colour: '#004c6d', id: text1ID});
+    svg = this.graphAddXAxis(svg, {y: 136, x2: 680, colour: '#004c6d', id: text2ID});
+    svg = this.graphAddXAxis(svg, {y: 71, x2: 680, colour: '#004c6d', text: '0'});
 
     return svg;
 
@@ -290,7 +296,7 @@ CC2650_ACCEL = function(p) {
     var ylineID = this.frameID + _subID + '-y-line';
     var zlineID = this.frameID + _subID + '-z-line';
 
-    var svg = this.generateBlankGraphBase(_subID);
+    var svg = this.generateBlankGraphBase(_subID,{width: '700',height: 150});
 
     svg = this.graphAddLine(svg, xlineID, 'rgba(255,0,0,0.5)');
     svg = this.graphAddLine(svg, ylineID, 'rgba(0,255,0,0.5)');
@@ -300,6 +306,12 @@ CC2650_ACCEL = function(p) {
 
   };
 
+  this.startCalibrate = function() {
+    console.log('Start calibrate');
+
+    alert('Mag Calibration: Wave device in a figure eight until done!');
+  };
+
   this.insertFrame = function(mode) {
 
     var frame;
@@ -320,10 +332,22 @@ CC2650_ACCEL = function(p) {
       class: 'mui-panel', id: this.frames[modeID]
     });
 
-    $('<div />', {class: 'mui-row'}).append($('<div />', {
-      class: 'mui-col-xs-12 mui--text-title mui-ellipsis-2', text: title
-    })).appendTo(frame);
+    if (mode === 'mag') {
+      var elm =  $('<div />', {class: 'mui-row'});
+      var button = $('<button />',{class: 'mui-btn mui-btn--raised', id: modeID + '-cal', text: 'Calibrate', click: this.startCalibrate.bind(this)});
 
+      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));
+
+      frame.append(elm);
+
+    } else {
+      $('<div />', {class: 'mui-row'}).append($('<div />', {
+        class: 'mui-col-xs-12 mui--text-title mui-ellipsis-2', text: title
+      })).appendTo(frame);
+
+    }
     this.$frame.append(frame);
     this.$id[modeID] = $('#' + this.frames[modeID]);
 
@@ -370,7 +394,7 @@ CC2650_ACCEL = function(p) {
     row = $('<div />', {class: 'mui-row'});
 
     var _graph = this.generateBlankGraph(mode);
-    row.append($('<div>', {class: 'mui-col-md-12'}).append(_graph));
+    row.append($('<div>', {class: 'mui-col-sm-12'}).append(_graph));
 
     this.$id[modeID].append(row);
   };
diff --git a/sensortoy/sensortoy/app/js/standards/capability.js b/sensortoy/sensortoy/app/js/standards/capability.js
index deb83a7..156d349 100644
--- a/sensortoy/sensortoy/app/js/standards/capability.js
+++ b/sensortoy/sensortoy/app/js/standards/capability.js
@@ -47,7 +47,7 @@ var CAPABILITY = function(p) {
   this.$frame = null;
 
   this.previousCeil = 0;
-  
+
   capabilityManager.register({id: this.capabilityID, module: this});
 };
 
@@ -169,6 +169,7 @@ CAPABILITY.prototype.graphAddXAxis = function(svg, settings) {
   var _svg = svg;
   var y = settings.y || 0;
   var y2 = y + 3;
+  var x2 = settings.x2 || 280;
   var colour = settings.colour || '#ff0000';
   var id = settings.id;
   var textContent = settings.text || '-';
@@ -179,7 +180,7 @@ CAPABILITY.prototype.graphAddXAxis = function(svg, settings) {
 
   line.setAttributeNS(null,'x1','46');
   line.setAttributeNS(null,'y1', y);
-  line.setAttributeNS(null,'x2','280');
+  line.setAttributeNS(null,'x2', x2);
   line.setAttributeNS(null,'y2', y);
   line.setAttributeNS(null,'style',lineStyle);
 
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 6f33c7163864d0326eeb51f4042112ab3206552e..992f1acbed736b65c7a93c1ae5601b850a6f91d7 100644
GIT binary patch
literal 17
WcmZQx&{6#8*tO}73?RV58x8<JCIwvp

literal 17
WcmZQx&{6#8*tO}73?RUK{TBd1S_a7g

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 146d3d692f6117a71f59d601dc8c485a4c681cc1..10716a11b54db6bf95467d72ed42a493d7e3d172 100644
GIT binary patch
delta 30399
zcmeI5cTiNzy0>SBA!kukB#0421-Cf@=70gW3W^fUiUhN$ASiAHF~AaAQ4uhUS(J?^
zf_ob<=Lmv12UJX`e00CfJFBg0)pu^)e{R*?Rp;y~pY!YPwN}r}n%{cHvo2PDU9A4z
zZsV%Dw2yL8uz%D?>Ayy=cWo~X9p|F~%BnResP#kdZ|U^7x*DLUYDYo!nVYkv@^SSl
zKzL932NnN#(f=xUy4Fr=J)VNfIUKDh*cp-(E`^Mj4`tDT0-vi(r%PJ|pxuaq?Pl)^
zr9xpS?NkbmOz`e2Rhu9m%5*aYm&P6cDS1qgugYW*1%cZwt4q-=QMuf~ttdFuaLPX<
z=%bR3RY}yHC^2?#q>|oGpy#9#ILxJ>EWpoE3YaKQC~_$HzW;5Q<a$6pyH0ls&Oe-!
zCS4K|x+)3|-+OgQ+AU9Lz4xZzM5pV8l53!B4rRZ!6oh2XJtWy=$icTX3VKD<xh3tA
zC$yTqpkQra%WP?hkT4oYfo10PYf`OAvgIn{oha~0`J5+x%a8#D9LI^{i6zn!c|!4a
zJWU)m|9U{0cu=0`wU2@u9g6EoWkO<VC<S%f@6nZ-2Mv>*-NEc!Rjm`WUP=v;52ZLm
z6Iw0(!lc^*sOCw*uAg6TNan$^Q=({+OM%6K1=><i0kkxwVDX2ryVAU1`5YGI6g*m&
zw@JzrfO#|pMg~rcq_@IQDz+I899_1ZoT;vqkEQdKM($c!m`c7Oa?q(N1>NHd$B=e4
zge})QkCKjL@g6d{hA^16KP5+=SQwJ+Vn*dliC*TR&!iYg<qOWG4<#-eeN#yFnryU6
zQayr_*y-c7Nq><j*xD{!=s%1s5{Z#E&0H__X-tmQWUH<m&5~tuC#QZTpG2Y@LNm#+
zh7(8=D`5qSKPXWhP1Kk2CexEsIhavC1&^#d*COk!glTlxR+?1u?7QSLg<j^$i0N}0
zSu`Tfj2PAuBHC{#Y2N$ECMkJ}{1O<fq2O_gutGAsmT;nVA5*epO-2vNWU72KDT*l=
zKh9(gc@DEwz8@$V$<4p|p47G$uBY}$ni*qM8cMvZg=x&#t94SXlefrnktmw8%)8>D
z<dis?f?dzXYl>6J&tEc)Y3Aw0%y81mMp%JS79}q}S$`uzA~B1l#OBSp{Rz{BQ^Q`$
zC%#R6OA2g+HEV6434goQB~qvmF{6L3xPG&-9`UdhBI<uA3E%dkiBv2^lx)w8&K_Sx
zj@Sw-HvU8-Ej*jMNd0HXFM!rF3S2+*c}^PH3A5<?P;w|cK1a%#AwL$?XbSu~Y`IC2
z?1WhqqbO;UK7Av(EDom9qQo}IaRSk=Eli{9LCJ)%*DQ&<NOWdUa?klo5DEK*1XEJz
zd^CXU6N$=%lGnEe)F;nHqE$#q!VCSY#NJ+5foWSx?#-xeNru{s$HP8-mnXjINLGkM
z$=;w+y>0EtDRDIAL^|5fMGrhlxkwbvC|S|4b17+EM_7SkDkWic|Gq*(>If@PvbQ_y
zcoQ44<rgxKW^U%iuOx-yXcpHfX+6wykTiL={8}s7h3kFZC!KiI6&9fELL;#?(vC^R
zv*p)X(UpQbz2eG#4+hMUPof$|6BeFv9>l4hFo}Y_2@JJ+6)YVSBHHXds3f6RAxWwy
z9KO+dI+*|X;$`HrNR;el+q-bfOrlp`$f)9IX6MP7y@;zww2x47<kBQFGNZn@G`7{A
zo(sH2c8kO^ie?rJU9pKg5l7Q1p`^|7CBDR_fiRlNf|9HEwl<UYh0D*Tl6?x_vW<92
zmWmPm5E{9i{fD<?A0b5iD0m+iT0nj@5RbDKC6{x*xJxS{=oP4Z=T@>;$AiBbdy&9~
zY+;o|&2EeqI^F6ml?xFS`-Bd+j@wA?G-R_>MiejUERXDSn-g;fk+@RQY@_`$((@P6
zloEptd0)vq2VnsUw$D22k8DUXf626<nQ+I8#pI1hRFf$2u~tl#q9W<3sa%@=9tx~J
zpC3p@I0{RHjXq+NtF81-h$z_o(fGq%Hj{H=L~)i5wnDGpUCA#>el`^iD0rMPR8877
z5@vyeN$LN38kzhHai^KR9lIC)ez2lO;+bI|P)47pXOrqqA{j~tJNF~~5b6I5VK*sJ
zrKiu5MZb{FG_!R4c_lga3mHU-|L&Oq<g=4_IP7}bB*YFTO&g0OjApzy*IF&*EfCHP
zyU@!{)eR-<eu=ozNaOk;+a%{`Au^VN`kDDY#Gr|Iob2ZOqjz!#DLHz$>^duc(nySV
zuVBe!p?m{q<xp^--T))1`$G974c}AnAjzauTDC+Ew5L$;Zt}lvN$sY>F`A}OvTaGp
zdFiDvmKOU=ZC=`ZDOn~)PBx;E_1-?OrJ;Yx*ENvc1nhMSY#_x8;Osh@$bX*TBw4SJ
zuWRKC3eHpsXrHi1{^zaPZG+$ZoY_+AMe-?>Cuv}~&Lfo+B7kQ_6dZkc#!T8OfT`?z
z$)kHa?ny-gxX#YWs7)`QN!1t2=1{g|Z({}5y7@?ZW96&b!M@j4(I%<V(^y$T;o6B#
zZWnhrNXl6(ODJ2-q#*v^<%dZ?GvTTyvja)Zno=$`iIGJVAJ|(`yi=1g<We)?QvJQ3
z4wi3mVAt=jZl^zlSybC-WWmLrO36St6rBtT){MVa|3AM}|BbU^C+tR58J&Dy*RRgf
zkR|f-sEDB;)5fam?~kxq3*iX0*t_Jrt^T3X4`Gs~59wG>Nd6^~(n2_oT3M8A*O}%n
z1;)vz*Q!oIgTX~-h-ph9V!%FH9I}?(l<o)-)d3p$<4w3Xi4Y@N><-4F_dG4B*HZZf
z);>=of7V*#B1H;7Em06)b-0C;xm3O`75l{Px5n?H^i}{`f6zqEY^S$U!)5Y04B1`6
z>9bYtO1{g4p)S)zSHHJ8(kcO%u@`kcoe_c31p#QyqluV+^B$7Ua`{kN>=ozzD(H^X
zX}NrIt*JCo#i@-Qx!+nijW%s48Ex-oEbSD=GJZnArOx&L{m-`}Io3wl5sHO$EdRI}
z-^hkO0x|teN&XLaU*g<WAljLf^oo8vo4oZ9mfT=ICBy7fYm;O#Q;l^e*R%fdk|xH>
zPmFRnjl}iab(xs76Q)u3qQudmX{vNbh#0ZvY)wGVr6i)AFu$cIjcm1gJxc18AfH9O
zl7ba)z0;*A0qFfh!N{z>QBsx&dQgx!JGiG*k|4ie+6^d(dg6aha**Uey^DgjCk8l5
zev*80-Q5)QiK*o$5dl<Zr&y_H;U`@bfV!9_LJUUVmULIjhf=f8hO@grmq@Mx&>2G$
zIVOMBl4h<HR>j_Jn=OkPA?+4`9xGzvhxJep&yM1WXD`!pFVYeun?(8SP1&_dTiw`@
z<oyyEK&Rhue@Yu^X`+03<LeZJ1z1=UmrlYgwN6u_9(8h`^j(Ok*>{7>?WOBvLnq<#
zs&Z-Mva-c>Y2qsR!jx>5#mQu#RI*(@y{$D(?0lMWQo1c9bkr2AIyCB*WKQG>O9Kl2
zZ5q^2>Ph5tXfyC+xKu-m6cSc_Y2x8QS2HP7NGNYoP_Nk-7wN5#P;R22&lSsPa{o`^
zr051v;_ZImyX3oCKD+8~3i8v-PY};R;z?omU3rcN7D(q;%a6pKH9+l@-6Bb-yD*D_
zeUDHKiglAZtdU0)?A4$g+{=g*i4oO7I{$~aInh$O5HVsO^OKrJkC2+}l8>ck*Vn0Q
z{r6JMB>AD}v$wCm-5y+(JO!Y7L+5zDsY{*|lOznqUMJJCmPSdr0<fG#6CaD4jF3Ky
zL$SB0_RpsLket`bhjL^UN5ZTgTEyN<IFD)zI#%6`S6`&{LPVQ=0u~3JxJTT&3g=P#
z4vozEYTj5fS|>k5wIc=PMzznAy<$YgzA4`Mko8QOyH36^{S+D**<t7sV%JTWMad5G
zWa_Pt(n}$t#lEPu&fR*2EbAs7%RV~T?L8S4H=XO{3)31%!Ly!Y8%yy5P;RH7i&<em
zDPIKa`}onJf3%mB$?~BLHq*q;hY!0-ZIk6kqGX@U{!VB1OQ8ZVJwy{JZ8M^!t-??$
z_5nO=zPY1RBqZRoT;Dt>O0wJ_pF`D^4s~P7mo8FY0oXcIaQXNfHF?)VI48#JMK@FJ
z6eMMDkROP04UL$$Kfa&%^%Ty$VhbhLp04+loKob|D_2vn{^IMZ<U&tjmYVF&AoX-f
zk+dd7n8lw)%9Z_}OP9s5;wi|gx~+kvmntNVQ4m%~8X>u*%4gSRH%noOdCjGnLPD!G
zP2377ca`=CK*@Gpy_3=1rKiGBY7?3$x6QYbY}4d(s2fty^5>WglGj@}LKVA;Rr3yf
zmEwem1$$kOxc4Oc_cs|*S(^M14cIHbZ*Ez?-`{;mfg9x!{fTs8mWy7Q6H^c2YT2{z
zU^QR(I!bqih#C8SRAuoqA2Lsj7_i;4BjMul|Ji#S;@ekPn$ngodgFwcOH!lF@}p5+
zrC{B<XXD8QF=E2r@Q2%VZ7n5jmR}hqd($~xz2Q9RvM`o*dpcGfDddNwzeS$V)}kQ#
zuSZWLw=MG7Rc!0UPP#Hmnk4`wd(r=l-efH86@Z!z<@c}pxb#c_=B$YR5}EWys=ZY{
zxoSF{e00!RJ;_T1?8d}=P?w+5vaQ0Z3TUE9-7ZnmNdYJ?Qjp=@qp|c;7)s5)By^3d
zc9x_L5Kg?xhDM5R`vpru+vJnfwWPpf!`Xwx+*91&?7iD}m;OPiV4M6%^cT~}wA8Zt
zWS*xmOBHQOG6u)olllm^A4>L;SlnjM$N#&P!A9=?Ze<kzJ8xym#TzD_hjiCljh^Tz
zo!KLQp%@xcu+~r&E-ClQL5&L(EQ;8jAhn^O?ge&_Sn(}DkAfY2>vomm$5jB+0ek5m
zD7XVL`1Cbfa3CrHcOZs#4zrO8_g3_P2tajsFs%DsP#q9}>QL>8=T%T05P<6Nw0`3`
zpgL$kDqX|-;n6QabwB{BL-IgdZ%`fZI6!rntEcq}R0m9e>X21)<1teHfxX>SKEZ^i
zVFtAVzetz%SG+^vSfDz*%I$pxR0jm0I=r;_HXl?61fU4q=^Q*1R0jm0I_#SF)d^IG
zO2AczD;shffa*{Qxau&=azbBF9T0%(;9JzXE~pNbfU6F1XKK5F>QD)kpgJfmbDcqT
zKme+Phw?!?P#r1(R~@d5iZlS#0RgBEJNCZn3917EP#yBtmllEQfB;m77D<P{OA~|S
zI}TI_tp&5jg6e<?P#vnS>^&b;2Lzxx9QJ$F1XKqEO>*frQCC^@6I2HTpgL?AIH@+M
z4hTSX_|Wm1AE*upKy|2<-f1qV4hTSX*krwS;DJ?{-u|*}0;<EgY@LswI$#7;2TzyN
z$y{|n0;)r!R_h0G)d7jNKRuN69y;&1>VO1P2RqA+MqG730;<DU{q9j*bwC2DLqSn!
zJ+3++0o7skXs<b3bwC2D!veo9#$0tk0;<ERyIHrm>VO1Phtst!dUDkP38)T(sxNf_
z)d2yh4*L%cYsXawB%nI9^QjP@nCgH4RENu-S2p9S0}@aj#uWct2&w}DP#xYUPHMna
z2PB|69Bq?&1XKqEpgPPuS!*O$9grxC>9x5z{-i!v9gu+PFlATq60SNR0o7s7;j4AI
z>VO1Phbf+=X<T*C5cXxPeVfu@Ty@Zp#&iYmg46!ussj>G9e#M}E4k``1XKru{<nKE
z)dBz9fZdZ{@fll{s}4v&b(op6)Bscm1ndq|aePMG4_tLX0;<DA{bx5obwB{B!&IyA
zdR%ot0;)sZcMZ;h>VN=L2Zw>aRk-Sa1XPDqtLSc^Iv@bmq38Mojk)T81m4`84g9^i
z>VO1P2mSUP61eJs1XPEJQ+clms18U#b;w`#dKFh4G$fc_nKR3_C2`dO38)U=!n)n#
zssj>G9TxVncHpW55>OrTZ?=5RRR<)Bo^+noEy_-E)d2~p4u`%PKH{o_hOjSe&l`N+
z!Bqz&pgJu2%gcnT4jM9*&J#R;mm^mlkbvr7=u+zmR~<BjRqwg}(IH%QKmw{m?Xs?W
zKy^UCp8!wlH-M`S8q$R>V0~6*S1=k7fa-Am*&4;~0aG0?0jh)g-I`3UIv@enp<m9|
zL{J?Nfa>t1`S1o@bwC2D!_55B>0EU{0;<D^xd-C7>VO1PhwO19_jA<&38)U~lfzze
z)d7iO20i|FK@rYebwC2D!^$rU{kZCY1XKs-rpcSR>VO1PhkxhoKLe@*0#F?;9t$+%
zssj>G9WGck+z6@z0;L~a+2bZ-8gkVEiHfNXCj(v|2Gs!ps16y8Tg>390}@aju14hs
zg6e<(R0pR+E9Z070STxM`<L9R!c_+iaiuF8r{8uDR~<B@DJ8>O-oC|E2MuBStm?+u
zI$U+okQOxKwBTkQR~?Xm>R^1R#z0UV5P<67G2;4Et~wxrjc#bt&=ph%1fV)}GV_V%
zs)L4{rSqRm8}be81Py3F!2w(M`doF;5Oy%19+wX0s)L5O)65g%`~CNWf$E@%G^dea
zBZ88+>YyP*DM|7=K)C9lA-<H{^t<$es}35%REN9Auh-_PgN6*EnO5o$H?BHp2)mwr
z+9XWls)L4v(Ts_yRu-rZ8o(~}t)TXvTy@Y8HyW9}d}a)&4jM3)f~hu_XLHp-L%b<T
zd;gb>bR$~+%>Yz~qW7NtL3O|cs1A>p^=tyF0|HPTGF&XL!J}dXpgL^1TTp|m4oFN>
z=<Gl3pT7dt0RgBEWBi<Ua@7F|s19e}cR2^D0|HPTp1hc<3lA(2fa<WJORNE?4hTSX
zSoe3B6;mDX&p~z2ci7?sssjR09SnAUuM4UJ0#F@Z_PWvxR0jm0I_#gezZ_Ht1fV*!
zH2IJZszW8<szYqVh}rN^zY-`wb?CZhc_gR~2tak{)ga9SREJ8yRfki-WGz=6Dv1JA
zhtC!h?}6%o091!lQ7yZ2)d2~p4jZ!4<9>g2L3O|gs1Dc145$sN0|HPTE*?Lp{?9Mf
zf8(q$)d435)xq)2eG^a}5P<4%KU3B6_eTh-14ck~*kU}(6I2HTpgQdBc)5hD4oE<C
zDBn5BA5;eos7_xCq2;Gua@7F|s16Ypt3HA1fB;m7(Ot)can%6{s1DtV$JGJV0RgBE
z+WVr+L3Ka?szd9&Y1Ke=Kmd<NYBcZh22=+GpgKIe)cgXd4hTSXNDeUg2C4%B)n$5!
zRZ2f^0M!8js18$hcIyqQ0|HPTiq2jS0@XnSis(=#-KUp<>YxGauC8lT?M_^EKmw}6
zA4|L&gX(|)RENKwb$tAvZ%6(V0>=W?p;d$6yZm7T5>OpBcnzJ$9|Ir()xoamXCJOQ
zAOY3EXi1ims}4v&by#3=cLt~q2takX^XT9^t~wwA)nVTJR*|4OAOO|j;@JT^x$1xf
zRELtirJX@_Kme-4$!>13pgJG`)uDyO;1p0DG=QlN|6H0e0aOPBpgP?2nDrV|2Lzxx
zgoO0e1JwZms17!DwIV=uKme+PSDIl2s169!#dNo{O_}=zR0j=Us>6Eq+e@H2AOO|j
z*`_}2Ky^R>zZx1>Z_Qj#9T0%(aO$0(Jy#u&s1MNDliUs;0M!8js16_hXwitP4oK8Y
zb;$2Cu_mYv2tajkK5N*Ks}4v&br_g`Zw06h2tajM6u+eM`2Z4CE?wB7^u`}SbwB{B
z!@U;Er-JH$091!>eRn<u)d2yh4!PEIzJlt2091#B=;=D3Iv@bmVeh9UZ9#QF0II`5
zyN1m`bwB{B!<4n*=Ab%g0DJ0cGs|Q%R~?Xm>R|FRy%1Cf1n_)dgYxMkt~zK4yYC_k
z($he7Kme-4r1TM~Ty;PKs>6_<2?3xwXuv=81bdZxHsPuR5>OpBciXZVR0jm0I<$*k
zHy2a~1fV*Ezv*}tR0jm0I=p%D?LDXt2tai>X5v!}ssjQwQyuD9B&LAsfB;m7wB9Y}
zg6e=k#Z-r&&JznjbwB{B!@pPj>TuNo38)U!Z9m=y)d2yh4u|pz%em^HA?&GR(?9i%
zL3Ka?s>AjzZC-KJ0STxMaYIw{L3Ka?szZxa?mM{ZfCN;B6^6OjL3Ka?szboUV;{Kc
zfJDtyhvnKkD{eZexPSmuhnxoy#-KVN0M((|;S(XCI%oiU>iP0RBP&oH5P<6NtykF?
zP#q9}>d-3ciUg_y0#F@3Njo=#>VN=Lho%ntdZ0RJKndNCe%aGgKy}anraDC4Djo@{
z0|HPT7LET@pQ{c?Ky|R+-P{9I2Lzxx^oYMBan%6{s1Eb{E(`_L0RgBEXUCMb<f;P_
zP#r#xeEt(u2LwugdMMk|y-tJbpaJZ8^V^)gx}Z8}z%iO|Uc6*3s167~b#QjQT?JGJ
z1fV)BJNwiYR0jm0I!u|gZXBo%2tak%o>3u|G1Wl>nCdWUP<SF&9gu+P&^a*u7N`yg
zKy@&j_A}}CHyNNhU<6c$S`#0J{Qm9(R0oWJ>fqMoqYGCZkbvsY->thIs167~b?92>
z-E6KpAOY3kdz+gN|7Y)UxaxrOfa*~CPkafe4jOQkUgI;Z-u2?D0}@aj3=R&r1l0in
zs1C_TU421yKme-4w6-$~Ky}anEjr1S#@|nY>VN=Lhk}!5I)mzf091!<O^-AN)d2yh
z4*J2?4?%T60II|8M)NO%>VN=Lhd)kTbp+Kx1DNX2<EKv%s16#yREIe+J}IC&AOO|j
z!FxYrP#q9}>QJSD@e8gxAOY1OW@?ZApgJG`)xoOe)s<XzK%!!*gPyMWN>CjTfa*}k
z@S&Qk4oE<Ccu*c+4ypqJP#x|iWL8?6NdE6u=KpSGsI`e3;(x)d45$vcVo)7CE=<t_
z)d2yh4(C&?hJ)&W5Bx!O$nP_yMdl`NWm~1}mr6=zK`gKFxiu*nDyT;~pXj^SqN>C5
zG988~Rq~Lr6-BeFcT3Fd<fAOqk&UOr-dzq(&#6tEM=BF4$cjt!e_Zh!Z}v^x{oWxb
za(yJ5sgfv|wY#3^4kbpT1Rp`gRE$^oZ@*-A8KrbpR}5FFDnx#vgHBV#2ar|cl=8op
zA^JNdvCU1xiS~H5gvyMf2_?IBbP6Kr<An@3A4gxcI!3G}FrBJ0)1DQt1B$X78JVZq
zIY4?u?7VW0*2C1btW)tHd$U=`FXc7bK4SOIo3|VH%KW3k$5IZ)^U!QPJL55fjX!z(
zk{ec77MS_qnqBJ4uc6g<f3K*iX>KKR?-b3q#8wQh(DoX6!B2~Po1m;)O>;6VZc&!&
z*=gEqhWct&3FziKr{#vfOy~75>t3&s2fk$8_3Sk7N<oFLDNM&M+pvbl6T6e=?}byM
z@T0Rm{OK@&*nbcRG<mJsZ|z1-iA1@OW~SyZj3vDTg^ZpTB?sNfEK=}MAO?hzh@2;-
z<Zz&{FBI(I@0CgS6{JKYD)uNh$;~jAI7|{VJLzbK+4Z**KanWe^QGoqljf3lr9wu@
zI{duk?kmXoUoti5XpbHbaU<#=Vb$=<=viO()Fd55V&_6L>HWjUl4(K0JPKBL4L*7F
z2}u_-O7@Ln-3spk<e`|+wWgyTPHeH7_<j;bGoss2F+KchXW|(w5VN|J+#fZ^m7Mz|
zthzdT!t&P<yFii~ED)0jnz5P|=1)3&7Knm9tw?dWx1P9!2=gd>XlB`gTDwWQn5lY?
zlEPYPQ^<x8VYD@Dw1)Hl^dz;u2*i9E&5Smjd7qeu3iCKRQ4)JEe-DWjGd0<BnY+&m
zoJoY3F=y{K7OQ&2kgs2a(adVn(d=!D`x2M00)a2?$rrquka1sywYA8inYVVw7my8N
zrZM{h7rJox6mml(YJZxUWWFwl7=IH+(@&(tE;KouD5nU-B!`kums__b;bKPHgOX`+
z4nbt{6k*k7b189gTJe#*`X&%X5GB6O^=(Lzm@#0#OB<luJdzA66IKA%^!ciY1*G3p
zff#?Iquof{_a`}1Cd|{3?f5pC`O!rAT_D;IY36mWsM(~ANT4g1N`tLQ$bUs*zUQWq
zEg~^`L`TyP-}0FheizoJwT+T>eXf2Ym#2v<V4p{=pB|4T9zTSPA^Z7(f!o$q#BI8e
zQP-xUr5m=pPqM{KHTL?s_2GCYvS+$5nwnX^XL3DG6Q`d7v5ujmz5ci4PhvMiAW*!N
z2d_Cy)`}VR2by_i{Ygodiy3Y9L1mwqX-f>tg;i@Upc$iP4=et@kQoBe-b%@;l!V13
z?3YX&CB}Q4x01agscufm$!$Z%lc(k4s@d+Hb$i_FL_1Z*Jr;ge>#;AjZVzU;Bo0wk
z)FKG<JJPX+xZZq~xJ*cx&!oU@VYQhgYL+mGQ3@s7+bSIre+Xk~{iI-@i~UeiB1TNv
zD`Zm5=Vc^FDP}g(O!U|1gGfM_cxHA`l2xtdT~eSFmZr6Zk{3Nr%pn)Ugrxyl@cEM$
z>7x?oIYKj~lg8~PuCv9=21<JCCQc*SDsdk6{!z3%*M{t#t*j$EYg)`Oe={cJG;z=p
z<}nyaN1I;Sc{K6Y5=PUur=+`&el{T@F=CIyCobxKk6aLm?msk>m|i%U<joOQt%hH(
zmR|ozI;w>gRBuHygRO4NCC%mv83Qv)M$UM%hU`)cYcttJiNe(U6-f~@daUR>m1Gi0
zthI%CwDV}>kbPM^F$)*2oX#9dB8DHiL6(Ra1NI3sAnHzaGEdAH_NJNfaq02oo0u_T
z8}YK^SP$|>%owp1^wT*dkqJ7&+AP_f#@K@`vPr5)4A`$Caz|{<CbxBjbD+1Bu3(_Q
ze@|kjD~twD7!<1SzNDwFkkOe>GrB?jZjyOoMt2V-t55&^lVpk+L)KbH|5$T@yb($L
zzBIG8EV6{$pC_DAbN0>rf@za?WVoKVg6A~zT;C;)^p6xW1}T(GicOe9&gcopqs8uj
z`<@ONPIAPIPBzV$x~DZKZS{qW?g>iD9!_6IChH3;fb%vh@LDd}CT8H9$mYq@4ri{5
zQg(Eay?{)O=x{{u$Sm@DpRh^cC#`G$eKv&jHxMQ=KS?uR`Ug!Q!}kk^sx_OEHMcI0
zB1a8`Wy8;@Gm=BEkh5Y&9ZEAx4GTt)#)iT?U;)LQP0=H54+!(<rPEA6M1%tg6^X%M
zN^~+lr;y9yXu9Vp$@_A_gxnJ|@S(71{eXJJ)ks)@F1tlr>NY2tcw`7GFj!7Un=_}s
z7ujVb9I0V{N^Bb4)FIg!!Wq>Gq~wRaohPv|7Uofpq2y$0cxTe+ppa3gQIffC{RI+d
zEX<?hOG(nBwb3L=%xJOigKb_-ZB4$5^JuY`*4T`I-9-P8a6DSkbhLCu!bRdH67>X1
z{!DMMnWUNsE2wgcl2bQAa><@U!m8`A$9Ji@&L@busr*QlIZtRNEwZi?vCR}RSJ;PE
za?y||5@{-*N44oC&0H+?+e(%R8KpD(`c<=D@2TXSFpolINi%;I6eN)!nZl96W4D(B
z!v7(@X7YIy<~cO8FTCb?GU;z2qg%+x!|-5o-b{Wx3T0hN?(H&bNbdYC9FJKtB@ZKG
z=8_KP!aSzzYu;Zjf2We(S;9Qp2{bcqu=+TO$`VGiET*J9rDih85{Z64O1A4KOe7`Z
zXd&!_?(>U!Q;EZ2ah|C(^T&|pp~O!ls*jYc47{|2<W><@ZNk1R%)FIa@xVdM=pLq-
z^6Tkih_i)wcG^*5ajnNw(ji+|fic^?ACDQ&%AA_5>?D6nvSr`$wQm-^B`01Ap<3*%
z!g<Tf*W|lMs<XQ{XXD0Zr1>l1#OWH)CA=NseS`#x1n&5ndzkDc8%3h4q?wCP4m*>(
zA_-vc^7HMBOo_#7VV>%2BP0~=ZA1FJ7FOM?4;}4RNx)e$UnE9xluQhEDI{6qXa=<?
zxohg{PD;d#wlO6!2iG+t4sV2cEPN=rqTJSm_`MO<X2{Oyx`?;82oW>d?9Pgqbv{Wh
zh#50>Z+E#}Sr*ZGD~zW9na=azdh}b;>8-E=y{nW|x$&$TnJyCjW|VXYjBiPHio}M!
zy||^=w<Qln;@E{|*2GMIMy%cmD;Ub&<jqgpX_JBPgcazreK6r%RW}kNW=w|A(c0{N
zSBvC{nbz!W?2Jdw7xG0U$`>@#q~pFk;#?xEK*xcS!Yk(A$+!|>1?HZVv@bo8M3P0K
zWcPy!!zPa>*F|E<zB%9jKH~{7dM}LTFp7?r@z?anq>D&ulu>f8>CZ`Iwn*IB2T)P@
z;9#;3+A7{IDn}L2Ol+61sl3O+z7%?_kA5A~d5?tzdMx{-{W)YP`-Kz|s1OeuI;~2e
ze?_h4&)M7Cv)H^m-h3f}=4<r$6_fd|t&o6_Z*w?8i}#*Lp!X~r|4obkWwb~@E3qne
z{mOeZB+#R!70+M5do(1_qfM~;V8VMeB+#RsIRCMX_h?9<M_YQ|wmt9BkSN&Qt+kcQ
zK;EMvfgY{ir?5r5N7E4Y#&^T@&p_UzX$b4lK6LGp&08!a&|-}&IGM#;EF{okeL5ce
zFK@AsK#LV`W3Ym^SV*A7GQK`(EpM@qK#P?bb9O9mu{4Cex2&mRGMKkmNT9_!b2u}G
zw^&G^#d4|JeFtx`kU)zyb;n36-eMtv7Hj>yf<e5+LIN$;xt{sgc#DMuS}b+zigpQF
zEF{okwK`UMh__fspv8&_>3oB?SV*A7`jT^V7H_eTK#Mi5UPW65Efx~BKYd-z*&DNp
zw^&G^#nQXH<S*W0A%Pa_erTQJyv0HSE!L<e9ar%d3kkGX4PzIY@)ipTv{=2Cxjf-5
z77}Q&dTePhhqqWrpvC&xI&c<mv5-KEmDgg^Hr`?(ffmczvS1!>v5-KE_3hcpDBfZr
zffg%z(442d#rlOLkGMXRw^&G^#j-6pV8mN2B+z0ld2!O1w^&HDS&LP>`_0L`#X<rt
zmd*YBLA=F6qOMJ^+>ss5R=mYR0xj0Xfj3X^77GcqScL&YoAVY63A9+>#yr}_TP!5d
zVm-SU=gwO!4Ph--`O$~pc#DMuTC7$r(jM~`3kiH-skP!$#ZSRli-iR4X`+;irt%gG
zi59!purg^koVQp=pvAhZ-$mjr77{gUu|j4|v4j>20kl|NU4qU+i-iDMEcfK&)uF{g
z04<hRJw+UEv5*+0&`XfBy6RPEu@FFuwI#kq8gH?XK#Mi!@9zrUVj<DmNC%U=zwhBK
z77}gNV(rc_s?A$0B+ym;cycL{w^+ZBl|vrx<SmwluommV`6+{Wi=`o~#Tv0Cayf6Y
zG=$x2oo;&l32(79<UC#V*MDa>=PeczXt72P^4h>#EF{okd498Y<1H2vXtBZ@{8^v3
zSV*A7ns0DAmbX|)pvBrgDA$y?SV*A7>YV-0BHm&lffj4}&9afa#X<rtR`uQL>b%85
z0xj01_O<5l77GcqSgDb3Ch`^w3A9)fer#{TTP!5dV)dwf@fB~ekU)zyuSw2C-eMtv
z7VG5VshPaR(h$~S4c&TWJa4g(K#MiGs=XU;v5-KEb@TgvH{N0)fi|XF-t+^!#X<rt
zR`rd~H}e)tLs*MtcCO;@6NeTH3A9+tC+yPZEfx}Jv83T~EqRND1X`@PVTlI3#X<rt
z*6rPG40(%%M2CI9`MItBP~Ku8ffj3y)1pY;Vj+PRYuJR@TX~Cx1X`>b#hIshi-iPQ
ztXG}=r}GvI37of(GkNWKi-iPQto@e)+(|KOzK}qP6}f%;0$ySvff6fj%#U5X#6kik
z*4sC;5_pM)1WK%BVgIh?C6<P;ugx1>$2js53kj51Njvhl@DfWyRP?pIcH+Sgyu?BR
zCDx3hz^lB(LINe0d9?>Vyu?BRCDx6hcT0JRg#<nmR&?lA#7itBP+}$B4<5ryEF@53
zO}aB|Coi#(K#66r<oFL>Vj+PN>qVr&4qjp*ffDPoVtf`au{4C0SScMBx8x-j5-72j
zc3U=&msm)k#B%OC_8c#<G=!B{ldDY|%u6f{VI|g))I}|LiG>78tgZ&leR+w61WK$+
zGiSHwB^DAWu?_{a>%>c}O2SL5gZ8a1@e-?&D4@iOiRdz$mspjAmsqz3^&ZYktV+U5
zER%(Pi+PDvNqC9XH9S9nmsm)k#QI(`z6~$2kU)vGrNF2aFR_q7iM6Hk_(Wb}A%PMr
z-$=WFmsm)k#QJEzZV@lBkU)tQAHQoDFR_q7i52?Mye%)WkU)v`OldTRmsm)k#LC&W
zD4v&CNT9?j?$c~BFR_qlvsYvN&kdIF5(^2GSPRaa2<0Uf5-73!!!j=L5(^2GSkI>A
zB=ZsriISCA>gfZmd5MJtO00*rH5QPiFKIu31UjrLGtN}y9TpPku-fSUwB#KY66mnn
z>}>mzcUVZE!}{{QZx7yKA%Xk7darBs;T;wd=&)|}*mI3{SV*A5N{l@7k#|@~pu<`?
zck@5I!$JZb*2MwSTzH3t1Ujtni}f4u4hso%Sm$>4Im|mOB+y|cSB*KtJ1iv7VVy`h
zdV_aZNT9=7QuM7Z@34?ShZVWct0V8QkU)oZa_yVWyu(5Q9aibI_^Q0aLINF@_RJq|
zc!z}qIxMF%(HD4!g#<b*FJ+74yu(5Q9o8}je+%AWA%PA{XM({`-eDnu4l5!^naw*a
zB+y|wn?Ek*9TpPkunJ$NYw->X33OQP)@^FXJ1iv7VV#+(*5w@*66mlR54se<J1iv7
zVJ$2hE%6Qu33OPWMvSuI9TpPkur@aIx8)rc66mn<m%k*u!$JZb)@fh23isPe6)$^W
zm4Bapo_6(lQ-hLvB(|0+NcO^0u&T5B+)e$7p|xt5hvor05YNJW8G`&($6Rq~&<poA
z!^1zg<S$*juge1?u)iv;H|v&k!lqLOt|9xZRdr<}uGXjI>VPW?|G!4WgM$&<UhOfG
z)V5K{<u!fw<ze=T4&HYdk{uYJpwW&S$#NT2J(=;Q%|bDK!Y3M&6&2&jygWe3FUH6J
zD%d&d_vy5>j!T7E=b@@zyLg6p%q~mlk=>07X{je1n!VY7ovYLrSx!eW{*wNcgCx|J
zJqxJ(3;$K)=$J<L{>dU+ZB_MUmsB}|l8n(&S}apd^EL{ZVbkuezE8H<(#H{a5+Stl
z#L6#Z08=cGzz+HITiHXh2;_^(C0PHY6PXU}^oU(b*=TSn|1CKcL7LPS9(z>zL^Ewu
z20Y>f=K<1G+0Blu7c&M8XvV5a=`Kz%1H|}1@ep#owo3m0@noJ(GeO_$hmtP#Dj(TN
z05W@o%aTy?!d`g3V#K7-?b`d!ae@;8$=S52HL<TFT!-)~bfV#Zr(Nd+Ge8Wg9R5g_
z*AY(wdxSCW)RIe_V5SNqp<|PsNV%9XXAfQ+JD-W=1T#Q7JuI4>8B$lZNL8^FDz8u#
zSGu@9Ps_Z><wk4?mBe5>C2wqMuO#|T0%^d$Jx3{yv?A_K!l4?hrkS8&6P(Gu1_Ci2
zMv1iS*j}<n%xIsc#O`3ZHnD3c&chx8K5n<uoY*!Ni0&qu`Ig}8OO`hj=Fw;E&X|SK
zwq$8zf#`IknUjz2?jk?LjM|ctr_mRKN!c&+uzhuHPp=bXl7p}Ubzhpfd+ux)32Y(|
zhipn*rx%?k1!6|KH6>R_L>9R#X0+I&zG`#3>?0nI!m8o7&`a;^uS$A16^KDKI@;tn
z>5oWMQ(*;0tVJ@`YcZW<iNuWEuRm9J^d%+YXuA98XxpycJxc<_eW1QX$<^hVqsbaZ
zQ0<1jqkW}e3Ew+NVDF?jeE);*9VD=KF1GYv!S@al*gJJY4#x1kg9P?YVfH9XzITwo
z-tmmAyOHl5Bn{Z!NjDA6<a-AR?469Q^S|)Dg9P@D(_Zht`QAYSduQ<_T|>Tikig#A
zzR%(`-#bWj+1^P?N*u-a4ieZqiC?Q1@x6lt_ReHCtw6qakigzqmzHM7_YM-+J3hTO
zROfpK3GAJJ-UjdIdj|>Z9oM@vJM+DR1olpsj?b?0y@Ley&emr4zwo_-1oqC8`?^7V
z?;wG_v;J`4apLdHc5mf}yxw5CtHMnR3NneaD$YRm>7><^qS*`9%p(2UvyELDdYnPY
z!keSBNk}_^Y-JDHmOH!qlVf5gk!|1BuR1uAA~6$jjgB@}T{MN1x22=u`z5R(s7~Ah
zz5*n$f`l29-S`UdP+<j;<}0lE3Xs4G+FW@(m|Pe~A2uR^UkfZWzNaL9B7t8R%<1G-
zA<42;V+K||p`D2dS>Hi8rMkW8@mTo%DB=WH4MhF(Sv_LdQ8;e~Pibb}n?8Y@U<Sze
z{=O^7oQ}dhQ~o2GDd-tI?jb|669?$*^EvCti;9V4_e}TS(@?PYg^7;jWyN^15TLNH
zcjL*hPV7DfKY|+4&^*hicSP#M)?G=e*-(;r#o2<K?W9^M+dWFQI)hy^KalpW!c_%g
zV>D8aq`T6)Hq(ymp>oB?(quZ?{oXbke!2PTXZ?2H0$(2o%Tr_AryeizW;bmZYj}~y
zJen2eJQH#iceu;-f@;U!OlomeTWdy3zjph@V4rgpxsHmOMP18;puL&a{L+huIxK9P
z8QgA#`v!}3VlJ22D#O!DclRZ!?)2a)*P>k7m9FLU*EVM>503xMq5R-7Y^Q|%GS`27
zaFsDQxSC`3dsh>3zdg9hAUn7Y3XdgDHbU@s2UnScgVQfh>Pb@E={Bg`^8DD+c2yYg
zx7}5e?C!;o-77i_e0iKib{0Mzja}&Z@Hx4;!d&dk&Q#?*kQqC!^=O`{oJRqfY9GSB
bWH#ucnj-(zk>V8{F4^V6ZnCqhD)j#W+2>o-

delta 30398
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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 23fe41c2d275f5dd3d117f1b28b9391bf9a0797b..eeaf64019f5b6414e62f0a0c372ab0dae1d7b04f 100644
GIT binary patch
delta 5067
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
U#~Z-g8~dZ(KWg&U_VnQY0;F}{#{d8T

delta 4925
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
Y*E;+sJ+u9<eY$y|8r?EGyRQ%b0V>qfzyJUM

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 5eb306ead23e39cdc264a82a7d44956a2e90634c..350fbd97d4aae72c980cd4bbecd867cda0ee176e 100644
GIT binary patch
delta 388
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?~);*IahAT{t+xL3%{D~2h<94s#9B|+SqhR4K!?M6QHWSuGK@$yU
r@jSwz?4;k#bLO358w!kTZXH%s&Bm^5@`aTwEIt4AjW=^2i_ri811+>@

delta 372
zcmaEUhxz#(<_%Np1iVj)Yixbs^tjecYkR^?_8FVXRT%|TxY>Hk)9ZbM`0i;GXfEjh
z3l{43B(!bHoOqk@ef#8PGcIl_*JNbL(JANKEVtk!<7U>DRsn(Zf~<SR^VJMPTo^vC
z{a3YUa^r+vfzku|t?#Nd5AY=iYg`UJun8<U|KzE=Mr$N)R64Sj1js(;2MSJPai5Ym
zeX?SM^W=52#3r9@FxvcO+GimFBYuVnzgoXrGDbx9y^VdSxB2{*7*+wd*qFLNe&b0U
zirG<hlfC#MqSNkP=gs>2B|B=-{vFN2N%MfB39Kr)t-{r3j2RfXPXX~E5N58Kzije(
zJ=RG9vaQn}2UQ5}nLIIEVRGEQ*OM3SU%z?&L<J_n-o^u>-&>DPIIv-ztD^SpE-XrZ
jUtDQ>r-ONu_q8W>*C$m7qbpHiVo6xHF@H1nu^0^i66UG7

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 a488a2f..9d338f4 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
@@ -198,22 +198,16 @@ CC2650_ACCEL = function(p) {
         }
       }
 
-
-      console.log('accel max:', max);
       ceiling = max;
 
-     /* if (ceiling < this.previousCeil) {
-        ceiling = ceiling + ((this.previousCeil - ceiling) / 2);
-        ceiling = (Math.ceil((Math.round(ceiling) + 1) / 10));
-      }*/
-
       floor = ceiling * -1;
       ceilingLimit = ceiling;
 
       var scalePos = (124 / 2) / ceiling;
       var scaleNeg = (124 / 2) / floor;
-      // Var xstep = (280 - 46) / 100;
-      var xstep = 2.34;
+      var xstep = (680 - 46) / 100;
+
+      //Var xstep = 2.34;
 
       for (lineMode = 0; lineMode < parts.length; lineMode++) {
 
@@ -259,7 +253,7 @@ CC2650_ACCEL = function(p) {
 
   };
 
-  this.generateBlankGraphBase = function(subID) {
+  this.generateBlankGraphBase = function(subID, settings) {
 
     var _subID = subID || '';
     var xmlns = 'http://www.w3.org/2000/svg';
@@ -268,16 +262,28 @@ CC2650_ACCEL = function(p) {
     var text1ID = this.frameID + _subID + '-txt1';
     var text2ID = this.frameID + _subID + '-txt2';
 
+    var _width = settings.width || 300;
+    var _height = settings.height || 150;
+    var _fill = settings.fill || 'blue';
+
     var svg = document.createElementNS(xmlns, 'svg');
 
-    svg.setAttributeNS(xmlns, 'id', svgID);
-    svg.setAttributeNS(xmlns, 'width', '300');
-    svg.setAttributeNS(xmlns, 'height', '150');
-    svg.setAttributeNS(xmlns, 'fill', 'blue');
+    svg.setAttribute('id', svgID);
+    // Svg.setAttribute(xmlns, 'version', '1.1');
+    svg.setAttribute('width', _width.toString());
+    svg.setAttribute('height', _height.toString());
+    svg.setAttribute('fill', _fill);
 
-    svg = this.graphAddXAxis(svg, {y: 12, colour: '#004c6d', id: text1ID});
-    svg = this.graphAddXAxis(svg, {y: 136, colour: '#004c6d', id: text2ID});
-    svg = this.graphAddXAxis(svg, {y: 71, colour: '#004c6d', text: '0'});
+
+    svg.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xlink', 'http://www.w3.org/1999/xlink');
+
+    svg.setAttributeNS(xmlns, 'viewBox', '0 0 700 150');
+    //  Svg.setAttributeNS(xmlns, 'style', 'width:700px;height:150px;');
+
+
+    svg = this.graphAddXAxis(svg, {y: 12, x2: 680, colour: '#004c6d', id: text1ID});
+    svg = this.graphAddXAxis(svg, {y: 136, x2: 680, colour: '#004c6d', id: text2ID});
+    svg = this.graphAddXAxis(svg, {y: 71, x2: 680, colour: '#004c6d', text: '0'});
 
     return svg;
 
@@ -290,7 +296,7 @@ CC2650_ACCEL = function(p) {
     var ylineID = this.frameID + _subID + '-y-line';
     var zlineID = this.frameID + _subID + '-z-line';
 
-    var svg = this.generateBlankGraphBase(_subID);
+    var svg = this.generateBlankGraphBase(_subID,{width: '700',height: 150});
 
     svg = this.graphAddLine(svg, xlineID, 'rgba(255,0,0,0.5)');
     svg = this.graphAddLine(svg, ylineID, 'rgba(0,255,0,0.5)');
@@ -300,6 +306,12 @@ CC2650_ACCEL = function(p) {
 
   };
 
+  this.startCalibrate = function() {
+    console.log('Start calibrate');
+
+    alert('Mag Calibration: Wave device in a figure eight until done!');
+  };
+
   this.insertFrame = function(mode) {
 
     var frame;
@@ -320,10 +332,22 @@ CC2650_ACCEL = function(p) {
       class: 'mui-panel', id: this.frames[modeID]
     });
 
-    $('<div />', {class: 'mui-row'}).append($('<div />', {
-      class: 'mui-col-xs-12 mui--text-title mui-ellipsis-2', text: title
-    })).appendTo(frame);
+    if (mode === 'mag') {
+      var elm =  $('<div />', {class: 'mui-row'});
+      var button = $('<button />',{class: 'mui-btn mui-btn--raised', id: modeID + '-cal', text: 'Calibrate', click: this.startCalibrate.bind(this)});
 
+      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));
+
+      frame.append(elm);
+
+    } else {
+      $('<div />', {class: 'mui-row'}).append($('<div />', {
+        class: 'mui-col-xs-12 mui--text-title mui-ellipsis-2', text: title
+      })).appendTo(frame);
+
+    }
     this.$frame.append(frame);
     this.$id[modeID] = $('#' + this.frames[modeID]);
 
@@ -370,7 +394,7 @@ CC2650_ACCEL = function(p) {
     row = $('<div />', {class: 'mui-row'});
 
     var _graph = this.generateBlankGraph(mode);
-    row.append($('<div>', {class: 'mui-col-md-12'}).append(_graph));
+    row.append($('<div>', {class: 'mui-col-sm-12'}).append(_graph));
 
     this.$id[modeID].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 deb83a7..156d349 100644
--- a/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js
+++ b/sensortoy/sensortoy/platforms/android/assets/www/js/standards/capability.js
@@ -47,7 +47,7 @@ var CAPABILITY = function(p) {
   this.$frame = null;
 
   this.previousCeil = 0;
-  
+
   capabilityManager.register({id: this.capabilityID, module: this});
 };
 
@@ -169,6 +169,7 @@ CAPABILITY.prototype.graphAddXAxis = function(svg, settings) {
   var _svg = svg;
   var y = settings.y || 0;
   var y2 = y + 3;
+  var x2 = settings.x2 || 280;
   var colour = settings.colour || '#ff0000';
   var id = settings.id;
   var textContent = settings.text || '-';
@@ -179,7 +180,7 @@ CAPABILITY.prototype.graphAddXAxis = function(svg, settings) {
 
   line.setAttributeNS(null,'x1','46');
   line.setAttributeNS(null,'y1', y);
-  line.setAttributeNS(null,'x2','280');
+  line.setAttributeNS(null,'x2', x2);
   line.setAttributeNS(null,'y2', y);
   line.setAttributeNS(null,'style',lineStyle);
 
diff --git a/sensortoy/sensortoy/platforms/ios/www/js/device/CC2650/cc2650_accelerometer.js b/sensortoy/sensortoy/platforms/ios/www/js/device/CC2650/cc2650_accelerometer.js
index 6814fe0..508054a 100644
--- a/sensortoy/sensortoy/platforms/ios/www/js/device/CC2650/cc2650_accelerometer.js
+++ b/sensortoy/sensortoy/platforms/ios/www/js/device/CC2650/cc2650_accelerometer.js
@@ -9,7 +9,8 @@
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
-var CC2650_ACCEL = function(p) {
+var CC2650_ACCEL;
+CC2650_ACCEL = function(p) {
   'use strict';
   this.name = 'Accelerometer';
   this.deviceID = p.deviceID || null;
@@ -17,131 +18,276 @@ var CC2650_ACCEL = function(p) {
 
   this.capabilityID = 'F000AA80-0451-4000-B000-000000000000';
   this.serviceDef = {
-      service: 'F000AA80-0451-4000-B000-000000000000',
-      data: 'F000AA81-0451-4000-B000-000000000000', // Read/notify 3 bytes X : Y : Z
-      notification: 'F0002902-0451-4000-B000-000000000000',
-      configuration: 'F000AA82-0451-4000-B000-000000000000', // Read/write 1 byte
-      period: 'F000AA83-0451-4000-B000-000000000000' // Read/write 1 byte Period = [Input*10]ms
-    };
+    service: 'F000AA80-0451-4000-B000-000000000000',
+    data: 'F000AA81-0451-4000-B000-000000000000', // Read/notify 3 bytes X : Y : Z
+    notification: 'F0002902-0451-4000-B000-000000000000',
+    configuration: 'F000AA82-0451-4000-B000-000000000000', // Read/write 1 byte
+    period: 'F000AA83-0451-4000-B000-000000000000' // Read/write 1 byte Period = [Input*10]ms
+  };
   this.frames = {};
 
   this.$id = {};
   this.$result = {};
-  this.data = {gyro: {x: [], y: [], z: []}, accel: {x: [], y: [], z: []}, mag: {x: [], y: [], z: []}};
+  this.data = {
+    gyro: {x: [], y: [], z: []},
+    accel: {x: [], y: [], z: []},
+    mag: {x: [], y: [], z: []}
+  };
 
   this.setFrame();
 
   this.sensorMpu9250GyroConvert = function(data) {
-        return (data * 1.0) / (65536 / 500);
-      };
+    return (data * 1.0) / (65536 / 500);
+  };
 
   this.sensorMpu9250AccConvert = function(data) {
-      // Change  /2 to match accel range...i.e. 16 g would be /16
-      return (data * 1.0) / (32768 / 2);
-    };
+    // Change  /2 to match accel range...i.e. 16 g would be /16
+    return (data * 1.0) / (32768 / 2);
+  };
 
   this.processData = function(data) {
     var a = new Int16Array(data);
     var calcData = {
-                gyro: {
-                  x: this.sensorMpu9250GyroConvert(a[0]),y: this.sensorMpu9250GyroConvert(a[1]),z: this.sensorMpu9250GyroConvert(a[2])
-                },
-                accel: {
-                        x: this.sensorMpu9250AccConvert(a[3]),y: this.sensorMpu9250AccConvert(a[4]),z: this.sensorMpu9250AccConvert(a[5])
-                      },
-                mag: {
-                        x: a[6],y: a[7],z: a[8]
-                      }
-              };
-
+      gyro: {
+        x: this.sensorMpu9250GyroConvert(a[0]),
+        y: this.sensorMpu9250GyroConvert(a[1]),
+        z: this.sensorMpu9250GyroConvert(a[2])
+      }, accel: {
+        x: this.sensorMpu9250AccConvert(a[3]),
+        y: this.sensorMpu9250AccConvert(a[4]),
+        z: this.sensorMpu9250AccConvert(a[5])
+      }, mag: {
+        x: a[6], y: a[7], z: a[8]
+      }
+    };
 
     return calcData;
   };
   this.onAccelerometerData = function(data) {
-          //  Console.log(data);
-          var message;
-          var calcData;
+      //  Console.log(data);
+      var message;
+      var calcData;
 
-          calcData = this.processData(data);
+      function gString(v) {
+        return [v.toFixed(3),'G'].join('');
+      }
 
-          message = 'Gyro <br/>' +
-                    'X: ' + calcData.gyro.x + '<br/>' +
-                    'Y: ' + calcData.gyro.y + '<br/>' +
-                    'Z: ' + calcData.gyro.z + '<br/>' +
-                    'Accel <br/>' +
-                    'X: ' + calcData.accel.x + '<br/>' +
-                    'Y: ' + calcData.accel.y + '<br/>' +
-                    'Z: ' + calcData.accel.z + '<br/>' +
-                    'Mag <br/>' +
-                    'X: ' + calcData.mag.x + '<br/>' +
-                    'Y: ' + calcData.mag.y + '<br/>' +
-                    'Z: ' + calcData.mag.z + '<br/>' ;
+      function aString(v) {
+        return [v.toFixed(3),'\'/s'].join('');
+      }
 
+      function mString(v) {
+        return [v.toFixed(3),'mT'].join('');
+      }
+      calcData = this.processData(data);
 
-          this.state = message;
+      message = 'Gyro <br/>' + 'X: ' + calcData.gyro.x + '<br/>' + 'Y: ' + calcData.gyro.y + '<br/>' + 'Z: ' + calcData.gyro.z + '<br/>' + 'Accel <br/>' + 'X: ' + calcData.accel.x + '<br/>' + 'Y: ' + calcData.accel.y + '<br/>' + 'Z: ' + calcData.accel.z + '<br/>' + 'Mag <br/>' + 'X: ' + calcData.mag.x + '<br/>' + 'Y: ' + calcData.mag.y + '<br/>' + 'Z: ' + calcData.mag.z + '<br/>';
 
-          this.$result[this.frames.gyroID + '-x'].text(calcData.gyro.x.toFixed(5));
-          this.$result[this.frames.gyroID + '-y'].text(calcData.gyro.y.toFixed(5));
-          this.$result[this.frames.gyroID + '-z'].text(calcData.gyro.z.toFixed(5));
+      this.state = message;
 
-          this.$result[this.frames.accelID + '-x'].text(calcData.accel.x.toFixed(5));
-          this.$result[this.frames.accelID + '-y'].text(calcData.accel.y.toFixed(5));
-          this.$result[this.frames.accelID + '-z'].text(calcData.accel.z.toFixed(5));
+      this.$result[this.frames.gyroID + '-x'].text(gString(calcData.gyro.x));
+      this.$result[this.frames.gyroID + '-y'].text(gString(calcData.gyro.y));
+      this.$result[this.frames.gyroID + '-z'].text(gString(calcData.gyro.z));
 
-          this.$result[this.frames.magID + '-x'].text(calcData.mag.x);
-          this.$result[this.frames.magID + '-y'].text(calcData.mag.y);
-          this.$result[this.frames.magID + '-z'].text(calcData.mag.z);
+      this.$result[this.frames.accelID + '-x'].text(aString(calcData.accel.x));
+      this.$result[this.frames.accelID + '-y'].text(aString(calcData.accel.y));
+      this.$result[this.frames.accelID + '-z'].text(aString(calcData.accel.z));
 
+      this.$result[this.frames.magID + '-x'].text(mString(calcData.mag.x));
+      this.$result[this.frames.magID + '-y'].text(mString(calcData.mag.y));
+      this.$result[this.frames.magID + '-z'].text(mString(calcData.mag.z));
 
-          this.storeData(calcData.gyro.x, this.data.gyro.x);
-          this.storeData(calcData.gyro.y, this.data.gyro.y);
-          this.storeData(calcData.gyro.z, this.data.gyro.z);
+      this.data.gyro.x = this.storeData(calcData.gyro.x, this.data.gyro.x);
+      this.data.gyro.y = this.storeData(calcData.gyro.y, this.data.gyro.y);
+      this.data.gyro.z = this.storeData(calcData.gyro.z, this.data.gyro.z);
 
-          this.storeData(calcData.accel.x, this.data.accel.x);
-          this.storeData(calcData.accel.y, this.data.accel.y);
-          this.storeData(calcData.accel.z, this.data.accel.z);
+      this.data.accel.x = this.storeData(calcData.accel.x, this.data.accel.x);
+      this.data.accel.y = this.storeData(calcData.accel.y, this.data.accel.y);
+      this.data.accel.z = this.storeData(calcData.accel.z, this.data.accel.z);
 
-          this.storeData(calcData.mag.x, this.data.mag.x);
-          this.storeData(calcData.mag.y, this.data.mag.y);
-          this.storeData(calcData.mag.z, this.data.mag.z);
+      this.data.mag.x = this.storeData(calcData.mag.x, this.data.mag.x);
+      this.data.mag.y = this.storeData(calcData.mag.y, this.data.mag.y);
+      this.data.mag.z = this.storeData(calcData.mag.z, this.data.mag.z);
 
-          // Console.log(this.state);
-        };
+      // Console.log(JSON.stringify(this.data));
+      // Console.log(this.state);
+    };
 
   this.startService = function() {
 
-    if (this.deviceID !== null) {
+      if (this.deviceID !== null) {
 
-      console.log('Starting CC2650 Accelerometer Service on ', this.deviceID);
-      console.log(this.serviceDef);
+        console.log('Starting CC2650 Accelerometer Service on ', this.deviceID);
+        console.log(this.serviceDef);
 
-      ble.startNotification(this.deviceID, this.serviceDef.service, this.serviceDef.data, this.onAccelerometerData.bind(this), this.onError);
+        this.setInternalID();
+        this.insertFrame('gyro');
+        this.insertFrame('accel');
+        this.insertFrame('mag');
 
-      // Turn accelerometer on
-      var configData = new Uint16Array(1);
-      // Turn on gyro, accel, and mag, 2G range, Disable wake on motion
-      configData[0] = 0x007F;
-      ble.write(this.deviceID, this.serviceDef.service, this.serviceDef.configuration, configData.buffer,
-          function() { console.log('Started accelerometer.'); }, this.onError);
+        ble.startNotification(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.data,
+          this.onAccelerometerData.bind(this),
+          this.onError);
 
-      var periodData = new Uint8Array(1);
-      periodData[0] = 0x0A;
-      ble.write(deviceId, accelerometer.service, accelerometer.period, periodData.buffer,
-          function() { console.log('Configured accelerometer period.'); },app.onError);
+        // Turn accelerometer on
+        var configData = new Uint16Array(1);
+        // Turn on gyro, accel, and mag, 2G range, Disable wake on motion
+        configData[0] = 0x007F;
+        ble.write(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.configuration,
+          configData.buffer,
+          function() { console.log('Started accelerometer.'); },
+          this.onError);
+
+        var periodData = new Uint8Array(1);
+        periodData[0] = 0x0A;
+        ble.write(this.deviceID,
+          this.serviceDef.service,
+          this.serviceDef.period,
+          periodData.buffer,
+          function() { console.log('Configured accelerometer period.'); },
+          this.onError);
+      }
+
+    };
+
+  this.advancedGraph = function(mode, data, subID) {
+
+    var lm;
+    var ceiling;
+    var elm;
+    var text2ID;
+    var ceilingLimit;
+    var calcArray;
+    var floor;
+    var _subID;
+    var _data;
+    var text1ID;
+    var lineID;
+    var max;
+
+
+    var parts = ['x', 'y', 'z'];
+
+    _data = data || this.data;
+
+    _subID = subID || '';
+
+    // LineID = [this.frameID , _subID , '-line'].join('');
+    text1ID = [this.frameID, _subID, '-txt1'].join('');
+    text2ID = [this.frameID, _subID, '-txt2'].join('');
+
+    if (_data.x.length > 0) {
+
+      max = 2;
+
+      for (var lineMode = 0; lineMode < parts.length; lineMode++) {
+        lm = parts[lineMode];
+        ceiling = _data[lm].reduce(function(p, v) {
+          return (Math.abs(p) > Math.abs(v) ? Math.abs(p) : Math.abs(v));
+        });
+
+
+        if (ceiling > 500) {
+          max = (ceiling > max) ? (Math.ceil((Math.round(ceiling) + 1) / 50) * 50) : max;
+        } else {
+          max = (ceiling > max) ? (Math.ceil((Math.round(ceiling) + 1) / 10) * 10) : max;
+        }
+      }
+
+      ceiling = max;
+
+      floor = ceiling * -1;
+      ceilingLimit = ceiling;
+
+      var scalePos = (124 / 2) / ceiling;
+      var scaleNeg = (124 / 2) / floor;
+      var xstep = (680 - 46) / 100;
+
+      //Var xstep = 2.34;
+
+      for (lineMode = 0; lineMode < parts.length; lineMode++) {
+
+        lm = parts[lineMode];
+        var startX = 46 + (100 - _data[lm].length) * xstep;
+
+        calcArray = [];
+
+        lineID = this.frameID + _subID + '-' + lm + '-line';
+        for (var x = 0; x < _data[lm].length; x++) {
+
+          calcArray.push((startX + (x * xstep)).toFixed(2) + ',' + (71 - ((_data[lm][x]) * scalePos)).toFixed(
+              2));
+
+        }
+
+        elm = document.getElementById(lineID);
+
+        elm.setAttribute('points', calcArray.join(' '));
+
+      }
+
+      elm = document.getElementById(text1ID);
+      elm.textContent = ceilingLimit;
+
+      elm = document.getElementById(text2ID);
+      elm.textContent = floor;
 
-      this.setInternalID();
-      this.insertFrame('gyro');
-      this.insertFrame('accel');
-      this.insertFrame('mag');
     }
 
+    this.previousCeil = ceiling;
   };
 
   this.animateGraph = function() {
-      // Nothing to animate yet
+    // Nothing to animate yet
 
-      return -1;
-    };
+    // return -1;
+    this.advancedGraph(0, this.data.gyro, 'gyro');
+    this.advancedGraph(0, this.data.accel, 'accel');
+    this.advancedGraph(0, this.data.mag, 'mag');
+    // This.simpleGraph(this.data.temp, 'temp');
+    //         this.simpleGraph(this.data.pressure, 'pressure');
+
+  };
+
+  this.generateBlankGraphBase = function(subID, settings) {
+
+    var _subID = subID || '';
+    var xmlns = 'http://www.w3.org/2000/svg';
+
+    var svgID = this.frameID + _subID + '-svg';
+    var text1ID = this.frameID + _subID + '-txt1';
+    var text2ID = this.frameID + _subID + '-txt2';
+
+    var _width = settings.width || 300;
+    var _height = settings.height || 150;
+    var _fill = settings.fill || 'blue';
+    
+    var svg = document.createElementNS(xmlns, 'svg');
+
+    svg.setAttribute('id', svgID);
+    // Svg.setAttribute(xmlns, 'version', '1.1');
+    svg.setAttribute('width', _width.toString());
+    svg.setAttribute('height', _height.toString());
+    svg.setAttribute('fill', _fill);
+
+
+    svg.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xlink', 'http://www.w3.org/1999/xlink');
+
+    svg.setAttributeNS(xmlns, 'viewBox', '0 0 700 150');
+    //  Svg.setAttributeNS(xmlns, 'style', 'width:700px;height:150px;');
+
+
+    svg = this.graphAddXAxis(svg, {y: 12, x2: 680, colour: '#004c6d', id: text1ID});
+    svg = this.graphAddXAxis(svg, {y: 136, x2: 680, colour: '#004c6d', id: text2ID});
+    svg = this.graphAddXAxis(svg, {y: 71, x2: 680, colour: '#004c6d', text: '0'});
+
+    return svg;
+
+  };
 
   this.generateBlankGraph = function(subID) {
 
@@ -150,11 +296,11 @@ var CC2650_ACCEL = function(p) {
     var ylineID = this.frameID + _subID + '-y-line';
     var zlineID = this.frameID + _subID + '-z-line';
 
-    var svg = this.generateBlankGraphBase(_subID);
+    var svg = this.generateBlankGraphBase(_subID,{width: '700',height: 150});
 
-    svg = this.graphAddLine(svg, xlineID, '#FF0000');
-    svg = this.graphAddLine(svg, ylineID, '#00FF00');
-    svg = this.graphAddLine(svg, zlineID, '#0000FF');
+    svg = this.graphAddLine(svg, xlineID, 'rgba(255,0,0,0.5)');
+    svg = this.graphAddLine(svg, ylineID, 'rgba(0,255,0,0.5)');
+    svg = this.graphAddLine(svg, zlineID, 'rgba(0,0,255,0.5)');
 
     return svg;
 
@@ -162,55 +308,78 @@ var CC2650_ACCEL = function(p) {
 
   this.insertFrame = function(mode) {
 
-      var frame;
-      var title;
-      var modeID = mode + 'ID';
-      this.frames[modeID] = this.frameID + '-' + mode;
+    var frame;
+    var title;
+    var modeID = mode + 'ID';
+    this.frames[modeID] = this.frameID + '-' + mode;
 
-      var titles = {gyro: 'Gyroscope', accel: 'Accelerometer', mag: 'Magnetometer'};
-      var modes = ['gyro','accel','mag'];
-
-      console.log('FrameID: ' , this.frames[modeID]);
-
-      title = [titles[mode], ' - ', this.deviceID].join(' ');
-
-      frame = $('<div />', {
-        class: 'mui-panel', id: this.frames[modeID]
-      });
-
-      $('<div />', { class: 'mui-row'}).append($('<div />', { class: 'mui-col-xs-12 mui--text-title mui-ellipsis-2', text: title})).appendTo(frame);
-
-      this.$frame.append(frame);
-      this.$id[modeID] = $('#' + this.frames[modeID]);
-
-      // Call the parent displayForm first...
-
-      var row = $('<div />', {class: 'mui-row'});
-
-      $('<div />', { class: 'mui-col-xs-4 mui--text-accent mui--text-center', text: 'X'}).appendTo(row);
-      $('<div />', { class: 'mui-col-xs-4 mui--text-accent mui--text-center', text: 'Y'}).appendTo(row);
-      $('<div />', { class: 'mui-col-xs-4 mui--text-accent mui--text-center', text: 'Z'}).appendTo(row);
-
-      this.$id[modeID].append(row);
-
-      row = $('<div />', {class: 'mui-row'});
-
-      $('<div />', { class: 'mui-col-xs-4 mui--text-dark mui--text-center', text: '--', id: this.frames[modeID] + '-x' }).appendTo(row);
-      $('<div />', { class: 'mui-col-xs-4 mui--text-dark mui--text-center', text: '--', id: this.frames[modeID] + '-y'}).appendTo(row);
-      $('<div />', { class: 'mui-col-xs-4 mui--text-dark mui--text-center', text: '--', id: this.frames[modeID] + '-z'}).appendTo(row);
-
-      this.$id[modeID].append(row);
-
-      this.$result[this.frames[modeID] + '-x'] = $('#' + this.frames[modeID] + '-x');
-      this.$result[this.frames[modeID] + '-y'] = $('#' + this.frames[modeID] + '-y');
-      this.$result[this.frames[modeID] + '-z'] = $('#' + this.frames[modeID] + '-z');
-
-      row = $('<div />', {class: 'mui-row'});
-
-         row.append($('<div>',{class: 'mui-col-md-12'}).append(this.generateBlankGraph(modes[mode])))   ;
-
-      this.$id[modeID].append(row);
+    var titles = {
+      gyro: 'Gyroscope', accel: 'Accelerometer', mag: 'Magnetometer'
     };
+    var modes = ['gyro', 'accel', 'mag'];
+
+    console.log('FrameID: ', this.frames[modeID]);
+
+    title = [titles[mode], ' - ', this.deviceID].join(' ');
+
+    frame = $('<div />', {
+      class: 'mui-panel', id: this.frames[modeID]
+    });
+
+    $('<div />', {class: 'mui-row'}).append($('<div />', {
+      class: 'mui-col-xs-12 mui--text-title mui-ellipsis-2', text: title
+    })).appendTo(frame);
+
+    this.$frame.append(frame);
+    this.$id[modeID] = $('#' + this.frames[modeID]);
+
+    // Call the parent displayForm first...
+
+    var row = $('<div />', {class: 'mui-row'});
+
+    $('<div />', {
+      class: 'mui-col-xs-4 mui--text-accent mui--text-center', text: 'X'
+    }).appendTo(row);
+    $('<div />', {
+      class: 'mui-col-xs-4 mui--text-accent mui--text-center', text: 'Y'
+    }).appendTo(row);
+    $('<div />', {
+      class: 'mui-col-xs-4 mui--text-accent mui--text-center', text: 'Z'
+    }).appendTo(row);
+
+    this.$id[modeID].append(row);
+
+    row = $('<div />', {class: 'mui-row'});
+
+    $('<div />', {
+      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      text: '--',
+      id: this.frames[modeID] + '-x'
+    }).appendTo(row);
+    $('<div />', {
+      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      text: '--',
+      id: this.frames[modeID] + '-y'
+    }).appendTo(row);
+    $('<div />', {
+      class: 'mui-col-xs-4 mui--text-dark mui--text-center',
+      text: '--',
+      id: this.frames[modeID] + '-z'
+    }).appendTo(row);
+
+    this.$id[modeID].append(row);
+
+    this.$result[this.frames[modeID] + '-x'] = $('#' + this.frames[modeID] + '-x');
+    this.$result[this.frames[modeID] + '-y'] = $('#' + this.frames[modeID] + '-y');
+    this.$result[this.frames[modeID] + '-z'] = $('#' + this.frames[modeID] + '-z');
+
+    row = $('<div />', {class: 'mui-row'});
+
+    var _graph = this.generateBlankGraph(mode);
+    row.append($('<div>', {class: 'mui-col-sm-12'}).append(_graph));
+
+    this.$id[modeID].append(row);
+  };
 
 };
 
diff --git a/sensortoy/sensortoy/platforms/ios/www/js/standards/capability.js b/sensortoy/sensortoy/platforms/ios/www/js/standards/capability.js
index 33eb1fa..156d349 100644
--- a/sensortoy/sensortoy/platforms/ios/www/js/standards/capability.js
+++ b/sensortoy/sensortoy/platforms/ios/www/js/standards/capability.js
@@ -45,6 +45,9 @@ var CAPABILITY = function(p) {
 
   this.target = null;
   this.$frame = null;
+
+  this.previousCeil = 0;
+
   capabilityManager.register({id: this.capabilityID, module: this});
 };
 
@@ -137,6 +140,7 @@ CAPABILITY.prototype.startGraph = function(id) {
 
 
 
+
 CAPABILITY.prototype.generateBlankGraphBase = function(subID) {
 
   var _subID = subID || '';
@@ -152,52 +156,52 @@ CAPABILITY.prototype.generateBlankGraphBase = function(subID) {
   svg.setAttributeNS(xmlns,'height','150');
   svg.setAttributeNS(xmlns,'fill', 'blue');
 
-  var line = document.createElementNS(xmlns,'line');
 
-  line.setAttributeNS(null,'x1','46');
-  line.setAttributeNS(null,'y1','12');
-  line.setAttributeNS(null,'x2','280');
-  line.setAttributeNS(null,'y2', '12');
-  line.setAttributeNS(null,'style','stroke:#004c6d;stroke-width:2;');
-
-  svg.appendChild(line);
-
-  line = document.createElementNS(xmlns,'line');
-
-  line.setAttributeNS(null,'x1','46');
-  line.setAttributeNS(null,'y1','136');
-  line.setAttributeNS(null,'x2','280');
-  line.setAttributeNS(null,'y2', '136');
-  line.setAttributeNS(null,'style','stroke:#004c6d;stroke-width:2;');
-
-  svg.appendChild(line);
-
-  var text = document.createElementNS(xmlns,'text');
-
-  text.setAttributeNS(null,'id',text1ID);
-  text.setAttributeNS(null,'x','36');
-  text.setAttributeNS(null,'y','15');
-  text.setAttributeNS(null,'text-anchor', 'end');
-  text.setAttributeNS(null,'style','font-family:"Ubuntu Condensed",sans-serif;font-size:12;fill: #004c6d;text-align:right;');
-  text.textContent = '000';
-
-  svg.appendChild(text);
-
-  text = document.createElementNS(xmlns,'text');
-
-  text.setAttributeNS(null,'id','text2');
-  text.setAttributeNS(null,'x','36');
-  text.setAttributeNS(null,'y','140');
-  text.setAttributeNS(null,'text-anchor', 'end');
-  text.setAttributeNS(null,'style','font-family:"Ubuntu Condensed",sans-serif;font-size:12;fill: #004c6d;text-align:right;');
-  text.textContent = '0';
-
-  svg.appendChild(text);
+  svg = this.graphAddXAxis(svg,{y: 12, colour: '#004c6d', id: text1ID});
+  svg = this.graphAddXAxis(svg,{y: 136, colour: '#004c6d', text: '0'});
 
   return svg;
 
 };
 
+CAPABILITY.prototype.graphAddXAxis = function(svg, settings) {
+  var xmlns = 'http://www.w3.org/2000/svg';
+  var _svg = svg;
+  var y = settings.y || 0;
+  var y2 = y + 3;
+  var x2 = settings.x2 || 280;
+  var colour = settings.colour || '#ff0000';
+  var id = settings.id;
+  var textContent = settings.text || '-';
+  var lineStyle = ['stroke:',colour,';stroke-width:2;'].join('');
+  var textStyle = ['font-family:"Ubuntu Condensed",sans-serif;font-size:12;fill: ',colour,';text-align:right;'].join('');
+
+  var line = document.createElementNS(xmlns,'line');
+
+  line.setAttributeNS(null,'x1','46');
+  line.setAttributeNS(null,'y1', y);
+  line.setAttributeNS(null,'x2', x2);
+  line.setAttributeNS(null,'y2', y);
+  line.setAttributeNS(null,'style',lineStyle);
+
+  _svg.appendChild(line);
+
+  var text = document.createElementNS(xmlns,'text');
+
+  if (id !== null) {
+    text.setAttributeNS(null,'id',id);
+  }
+  text.setAttributeNS(null,'x','36');
+  text.setAttributeNS(null,'y', y2);
+  text.setAttributeNS(null,'text-anchor', 'end');
+  text.setAttributeNS(null,'style',textStyle);
+  text.textContent = textContent;
+
+  _svg.appendChild(text);
+
+  return _svg;
+};
+
 CAPABILITY.prototype.graphAddLine = function(svg, lineId, colour) {
   var xmlns = 'http://www.w3.org/2000/svg';
   var _svg = svg;
@@ -240,6 +244,8 @@ CAPABILITY.prototype.animateGraph = function() {
 
 CAPABILITY.prototype.simpleGraph = function(data, subID) {
 
+  var ceilingLimit;
+  var ceiling;
   var _subID;
   var _data;
   var text1ID;
@@ -253,9 +259,11 @@ CAPABILITY.prototype.simpleGraph = function(data, subID) {
   text1ID = [this.frameID , _subID , '-txt1'].join('');
 
   if (_data.length > 0) {
-    var ceiling = _data.reduce(function(p, v) {
-        return (p > v ? p : v);
-      });
+
+    ceiling = _data.reduce(function(p, v) {
+      return (Math.abs(p) > Math.abs(v) ? Math.abs(p) : Math.abs(v));
+    });
+
 
     /* Var floor = _data.reduce(function(p, v) {
            return (p < v ? p : v);
@@ -264,6 +272,7 @@ CAPABILITY.prototype.simpleGraph = function(data, subID) {
 
     var calcArray = [];
 
+/*
     var ceilingLimit = Math.floor(ceiling / 10) * 10;
     if (ceilingLimit < ceiling) {
       ceilingLimit = Math.floor((ceiling + (ceiling * 0.25))  / 10) * 10;
@@ -272,6 +281,13 @@ CAPABILITY.prototype.simpleGraph = function(data, subID) {
     if (ceilingLimit < 30) {
       ceilingLimit = 30;
     }
+*/
+
+
+    ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 10) * 10);
+    if (ceilingLimit > 1000) {
+      ceilingLimit = (Math.ceil((Math.round(ceiling) + 1) / 50) * 50);
+    }
 
     var scale = 124 / ceilingLimit;
     // Var xstep = (280 - 46) / 100;